diff --git a/src/main/kotlin/com/coderjoe/atlas/Atlas.kt b/src/main/kotlin/com/coderjoe/atlas/Atlas.kt index 27e83ee..89e54a5 100644 --- a/src/main/kotlin/com/coderjoe/atlas/Atlas.kt +++ b/src/main/kotlin/com/coderjoe/atlas/Atlas.kt @@ -182,8 +182,8 @@ class Atlas : JavaPlugin() { com.coderjoe.atlas.power.block.LavaGenerator.descriptor, com.coderjoe.atlas.power.block.AutoSmelter.descriptor, com.coderjoe.atlas.power.block.MultiPowerCable.descriptor, - com.coderjoe.atlas.power.block.CobblestoneGenerator.descriptor, - com.coderjoe.atlas.power.block.ObsidianGenerator.descriptor, + com.coderjoe.atlas.power.block.CobblestoneFactory.descriptor, + com.coderjoe.atlas.power.block.ObsidianFactory.descriptor, com.coderjoe.atlas.power.block.PowerMerger.descriptor ).associateBy { it.baseBlockId } } diff --git a/src/main/kotlin/com/coderjoe/atlas/power/PowerBlockDialog.kt b/src/main/kotlin/com/coderjoe/atlas/power/PowerBlockDialog.kt index 6c88a3f..31dc006 100644 --- a/src/main/kotlin/com/coderjoe/atlas/power/PowerBlockDialog.kt +++ b/src/main/kotlin/com/coderjoe/atlas/power/PowerBlockDialog.kt @@ -8,8 +8,8 @@ import com.coderjoe.atlas.power.block.PowerCable import com.coderjoe.atlas.power.block.SmallBattery import com.coderjoe.atlas.power.block.SmallDrill import com.coderjoe.atlas.power.block.MultiPowerCable -import com.coderjoe.atlas.power.block.CobblestoneGenerator -import com.coderjoe.atlas.power.block.ObsidianGenerator +import com.coderjoe.atlas.power.block.CobblestoneFactory +import com.coderjoe.atlas.power.block.ObsidianFactory import com.coderjoe.atlas.power.block.PowerMerger import com.coderjoe.atlas.power.block.SmallSolarPanel import io.papermc.paper.dialog.Dialog @@ -132,8 +132,8 @@ object PowerBlockDialog { 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 CobblestoneGenerator -> "Cobblestone Generator" - is ObsidianGenerator -> "Obsidian Generator" + is CobblestoneFactory -> "Cobblestone Factory" + is ObsidianFactory -> "Obsidian Factory" is PowerMerger -> "Power Merger (${powerBlock.facing.name.lowercase().replaceFirstChar { it.uppercase() }})" else -> "Power Block" } @@ -183,9 +183,9 @@ object PowerBlockDialog { .color(NamedTextColor.GRAY) is MultiPowerCable -> Component.text("Cable - distributes power to all adjacent faces") .color(NamedTextColor.GRAY) - is CobblestoneGenerator -> Component.text("Machine - consumes ${CobblestoneGenerator.POWER_COST} power + water + lava → cobblestone") + is CobblestoneFactory -> Component.text("Machine - consumes ${CobblestoneFactory.POWER_COST} power + water + lava → cobblestone") .color(NamedTextColor.GRAY) - is ObsidianGenerator -> Component.text("Machine - consumes ${ObsidianGenerator.POWER_COST} power + water + lava → obsidian") + is ObsidianFactory -> Component.text("Machine - consumes ${ObsidianFactory.POWER_COST} power + water + lava → obsidian") .color(NamedTextColor.GRAY) is PowerMerger -> Component.text("Cable - merges power from all sides, outputs in facing direction") .color(NamedTextColor.GRAY) diff --git a/src/main/kotlin/com/coderjoe/atlas/power/block/CobblestoneGenerator.kt b/src/main/kotlin/com/coderjoe/atlas/power/block/CobblestoneFactory.kt similarity index 90% rename from src/main/kotlin/com/coderjoe/atlas/power/block/CobblestoneGenerator.kt rename to src/main/kotlin/com/coderjoe/atlas/power/block/CobblestoneFactory.kt index 3b7f304..29ea727 100644 --- a/src/main/kotlin/com/coderjoe/atlas/power/block/CobblestoneGenerator.kt +++ b/src/main/kotlin/com/coderjoe/atlas/power/block/CobblestoneFactory.kt @@ -16,14 +16,14 @@ import org.bukkit.Material import org.bukkit.block.BlockFace import org.bukkit.inventory.ItemStack -class CobblestoneGenerator(location: Location) : PowerBlock(location, maxStorage = 2) { +class CobblestoneFactory(location: Location) : PowerBlock(location, maxStorage = 2) { override val canReceivePower: Boolean = true override val updateIntervalTicks: Long = 20L companion object { - const val BLOCK_ID = "cobblestone_generator" - const val BLOCK_ID_ACTIVE = "cobblestone_generator_active" + const val BLOCK_ID = "cobblestone_factory" + const val BLOCK_ID_ACTIVE = "cobblestone_factory_active" const val POWER_COST = 2 private val ADJACENT_FACES = listOf( @@ -33,12 +33,12 @@ class CobblestoneGenerator(location: Location) : PowerBlock(location, maxStorage val descriptor = BlockDescriptor( baseBlockId = BLOCK_ID, - displayName = "Cobblestone Generator", + displayName = "Cobblestone Factory", description = "Machine - consumes $POWER_COST power + water + lava → cobblestone", placementType = PlacementType.SIMPLE, directionalVariants = emptyMap(), allRegistrableIds = listOf(BLOCK_ID, BLOCK_ID_ACTIVE), - constructor = { loc, _ -> CobblestoneGenerator(loc) } + constructor = { loc, _ -> CobblestoneFactory(loc) } ) } @@ -94,7 +94,7 @@ class CobblestoneGenerator(location: Location) : PowerBlock(location, maxStorage val dropLocation = location.clone().add(0.5, 1.0, 0.5) world.dropItemNaturally(dropLocation, ItemStack(Material.COBBLESTONE)) - plugin.logger.atlasInfo("CobblestoneGenerator at ${location.blockX},${location.blockY},${location.blockZ} produced 1 cobblestone") + plugin.logger.atlasInfo("CobblestoneFactory at ${location.blockX},${location.blockY},${location.blockZ} produced 1 cobblestone") } private fun hasFluidAvailable(source: com.coderjoe.atlas.fluid.FluidBlock, face: BlockFace, fluidType: FluidType): Boolean { diff --git a/src/main/kotlin/com/coderjoe/atlas/power/block/ObsidianGenerator.kt b/src/main/kotlin/com/coderjoe/atlas/power/block/ObsidianFactory.kt similarity index 90% rename from src/main/kotlin/com/coderjoe/atlas/power/block/ObsidianGenerator.kt rename to src/main/kotlin/com/coderjoe/atlas/power/block/ObsidianFactory.kt index 5934a37..15a784b 100644 --- a/src/main/kotlin/com/coderjoe/atlas/power/block/ObsidianGenerator.kt +++ b/src/main/kotlin/com/coderjoe/atlas/power/block/ObsidianFactory.kt @@ -16,14 +16,14 @@ import org.bukkit.Material import org.bukkit.block.BlockFace import org.bukkit.inventory.ItemStack -class ObsidianGenerator(location: Location) : PowerBlock(location, maxStorage = 100) { +class ObsidianFactory(location: Location) : PowerBlock(location, maxStorage = 100) { override val canReceivePower: Boolean = true override val updateIntervalTicks: Long = 20L companion object { - const val BLOCK_ID = "obsidian_generator" - const val BLOCK_ID_ACTIVE = "obsidian_generator_active" + const val BLOCK_ID = "obsidian_factory" + const val BLOCK_ID_ACTIVE = "obsidian_factory_active" const val POWER_COST = 100 private val ADJACENT_FACES = listOf( @@ -33,12 +33,12 @@ class ObsidianGenerator(location: Location) : PowerBlock(location, maxStorage = val descriptor = BlockDescriptor( baseBlockId = BLOCK_ID, - displayName = "Obsidian Generator", + displayName = "Obsidian Factory", description = "Machine - consumes $POWER_COST power + water + lava → obsidian", placementType = PlacementType.SIMPLE, directionalVariants = emptyMap(), allRegistrableIds = listOf(BLOCK_ID, BLOCK_ID_ACTIVE), - constructor = { loc, _ -> ObsidianGenerator(loc) } + constructor = { loc, _ -> ObsidianFactory(loc) } ) } @@ -94,7 +94,7 @@ class ObsidianGenerator(location: Location) : PowerBlock(location, maxStorage = val dropLocation = location.clone().add(0.5, 1.0, 0.5) world.dropItemNaturally(dropLocation, ItemStack(Material.OBSIDIAN)) - plugin.logger.atlasInfo("ObsidianGenerator at ${location.blockX},${location.blockY},${location.blockZ} produced 1 obsidian") + plugin.logger.atlasInfo("ObsidianFactory at ${location.blockX},${location.blockY},${location.blockZ} produced 1 obsidian") } private fun hasFluidAvailable(source: com.coderjoe.atlas.fluid.FluidBlock, face: BlockFace, fluidType: FluidType): Boolean { diff --git a/src/main/resources/nexo/items/atlas_blocks.yml b/src/main/resources/nexo/items/atlas_blocks.yml index f4cabe7..5f9041a 100644 --- a/src/main/resources/nexo/items/atlas_blocks.yml +++ b/src/main/resources/nexo/items/atlas_blocks.yml @@ -4082,20 +4082,20 @@ multi_power_cable_down_powered: - nexo_item: multi_power_cable probability: 1.0 -# ─── Cobblestone Generator ────────────────────────────────────── -cobblestone_generator: - itemname: "Cobblestone Generator" +# ─── Cobblestone Factory ────────────────────────────────────── +cobblestone_factory: + itemname: "Cobblestone Factory" material: paper Pack: generate_model: true parent_model: block/cube textures: - north: atlas:block/cobblestone_generator_side - south: atlas:block/cobblestone_generator_side - east: atlas:block/cobblestone_generator_side - west: atlas:block/cobblestone_generator_side - up: atlas:block/cobblestone_generator_top - down: atlas:block/cobblestone_generator_bottom + north: atlas:block/cobblestone_factory_side + south: atlas:block/cobblestone_factory_side + east: atlas:block/cobblestone_factory_side + west: atlas:block/cobblestone_factory_side + up: atlas:block/cobblestone_factory_top + down: atlas:block/cobblestone_factory_bottom Mechanics: custom_block: type: NOTEBLOCK @@ -4110,22 +4110,22 @@ cobblestone_generator: drop: silktouch: false loots: - - nexo_item: cobblestone_generator + - nexo_item: cobblestone_factory probability: 1.0 -cobblestone_generator_active: - itemname: "Cobblestone Generator" +cobblestone_factory_active: + itemname: "Cobblestone Factory" material: paper Pack: generate_model: true parent_model: block/cube textures: - north: atlas:block/cobblestone_generator_side_active - south: atlas:block/cobblestone_generator_side_active - east: atlas:block/cobblestone_generator_side_active - west: atlas:block/cobblestone_generator_side_active - up: atlas:block/cobblestone_generator_top_active - down: atlas:block/cobblestone_generator_bottom + north: atlas:block/cobblestone_factory_side_active + south: atlas:block/cobblestone_factory_side_active + east: atlas:block/cobblestone_factory_side_active + west: atlas:block/cobblestone_factory_side_active + up: atlas:block/cobblestone_factory_top_active + down: atlas:block/cobblestone_factory_bottom Mechanics: custom_block: type: NOTEBLOCK @@ -4140,23 +4140,23 @@ cobblestone_generator_active: drop: silktouch: false loots: - - nexo_item: cobblestone_generator + - nexo_item: cobblestone_factory probability: 1.0 -# ─── Obsidian Generator ───────────────────────────────────────── -obsidian_generator: - itemname: "Obsidian Generator" +# ─── Obsidian Factory ───────────────────────────────────────── +obsidian_factory: + itemname: "Obsidian Factory" material: paper Pack: generate_model: true parent_model: block/cube textures: - north: atlas:block/obsidian_generator_side - south: atlas:block/obsidian_generator_side - east: atlas:block/obsidian_generator_side - west: atlas:block/obsidian_generator_side - up: atlas:block/obsidian_generator_top - down: atlas:block/obsidian_generator_bottom + north: atlas:block/obsidian_factory_side + south: atlas:block/obsidian_factory_side + east: atlas:block/obsidian_factory_side + west: atlas:block/obsidian_factory_side + up: atlas:block/obsidian_factory_top + down: atlas:block/obsidian_factory_bottom Mechanics: custom_block: type: NOTEBLOCK @@ -4171,22 +4171,22 @@ obsidian_generator: drop: silktouch: false loots: - - nexo_item: obsidian_generator + - nexo_item: obsidian_factory probability: 1.0 -obsidian_generator_active: - itemname: "Obsidian Generator" +obsidian_factory_active: + itemname: "Obsidian Factory" material: paper Pack: generate_model: true parent_model: block/cube textures: - north: atlas:block/obsidian_generator_side_active - south: atlas:block/obsidian_generator_side_active - east: atlas:block/obsidian_generator_side_active - west: atlas:block/obsidian_generator_side_active - up: atlas:block/obsidian_generator_top_active - down: atlas:block/obsidian_generator_bottom + north: atlas:block/obsidian_factory_side_active + south: atlas:block/obsidian_factory_side_active + east: atlas:block/obsidian_factory_side_active + west: atlas:block/obsidian_factory_side_active + up: atlas:block/obsidian_factory_top_active + down: atlas:block/obsidian_factory_bottom Mechanics: custom_block: type: NOTEBLOCK @@ -4201,7 +4201,7 @@ obsidian_generator_active: drop: silktouch: false loots: - - nexo_item: obsidian_generator + - nexo_item: obsidian_factory probability: 1.0 # ─── Power Merger ──────────────────────────────────────────────── diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/cobblestone_generator_bottom.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/cobblestone_factory_bottom.png similarity index 100% rename from src/main/resources/nexo/pack/assets/atlas/textures/block/cobblestone_generator_bottom.png rename to src/main/resources/nexo/pack/assets/atlas/textures/block/cobblestone_factory_bottom.png diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/cobblestone_generator_side.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/cobblestone_factory_side.png similarity index 100% rename from src/main/resources/nexo/pack/assets/atlas/textures/block/cobblestone_generator_side.png rename to src/main/resources/nexo/pack/assets/atlas/textures/block/cobblestone_factory_side.png diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/cobblestone_generator_side_active.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/cobblestone_factory_side_active.png similarity index 100% rename from src/main/resources/nexo/pack/assets/atlas/textures/block/cobblestone_generator_side_active.png rename to src/main/resources/nexo/pack/assets/atlas/textures/block/cobblestone_factory_side_active.png diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/cobblestone_generator_top.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/cobblestone_factory_top.png similarity index 100% rename from src/main/resources/nexo/pack/assets/atlas/textures/block/cobblestone_generator_top.png rename to src/main/resources/nexo/pack/assets/atlas/textures/block/cobblestone_factory_top.png diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/cobblestone_generator_top_active.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/cobblestone_factory_top_active.png similarity index 100% rename from src/main/resources/nexo/pack/assets/atlas/textures/block/cobblestone_generator_top_active.png rename to src/main/resources/nexo/pack/assets/atlas/textures/block/cobblestone_factory_top_active.png diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_back.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_back.png index 8ee9965..e3995e1 100644 Binary files a/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_back.png and b/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_back.png differ diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_back_powered.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_back_powered.png index 2a455b8..937c7dd 100644 Binary files a/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_back_powered.png and b/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_back_powered.png differ diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_cap.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_cap.png index 6036b66..4b03417 100644 Binary files a/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_cap.png and b/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_cap.png differ diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_cap_powered.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_cap_powered.png index 006e3d8..32d927d 100644 Binary files a/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_cap_powered.png and b/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_cap_powered.png differ diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_front.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_front.png index cdfc96f..4b03417 100644 Binary files a/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_front.png and b/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_front.png differ diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_front_powered.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_front_powered.png index 736fdac..32d927d 100644 Binary files a/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_front_powered.png and b/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_front_powered.png differ diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_side.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_side.png index 006e3d8..4b03417 100644 Binary files a/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_side.png and b/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_side.png differ diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_side_powered.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_side_powered.png index cdfc96f..32d927d 100644 Binary files a/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_side_powered.png and b/src/main/resources/nexo/pack/assets/atlas/textures/block/multi_power_cable_side_powered.png differ diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/obsidian_generator_bottom.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/obsidian_factory_bottom.png similarity index 100% rename from src/main/resources/nexo/pack/assets/atlas/textures/block/obsidian_generator_bottom.png rename to src/main/resources/nexo/pack/assets/atlas/textures/block/obsidian_factory_bottom.png diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/obsidian_generator_side.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/obsidian_factory_side.png similarity index 100% rename from src/main/resources/nexo/pack/assets/atlas/textures/block/obsidian_generator_side.png rename to src/main/resources/nexo/pack/assets/atlas/textures/block/obsidian_factory_side.png diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/obsidian_generator_side_active.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/obsidian_factory_side_active.png similarity index 100% rename from src/main/resources/nexo/pack/assets/atlas/textures/block/obsidian_generator_side_active.png rename to src/main/resources/nexo/pack/assets/atlas/textures/block/obsidian_factory_side_active.png diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/obsidian_generator_top.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/obsidian_factory_top.png similarity index 100% rename from src/main/resources/nexo/pack/assets/atlas/textures/block/obsidian_generator_top.png rename to src/main/resources/nexo/pack/assets/atlas/textures/block/obsidian_factory_top.png diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/obsidian_generator_top_active.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/obsidian_factory_top_active.png similarity index 100% rename from src/main/resources/nexo/pack/assets/atlas/textures/block/obsidian_generator_top_active.png rename to src/main/resources/nexo/pack/assets/atlas/textures/block/obsidian_factory_top_active.png diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_back.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_back.png index a06eb86..e3995e1 100644 Binary files a/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_back.png and b/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_back.png differ diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_back_powered.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_back_powered.png index 6135be0..937c7dd 100644 Binary files a/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_back_powered.png and b/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_back_powered.png differ diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_bottom.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_bottom.png index 9ca4f37..e3995e1 100644 Binary files a/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_bottom.png and b/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_bottom.png differ diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_bottom_powered.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_bottom_powered.png index bb1b05f..937c7dd 100644 Binary files a/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_bottom_powered.png and b/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_bottom_powered.png differ diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_front.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_front.png index f489fcb..4b03417 100644 Binary files a/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_front.png and b/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_front.png differ diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_front_powered.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_front_powered.png index 0bb875e..32d927d 100644 Binary files a/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_front_powered.png and b/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_front_powered.png differ diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_side.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_side.png index f5c05a0..e3995e1 100644 Binary files a/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_side.png and b/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_side.png differ diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_side_powered.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_side_powered.png index a9c8a7b..937c7dd 100644 Binary files a/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_side_powered.png and b/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_side_powered.png differ diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_top.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_top.png index 8dc5975..e3995e1 100644 Binary files a/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_top.png and b/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_top.png differ diff --git a/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_top_powered.png b/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_top_powered.png index 9b876b7..937c7dd 100644 Binary files a/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_top_powered.png and b/src/main/resources/nexo/pack/assets/atlas/textures/block/power_merger_top_powered.png differ diff --git a/src/main/resources/nexo/recipes/shapeless/atlas_recipes.yml b/src/main/resources/nexo/recipes/shapeless/atlas_recipes.yml index 30c82c0..01032ef 100644 --- a/src/main/resources/nexo/recipes/shapeless/atlas_recipes.yml +++ b/src/main/resources/nexo/recipes/shapeless/atlas_recipes.yml @@ -196,9 +196,9 @@ auto_smelter_recipe: G: minecraft_type: FURNACE -cobblestone_generator_recipe: +cobblestone_factory_recipe: result: - nexo_item: cobblestone_generator + nexo_item: cobblestone_factory amount: 1 ingredients: A: @@ -248,9 +248,9 @@ power_merger_recipe: E: minecraft_type: REDSTONE -obsidian_generator_recipe: +obsidian_factory_recipe: result: - nexo_item: obsidian_generator + nexo_item: obsidian_factory amount: 1 ingredients: A: diff --git a/src/test/kotlin/com/coderjoe/atlas/TestHelper.kt b/src/test/kotlin/com/coderjoe/atlas/TestHelper.kt index 2e33f55..18aa10a 100644 --- a/src/test/kotlin/com/coderjoe/atlas/TestHelper.kt +++ b/src/test/kotlin/com/coderjoe/atlas/TestHelper.kt @@ -22,8 +22,8 @@ import com.coderjoe.atlas.power.block.PowerCable import com.coderjoe.atlas.power.block.SmallBattery import com.coderjoe.atlas.power.block.SmallDrill import com.coderjoe.atlas.power.block.MultiPowerCable -import com.coderjoe.atlas.power.block.CobblestoneGenerator -import com.coderjoe.atlas.power.block.ObsidianGenerator +import com.coderjoe.atlas.power.block.CobblestoneFactory +import com.coderjoe.atlas.power.block.ObsidianFactory import com.coderjoe.atlas.power.block.PowerMerger import com.coderjoe.atlas.power.block.SmallSolarPanel import io.mockk.* @@ -177,8 +177,8 @@ object TestHelper { SmallSolarPanel.descriptor, SmallDrill.descriptor, SmallBattery.descriptor, PowerCable.descriptor, LavaGenerator.descriptor, AutoSmelter.descriptor, - MultiPowerCable.descriptor, CobblestoneGenerator.descriptor, - ObsidianGenerator.descriptor, PowerMerger.descriptor + MultiPowerCable.descriptor, CobblestoneFactory.descriptor, + ObsidianFactory.descriptor, PowerMerger.descriptor )) } diff --git a/src/test/kotlin/com/coderjoe/atlas/power/CobblestoneGeneratorTest.kt b/src/test/kotlin/com/coderjoe/atlas/power/CobblestoneFactoryTest.kt similarity index 84% rename from src/test/kotlin/com/coderjoe/atlas/power/CobblestoneGeneratorTest.kt rename to src/test/kotlin/com/coderjoe/atlas/power/CobblestoneFactoryTest.kt index 56b3fc3..d1fe953 100644 --- a/src/test/kotlin/com/coderjoe/atlas/power/CobblestoneGeneratorTest.kt +++ b/src/test/kotlin/com/coderjoe/atlas/power/CobblestoneFactoryTest.kt @@ -5,12 +5,12 @@ import com.coderjoe.atlas.TestHelper.callPowerUpdate import com.coderjoe.atlas.fluid.FluidBlockRegistry import com.coderjoe.atlas.fluid.FluidType import com.coderjoe.atlas.fluid.block.FluidPipe -import com.coderjoe.atlas.power.block.CobblestoneGenerator +import com.coderjoe.atlas.power.block.CobblestoneFactory import org.bukkit.block.BlockFace import org.junit.jupiter.api.* import org.junit.jupiter.api.Assertions.* -class CobblestoneGeneratorTest { +class CobblestoneFactoryTest { @BeforeEach fun setup() { @@ -24,27 +24,27 @@ class CobblestoneGeneratorTest { @Test fun `cobblestone generator maxStorage is 2`() { - val gen = CobblestoneGenerator(TestHelper.createLocation()) + val gen = CobblestoneFactory(TestHelper.createLocation()) assertEquals(2, gen.maxStorage) } @Test fun `cobblestone generator canReceivePower is true`() { - val gen = CobblestoneGenerator(TestHelper.createLocation()) + val gen = CobblestoneFactory(TestHelper.createLocation()) assertTrue(gen.canAcceptPower()) } @Test fun `visual state idle when insufficient power`() { - val gen = CobblestoneGenerator(TestHelper.createLocation()) - assertEquals("cobblestone_generator", gen.getVisualStateBlockId()) + val gen = CobblestoneFactory(TestHelper.createLocation()) + assertEquals("cobblestone_factory", gen.getVisualStateBlockId()) } @Test fun `visual state active when power at cost`() { - val gen = CobblestoneGenerator(TestHelper.createLocation()) + val gen = CobblestoneFactory(TestHelper.createLocation()) gen.currentPower = 2 - assertEquals("cobblestone_generator_active", gen.getVisualStateBlockId()) + assertEquals("cobblestone_factory_active", gen.getVisualStateBlockId()) } @Test @@ -53,9 +53,9 @@ class CobblestoneGeneratorTest { val powerRegistry = PowerBlockRegistry(TestHelper.mockPlugin) val genLoc = TestHelper.createLocation(0.0, 64.0, 0.0) - val gen = CobblestoneGenerator(genLoc) + val gen = CobblestoneFactory(genLoc) gen.currentPower = 2 - TestHelper.addToRegistry(powerRegistry, gen, "cobblestone_generator") + TestHelper.addToRegistry(powerRegistry, gen, "cobblestone_factory") val pipeLoc = TestHelper.createLocation(0.0, 64.0, -1.0) val pipe = FluidPipe(pipeLoc, BlockFace.SOUTH) @@ -74,9 +74,9 @@ class CobblestoneGeneratorTest { val powerRegistry = PowerBlockRegistry(TestHelper.mockPlugin) val genLoc = TestHelper.createLocation(0.0, 64.0, 0.0) - val gen = CobblestoneGenerator(genLoc) + val gen = CobblestoneFactory(genLoc) gen.currentPower = 2 - TestHelper.addToRegistry(powerRegistry, gen, "cobblestone_generator") + TestHelper.addToRegistry(powerRegistry, gen, "cobblestone_factory") val pipeLoc = TestHelper.createLocation(0.0, 64.0, -1.0) val pipe = FluidPipe(pipeLoc, BlockFace.SOUTH) @@ -95,9 +95,9 @@ class CobblestoneGeneratorTest { val powerRegistry = PowerBlockRegistry(TestHelper.mockPlugin) val genLoc = TestHelper.createLocation(0.0, 64.0, 0.0) - val gen = CobblestoneGenerator(genLoc) + val gen = CobblestoneFactory(genLoc) gen.currentPower = 1 - TestHelper.addToRegistry(powerRegistry, gen, "cobblestone_generator") + TestHelper.addToRegistry(powerRegistry, gen, "cobblestone_factory") val waterPipeLoc = TestHelper.createLocation(0.0, 64.0, -1.0) val waterPipe = FluidPipe(waterPipeLoc, BlockFace.SOUTH) @@ -122,9 +122,9 @@ class CobblestoneGeneratorTest { val powerRegistry = PowerBlockRegistry(TestHelper.mockPlugin) val genLoc = TestHelper.createLocation(0.0, 64.0, 0.0) - val gen = CobblestoneGenerator(genLoc) + val gen = CobblestoneFactory(genLoc) gen.currentPower = 2 - TestHelper.addToRegistry(powerRegistry, gen, "cobblestone_generator") + TestHelper.addToRegistry(powerRegistry, gen, "cobblestone_factory") val waterPipeLoc = TestHelper.createLocation(0.0, 64.0, -1.0) val waterPipe = FluidPipe(waterPipeLoc, BlockFace.SOUTH) @@ -149,12 +149,12 @@ class CobblestoneGeneratorTest { @Test fun `descriptor has correct properties`() { - val desc = CobblestoneGenerator.descriptor - assertEquals("cobblestone_generator", desc.baseBlockId) - assertEquals("Cobblestone Generator", desc.displayName) + val desc = CobblestoneFactory.descriptor + assertEquals("cobblestone_factory", desc.baseBlockId) + assertEquals("Cobblestone Factory", desc.displayName) assertEquals(2, desc.allRegistrableIds.size) - assertTrue(desc.allRegistrableIds.contains("cobblestone_generator")) - assertTrue(desc.allRegistrableIds.contains("cobblestone_generator_active")) + assertTrue(desc.allRegistrableIds.contains("cobblestone_factory")) + assertTrue(desc.allRegistrableIds.contains("cobblestone_factory_active")) } @Test @@ -163,8 +163,8 @@ class CobblestoneGeneratorTest { val powerRegistry = PowerBlockRegistry(TestHelper.mockPlugin) val genLoc = TestHelper.createLocation(0.0, 64.0, 0.0) - val gen = CobblestoneGenerator(genLoc) - TestHelper.addToRegistry(powerRegistry, gen, "cobblestone_generator") + val gen = CobblestoneFactory(genLoc) + TestHelper.addToRegistry(powerRegistry, gen, "cobblestone_factory") val batteryLoc = TestHelper.createLocation(1.0, 64.0, 0.0) val battery = com.coderjoe.atlas.power.block.SmallBattery(batteryLoc, BlockFace.DOWN) diff --git a/src/test/kotlin/com/coderjoe/atlas/power/ObsidianGeneratorTest.kt b/src/test/kotlin/com/coderjoe/atlas/power/ObsidianFactoryTest.kt similarity index 78% rename from src/test/kotlin/com/coderjoe/atlas/power/ObsidianGeneratorTest.kt rename to src/test/kotlin/com/coderjoe/atlas/power/ObsidianFactoryTest.kt index ccc73e3..11024ec 100644 --- a/src/test/kotlin/com/coderjoe/atlas/power/ObsidianGeneratorTest.kt +++ b/src/test/kotlin/com/coderjoe/atlas/power/ObsidianFactoryTest.kt @@ -5,12 +5,12 @@ import com.coderjoe.atlas.TestHelper.callPowerUpdate import com.coderjoe.atlas.fluid.FluidBlockRegistry import com.coderjoe.atlas.fluid.FluidType import com.coderjoe.atlas.fluid.block.FluidPipe -import com.coderjoe.atlas.power.block.ObsidianGenerator +import com.coderjoe.atlas.power.block.ObsidianFactory import org.bukkit.block.BlockFace import org.junit.jupiter.api.* import org.junit.jupiter.api.Assertions.* -class ObsidianGeneratorTest { +class ObsidianFactoryTest { @BeforeEach fun setup() { @@ -24,28 +24,28 @@ class ObsidianGeneratorTest { @Test fun `obsidian generator maxStorage is 100`() { - val gen = ObsidianGenerator(TestHelper.createLocation()) + val gen = ObsidianFactory(TestHelper.createLocation()) assertEquals(100, gen.maxStorage) } @Test fun `obsidian generator canReceivePower is true`() { - val gen = ObsidianGenerator(TestHelper.createLocation()) + val gen = ObsidianFactory(TestHelper.createLocation()) assertTrue(gen.canAcceptPower()) } @Test fun `visual state idle when insufficient power`() { - val gen = ObsidianGenerator(TestHelper.createLocation()) + val gen = ObsidianFactory(TestHelper.createLocation()) gen.currentPower = 99 - assertEquals("obsidian_generator", gen.getVisualStateBlockId()) + assertEquals("obsidian_factory", gen.getVisualStateBlockId()) } @Test fun `visual state active when power at cost`() { - val gen = ObsidianGenerator(TestHelper.createLocation()) + val gen = ObsidianFactory(TestHelper.createLocation()) gen.currentPower = 100 - assertEquals("obsidian_generator_active", gen.getVisualStateBlockId()) + assertEquals("obsidian_factory_active", gen.getVisualStateBlockId()) } @Test @@ -54,9 +54,9 @@ class ObsidianGeneratorTest { val powerRegistry = PowerBlockRegistry(TestHelper.mockPlugin) val genLoc = TestHelper.createLocation(0.0, 64.0, 0.0) - val gen = ObsidianGenerator(genLoc) + val gen = ObsidianFactory(genLoc) gen.currentPower = 100 - TestHelper.addToRegistry(powerRegistry, gen, "obsidian_generator") + TestHelper.addToRegistry(powerRegistry, gen, "obsidian_factory") val pipeLoc = TestHelper.createLocation(0.0, 64.0, -1.0) val pipe = FluidPipe(pipeLoc, BlockFace.SOUTH) @@ -75,9 +75,9 @@ class ObsidianGeneratorTest { val powerRegistry = PowerBlockRegistry(TestHelper.mockPlugin) val genLoc = TestHelper.createLocation(0.0, 64.0, 0.0) - val gen = ObsidianGenerator(genLoc) + val gen = ObsidianFactory(genLoc) gen.currentPower = 100 - TestHelper.addToRegistry(powerRegistry, gen, "obsidian_generator") + TestHelper.addToRegistry(powerRegistry, gen, "obsidian_factory") val pipeLoc = TestHelper.createLocation(0.0, 64.0, -1.0) val pipe = FluidPipe(pipeLoc, BlockFace.SOUTH) @@ -96,9 +96,9 @@ class ObsidianGeneratorTest { val powerRegistry = PowerBlockRegistry(TestHelper.mockPlugin) val genLoc = TestHelper.createLocation(0.0, 64.0, 0.0) - val gen = ObsidianGenerator(genLoc) + val gen = ObsidianFactory(genLoc) gen.currentPower = 99 - TestHelper.addToRegistry(powerRegistry, gen, "obsidian_generator") + TestHelper.addToRegistry(powerRegistry, gen, "obsidian_factory") val waterPipeLoc = TestHelper.createLocation(0.0, 64.0, -1.0) val waterPipe = FluidPipe(waterPipeLoc, BlockFace.SOUTH) @@ -123,9 +123,9 @@ class ObsidianGeneratorTest { val powerRegistry = PowerBlockRegistry(TestHelper.mockPlugin) val genLoc = TestHelper.createLocation(0.0, 64.0, 0.0) - val gen = ObsidianGenerator(genLoc) + val gen = ObsidianFactory(genLoc) gen.currentPower = 100 - TestHelper.addToRegistry(powerRegistry, gen, "obsidian_generator") + TestHelper.addToRegistry(powerRegistry, gen, "obsidian_factory") val waterPipeLoc = TestHelper.createLocation(0.0, 64.0, -1.0) val waterPipe = FluidPipe(waterPipeLoc, BlockFace.SOUTH) @@ -150,12 +150,12 @@ class ObsidianGeneratorTest { @Test fun `descriptor has correct properties`() { - val desc = ObsidianGenerator.descriptor - assertEquals("obsidian_generator", desc.baseBlockId) - assertEquals("Obsidian Generator", desc.displayName) + val desc = ObsidianFactory.descriptor + assertEquals("obsidian_factory", desc.baseBlockId) + assertEquals("Obsidian Factory", desc.displayName) assertEquals(2, desc.allRegistrableIds.size) - assertTrue(desc.allRegistrableIds.contains("obsidian_generator")) - assertTrue(desc.allRegistrableIds.contains("obsidian_generator_active")) + assertTrue(desc.allRegistrableIds.contains("obsidian_factory")) + assertTrue(desc.allRegistrableIds.contains("obsidian_factory_active")) } @Test @@ -164,8 +164,8 @@ class ObsidianGeneratorTest { val powerRegistry = PowerBlockRegistry(TestHelper.mockPlugin) val genLoc = TestHelper.createLocation(0.0, 64.0, 0.0) - val gen = ObsidianGenerator(genLoc) - TestHelper.addToRegistry(powerRegistry, gen, "obsidian_generator") + val gen = ObsidianFactory(genLoc) + TestHelper.addToRegistry(powerRegistry, gen, "obsidian_factory") val batteryLoc = TestHelper.createLocation(1.0, 64.0, 0.0) val battery = com.coderjoe.atlas.power.block.SmallBattery(batteryLoc, BlockFace.DOWN)