From c27005a369ebc996548d0a8c1b8d96510e06d0c4 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Fri, 6 Nov 2026 17:22:50 +0000 Subject: [PATCH] Continue Steam Advantage as baseSteam on Minecraft 1.14.4 --- .github/workflows/ci.yml | 34 ++-- .github/workflows/codeql-analysis.yml | 20 ++- .github/workflows/release-on-tag.yml | 4 +- CHANGELOG.txt | 9 +- README.md | 19 +- build.gradle | 78 ++++---- gradle.properties | 24 +-- gradlew.bat | 168 +++++++++--------- .../SteamAdvantage.java | 32 ++-- .../blocks/DrillBitBlock.java | 4 +- .../blocks/DrillBitTileEntity.java | 8 +- .../blocks/PlatformBlock.java | 4 +- .../blocks/PumpPipeBlock.java | 2 +- .../blocks/SteamPipeBlock.java | 4 +- .../blocks/SteamTrackBlock.java | 4 +- .../compat/BaseMetalsCompat.java | 2 +- .../config/SteamAdvantageConfig.java | 4 +- .../HighExplosiveEnchantment.java | 4 +- .../enchantments/PowderlessEnchantment.java | 4 +- .../enchantments/RapidReloadEnchantment.java | 4 +- .../enchantments/RecoilEnchantment.java | 4 +- .../graphics/ClientRegistration.java | 4 +- .../graphics/DrillBitRenderer.java | 6 +- .../gui/BlastFurnaceGUI.java | 8 +- .../gui/CoalBoilerGUI.java | 8 +- .../gui/ElectricBoilerGUI.java | 8 +- .../gui/GUIHelper.java | 4 +- .../gui/GeothermalBoilerGUI.java | 8 +- .../gui/OilBoilerGUI.java | 8 +- .../gui/RockCrusherGUI.java | 8 +- .../gui/SteamDrillGUI.java | 8 +- .../gui/SteamPumpGUI.java | 8 +- .../gui/SteamStillGUI.java | 8 +- .../gui/SteamTankGUI.java | 8 +- .../init/Blocks.java | 40 ++--- .../init/Enchantments.java | 12 +- .../init/Entities.java | 28 +-- .../init/GUI.java | 8 +- .../init/Items.java | 8 +- .../init/Power.java | 2 +- .../init/Recipes.java | 10 +- .../init/TreasureChests.java | 18 +- .../init/Villages.java | 4 +- .../items/MusketItem.java | 14 +- .../machines/BlastFurnaceBlock.java | 4 +- .../machines/BlastFurnaceTileEntity.java | 10 +- .../machines/CoalBoilerBlock.java | 8 +- .../machines/CoalBoilerTileEntity.java | 16 +- .../machines/ElectricBoilerBlock.java | 8 +- .../machines/ElectricBoilerTileEntity.java | 14 +- .../machines/GeothermalBoilerBlock.java | 8 +- .../machines/GeothermalBoilerTileEntity.java | 12 +- .../machines/OilBoilerBlock.java | 8 +- .../machines/OilBoilerTileEntity.java | 18 +- .../machines/RockCrusherBlock.java | 4 +- .../machines/RockCrusherTileEntity.java | 10 +- .../machines/SteamDrillBlock.java | 8 +- .../machines/SteamDrillTileEntity.java | 24 +-- .../machines/SteamElevatorBlock.java | 4 +- .../machines/SteamElevatorTileEntity.java | 10 +- .../machines/SteamPumpBlock.java | 10 +- .../machines/SteamPumpTileEntity.java | 26 +-- .../machines/SteamStillBlock.java | 8 +- .../machines/SteamStillTileEntity.java | 22 +-- .../machines/SteamTankBlock.java | 4 +- .../machines/SteamTankTileEntity.java | 6 +- .../migration/SteamLegacyMigrations.java | 19 +- .../recipe/RecipeConditions.java | 8 +- .../util/FurnaceFuelHelper.java | 2 +- .../util/LegacyFluidHandler.java | 2 +- .../util/SoundHelper.java | 2 +- src/main/resources/META-INF/mods.toml | 20 +-- .../basesteam/blockstates/drillbit.json | 5 + .../basesteam/blockstates/platform.json | 9 + .../blockstates/pump_pipe_steam.json | 5 + .../blockstates/steam_boiler_coal.json | 8 + .../blockstates/steam_boiler_electric.json | 8 + .../blockstates/steam_boiler_geothermal.json | 8 + .../blockstates/steam_boiler_oil.json | 8 + .../basesteam/blockstates/steam_crusher.json | 8 + .../basesteam/blockstates/steam_drill.json | 10 ++ .../basesteam/blockstates/steam_elevator.json | 8 + .../basesteam/blockstates/steam_furnace.json | 8 + .../basesteam/blockstates/steam_pipe.json | 70 ++++++++ .../basesteam/blockstates/steam_pump.json | 8 + .../basesteam/blockstates/steam_still.json | 8 + .../basesteam/blockstates/steam_switch.json | 6 + .../basesteam/blockstates/steam_tank.json | 8 + .../basesteam/blockstates/steam_track.json | 70 ++++++++ .../assets/basesteam/lang/de_de.json | 57 ++++++ .../assets/basesteam/lang/en_au.json | 57 ++++++ .../assets/basesteam/lang/en_ca.json | 56 ++++++ .../assets/basesteam/lang/en_en.json | 56 ++++++ .../assets/basesteam/lang/en_gb.json | 56 ++++++ .../assets/basesteam/lang/en_pt.json | 57 ++++++ .../assets/basesteam/lang/en_us.json | 57 ++++++ .../assets/basesteam/lang/es_es.json | 57 ++++++ .../assets/basesteam/lang/es_mx.json | 57 ++++++ .../assets/basesteam/lang/fr_ca.json | 57 ++++++ .../assets/basesteam/lang/fr_fr.json | 57 ++++++ .../assets/basesteam/lang/it_it.json | 56 ++++++ .../assets/basesteam/lang/ja_jp.json | 57 ++++++ .../assets/basesteam/lang/ko_kr.json | 57 ++++++ .../assets/basesteam/lang/pt_br.json | 57 ++++++ .../assets/basesteam/lang/zh_cn.json | 57 ++++++ .../models/block/drillbit.json | 4 +- .../models/block/platform1.json | 6 +- .../models/block/platform2.json | 6 +- .../models/block/platform3.json | 6 +- .../models/block/platform4.json | 6 +- .../models/block/platform_shaft.json | 6 +- .../models/block/steam_boiler_coal.json | 11 ++ .../models/block/steam_boiler_electric.json | 11 ++ .../models/block/steam_boiler_geothermal.json | 11 ++ .../models/block/steam_boiler_oil.json | 6 +- .../basesteam/models/block/steam_crusher.json | 11 ++ .../models/block/steam_drill.json | 12 +- .../models/block/steam_elevator.json | 11 ++ .../basesteam/models/block/steam_furnace.json | 11 ++ .../models/block/steam_machine_base.json | 0 .../basesteam/models/block/steam_pipe_0.json | 7 + .../models/block/steam_pipe_densuw.json | 7 + .../models/block/steam_pipe_desuw.json | 7 + .../models/block/steam_pipe_dnu.json | 7 + .../models/block/steam_pipe_ensw.json | 7 + .../basesteam/models/block/steam_pipe_n.json | 7 + .../basesteam/models/block/steam_pipe_ns.json | 7 + .../models/block/steam_pipe_nsuw.json | 7 + .../models/block/steam_pipe_nsw.json | 7 + .../models/block/steam_pipe_nuw.json | 7 + .../basesteam/models/block/steam_pipe_nw.json | 7 + .../basesteam/models/block/steam_pump.json | 11 ++ .../models/block/steam_still.json | 6 +- .../models/block/steam_switch_off.json | 7 + .../models/block/steam_switch_on.json | 7 + .../models/block/steam_tank.json | 8 +- .../models/block/steam_track_0.json | 8 +- .../models/block/steam_track_densuw.json | 8 +- .../models/block/steam_track_desuw.json | 8 +- .../models/block/steam_track_dnu.json | 8 +- .../models/block/steam_track_ensw.json | 8 +- .../models/block/steam_track_n.json | 8 +- .../models/block/steam_track_ns.json | 8 +- .../models/block/steam_track_nsuw.json | 8 +- .../models/block/steam_track_nsw.json | 8 +- .../models/block/steam_track_nuw.json | 8 +- .../models/block/steam_track_nw.json | 8 +- .../models/item/blackpowder_cartridge.json | 6 + .../models/item/drillbit.json | 4 +- .../models/item/musket.json | 6 +- .../models/item/musket_loaded.json | 8 +- .../models/item/musket_loading.json | 8 +- .../models/item/musket_unloaded.json | 8 +- .../basesteam/models/item/platform.json | 4 + .../models/item/pump_pipe_steam.json | 4 + .../models/item/steam_boiler_coal.json | 4 + .../models/item/steam_boiler_electric.json | 4 + .../models/item/steam_boiler_geothermal.json | 4 + .../models/item/steam_boiler_oil.json | 4 + .../basesteam/models/item/steam_crusher.json | 4 + .../basesteam/models/item/steam_drill.json | 4 + .../models/item/steam_drill_bit.json | 2 +- .../basesteam/models/item/steam_elevator.json | 4 + .../basesteam/models/item/steam_furnace.json | 4 + .../models/item/steam_governor.json | 2 +- .../basesteam/models/item/steam_pipe.json | 4 + .../basesteam/models/item/steam_pump.json | 4 + .../basesteam/models/item/steam_still.json | 4 + .../basesteam/models/item/steam_switch.json | 3 + .../basesteam/models/item/steam_tank.json | 3 + .../basesteam/models/item/steam_track.json | 3 + .../textures/blocks/coal_boiler_front.png | Bin .../textures/blocks/electric_boiler_back.png | Bin .../textures/blocks/electric_boiler_front.png | Bin .../blocks/geothermal_boiler_side.png | Bin .../textures/blocks/geothermal_boiler_top.png | Bin .../textures/blocks/oil_tank_end.png | Bin .../textures/blocks/platform_top.png | Bin .../textures/blocks/rock_crusher_front.png | Bin .../textures/blocks/rock_crusher_top.png | Bin .../textures/blocks/steam_drill_bottom.png | Bin .../textures/blocks/steam_drill_top.png | Bin .../textures/blocks/steam_elevator_side.png | Bin .../textures/blocks/steam_furnace_front.png | Bin .../textures/blocks/steam_furnace_top.png | Bin .../textures/blocks/steam_pipe.png | Bin .../textures/blocks/steam_pump_front.png | Bin .../textures/blocks/steam_pump_side.png | Bin .../textures/blocks/steam_switch_off.png | Bin .../textures/blocks/steam_switch_on.png | Bin .../textures/entity/drill_bit.png | Bin .../textures/gui/container/coal_boiler.png | Bin .../gui/container/electric_boiler.png | Bin .../gui/container/geothermal_boiler.png | Bin .../textures/gui/container/oil_boiler.png | Bin .../textures/gui/container/rock_crusher.png | Bin .../textures/gui/container/steam_drill.png | Bin .../textures/gui/container/steam_furnace.png | Bin .../textures/gui/container/steam_pump.png | Bin .../textures/gui/container/steam_still.png | Bin .../textures/gui/container/steam_tank.png | Bin .../textures/items/blackpowder_cartridge.png | Bin .../textures/items/steam_drill_bit.png | Bin .../textures/items/steam_governor.png | Bin .../textures/materials/bolted_brass.png | Bin .../textures/materials/bolted_copper.png | Bin .../textures/materials/bolted_iron.png | Bin .../textures/materials/iron.png | Bin .../textures/materials/steel_dark_hole.png | Bin .../textures/materials/wood_panel.png | Bin .../steamadvantage/blockstates/drillbit.json | 5 - .../steamadvantage/blockstates/platform.json | 9 - .../blockstates/pump_pipe_steam.json | 5 - .../blockstates/steam_boiler_coal.json | 8 - .../blockstates/steam_boiler_electric.json | 8 - .../blockstates/steam_boiler_geothermal.json | 8 - .../blockstates/steam_boiler_oil.json | 8 - .../blockstates/steam_crusher.json | 8 - .../blockstates/steam_drill.json | 10 -- .../blockstates/steam_elevator.json | 8 - .../blockstates/steam_furnace.json | 8 - .../blockstates/steam_pipe.json | 70 -------- .../blockstates/steam_pump.json | 8 - .../blockstates/steam_still.json | 8 - .../blockstates/steam_switch.json | 6 - .../blockstates/steam_tank.json | 8 - .../blockstates/steam_track.json | 70 -------- .../assets/steamadvantage/lang/de_de.json | 57 ------ .../assets/steamadvantage/lang/en_au.json | 57 ------ .../assets/steamadvantage/lang/en_ca.json | 56 ------ .../assets/steamadvantage/lang/en_en.json | 56 ------ .../assets/steamadvantage/lang/en_gb.json | 56 ------ .../assets/steamadvantage/lang/en_pt.json | 57 ------ .../assets/steamadvantage/lang/en_us.json | 57 ------ .../assets/steamadvantage/lang/es_es.json | 57 ------ .../assets/steamadvantage/lang/es_mx.json | 57 ------ .../assets/steamadvantage/lang/fr_ca.json | 57 ------ .../assets/steamadvantage/lang/fr_fr.json | 57 ------ .../assets/steamadvantage/lang/it_it.json | 56 ------ .../assets/steamadvantage/lang/ja_jp.json | 57 ------ .../assets/steamadvantage/lang/ko_kr.json | 57 ------ .../assets/steamadvantage/lang/pt_br.json | 57 ------ .../assets/steamadvantage/lang/zh_cn.json | 57 ------ .../models/block/steam_boiler_coal.json | 11 -- .../models/block/steam_boiler_electric.json | 11 -- .../models/block/steam_boiler_geothermal.json | 11 -- .../models/block/steam_crusher.json | 11 -- .../models/block/steam_elevator.json | 11 -- .../models/block/steam_furnace.json | 11 -- .../models/block/steam_pipe_0.json | 7 - .../models/block/steam_pipe_densuw.json | 7 - .../models/block/steam_pipe_desuw.json | 7 - .../models/block/steam_pipe_dnu.json | 7 - .../models/block/steam_pipe_ensw.json | 7 - .../models/block/steam_pipe_n.json | 7 - .../models/block/steam_pipe_ns.json | 7 - .../models/block/steam_pipe_nsuw.json | 7 - .../models/block/steam_pipe_nsw.json | 7 - .../models/block/steam_pipe_nuw.json | 7 - .../models/block/steam_pipe_nw.json | 7 - .../models/block/steam_pump.json | 11 -- .../models/block/steam_switch_off.json | 7 - .../models/block/steam_switch_on.json | 7 - .../models/item/blackpowder_cartridge.json | 6 - .../steamadvantage/models/item/platform.json | 4 - .../models/item/pump_pipe_steam.json | 4 - .../models/item/steam_boiler_coal.json | 4 - .../models/item/steam_boiler_electric.json | 4 - .../models/item/steam_boiler_geothermal.json | 4 - .../models/item/steam_boiler_oil.json | 4 - .../models/item/steam_crusher.json | 4 - .../models/item/steam_drill.json | 4 - .../models/item/steam_elevator.json | 4 - .../models/item/steam_furnace.json | 4 - .../models/item/steam_pipe.json | 4 - .../models/item/steam_pump.json | 4 - .../models/item/steam_still.json | 4 - .../models/item/steam_switch.json | 3 - .../models/item/steam_tank.json | 3 - .../models/item/steam_track.json | 3 - .../recipes/blackpowder_cartridge.json | 4 +- .../recipes/musket_left_normal.json | 4 +- .../recipes/musket_left_tech.json | 4 +- .../recipes/musket_right_normal.json | 4 +- .../recipes/musket_right_tech.json | 4 +- .../recipes/steam_boiler_coal.json | 4 +- .../recipes/steam_boiler_electric.json | 4 +- .../recipes/steam_boiler_geothermal.json | 4 +- .../recipes/steam_boiler_oil.json | 4 +- .../advancements/recipes/steam_crusher.json | 4 +- .../advancements/recipes/steam_drill.json | 6 +- .../advancements/recipes/steam_drill_bit.json | 4 +- .../steam_drill_diamond_pickaxe_normal.json | 4 +- .../advancements/recipes/steam_elevator.json | 4 +- .../advancements/recipes/steam_furnace.json | 4 +- .../recipes/steam_governor_apocalyptic.json | 4 +- .../recipes/steam_governor_normal.json | 4 +- .../recipes/steam_governor_tech.json | 4 +- .../advancements/recipes/steam_pipe.json | 4 +- .../advancements/recipes/steam_pump.json | 4 +- .../advancements/recipes/steam_still.json | 4 +- .../advancements/recipes/steam_switch.json | 4 +- .../advancements/recipes/steam_tank.json | 4 +- .../advancements/recipes/steam_track.json | 8 +- .../blocks/steam_boiler_coal.json} | 2 +- .../blocks/steam_boiler_electric.json} | 2 +- .../blocks/steam_boiler_geothermal.json | 4 + .../loot_tables/blocks/steam_boiler_oil.json} | 2 +- .../loot_tables/blocks/steam_crusher.json | 4 + .../loot_tables/blocks/steam_drill.json | 4 + .../loot_tables/blocks/steam_elevator.json | 4 + .../loot_tables/blocks/steam_furnace.json | 4 + .../loot_tables/blocks/steam_pipe.json | 4 + .../loot_tables/blocks/steam_pump.json | 4 + .../loot_tables/blocks/steam_still.json | 4 + .../loot_tables/blocks/steam_switch.json | 4 + .../loot_tables/blocks/steam_tank.json | 4 + .../loot_tables/blocks/steam_track.json | 4 + .../loot_tables/chests/advantage_parts.json | 14 +- .../recipes/blackpowder_cartridge.json | 6 +- .../recipes/crushing_steam_boiler_coal.json | 6 + .../crushing_steam_boiler_electric.json | 6 + .../crushing_steam_boiler_geothermal.json | 6 + .../recipes/crushing_steam_crusher.json | 6 + .../recipes/crushing_steam_drill.json | 6 + .../recipes/crushing_steam_elevator.json | 6 + .../recipes/crushing_steam_furnace.json | 6 + .../recipes/crushing_steam_governor.json | 6 + .../recipes/crushing_steam_tank.json | 6 + .../recipes/musket_left_normal.json | 10 +- .../recipes/musket_left_tech.json | 10 +- .../recipes/musket_right_normal.json | 10 +- .../recipes/musket_right_tech.json | 10 +- .../recipes/steam_boiler_coal.json | 12 +- .../recipes/steam_boiler_electric.json | 12 +- .../recipes/steam_boiler_geothermal.json | 12 +- .../recipes/steam_boiler_oil.json | 10 +- .../recipes/steam_crusher.json | 12 +- .../recipes/steam_drill.json | 12 +- .../recipes/steam_drill_bit.json | 10 +- .../steam_drill_diamond_pickaxe_normal.json | 12 +- .../recipes/steam_elevator.json | 12 +- .../recipes/steam_furnace.json | 10 +- .../recipes/steam_governor_apocalyptic.json | 12 +- .../recipes/steam_governor_normal.json | 10 +- .../recipes/steam_governor_tech.json | 12 +- .../recipes/steam_pipe.json | 6 +- .../recipes/steam_pump.json | 10 +- .../recipes/steam_still.json | 10 +- .../recipes/steam_switch.json | 8 +- .../recipes/steam_tank.json | 10 +- .../data/basesteam/recipes/steam_track.json | 15 ++ .../forge/tags/items/ammo/blackpowder.json | 2 +- .../data/forge/tags/items/conduits/steam.json | 2 +- .../forge/tags/items/governors/brass.json | 2 +- .../resources/data/forge/tags/items/guns.json | 2 +- .../loot_tables/blocks/steam_boiler_coal.json | 4 - .../blocks/steam_boiler_electric.json | 4 - .../blocks/steam_boiler_geothermal.json | 4 - .../loot_tables/blocks/steam_crusher.json | 4 - .../loot_tables/blocks/steam_drill.json | 4 - .../loot_tables/blocks/steam_elevator.json | 4 - .../loot_tables/blocks/steam_furnace.json | 4 - .../loot_tables/blocks/steam_pipe.json | 4 - .../loot_tables/blocks/steam_pump.json | 4 - .../loot_tables/blocks/steam_still.json | 4 - .../loot_tables/blocks/steam_tank.json | 4 - .../recipes/crushing_steam_boiler_coal.json | 6 - .../crushing_steam_boiler_electric.json | 6 - .../crushing_steam_boiler_geothermal.json | 6 - .../recipes/crushing_steam_crusher.json | 6 - .../recipes/crushing_steam_drill.json | 6 - .../recipes/crushing_steam_elevator.json | 6 - .../recipes/crushing_steam_furnace.json | 6 - .../recipes/crushing_steam_governor.json | 6 - .../recipes/crushing_steam_tank.json | 6 - .../steamadvantage/recipes/steam_track.json | 15 -- .../blocks/DrillBitPersistenceTest.java | 2 +- .../gui/GUIHelperTest.java | 2 +- .../items/MusketLoadedCartridgeTest.java | 6 +- .../items/MusketPersistenceTest.java | 2 +- .../items/MusketTargetingContractTest.java | 4 +- .../CoalBoilerFillPersistenceTest.java | 8 +- .../machines/RockCrusherComparatorTest.java | 6 +- .../RockCrusherReloadRedstoneTest.java | 10 +- .../machines/SteamDrillPersistenceTest.java | 4 +- .../SteamOperationalPumpSourceTest.java | 6 +- .../SteamOperationalStillCapacityTest.java | 8 +- .../WaterBoilerFluidBoundaryTest.java | 14 +- .../WaterBoilerTankNotificationTest.java | 12 +- .../migration/SteamLegacyMigrationsTest.java | 16 +- .../resources/ClientResourceContractTest.java | 8 +- .../resources/NativeLootContractTest.java | 6 +- .../resources/RecipeUnlockContractTest.java | 4 +- .../util/SoundHelperLoadedPlayersTest.java | 4 +- 395 files changed, 2346 insertions(+), 2327 deletions(-) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/SteamAdvantage.java (77%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/blocks/DrillBitBlock.java (96%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/blocks/DrillBitTileEntity.java (93%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/blocks/PlatformBlock.java (96%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/blocks/PumpPipeBlock.java (98%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/blocks/SteamPipeBlock.java (71%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/blocks/SteamTrackBlock.java (93%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/compat/BaseMetalsCompat.java (98%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/config/SteamAdvantageConfig.java (95%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/enchantments/HighExplosiveEnchantment.java (89%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/enchantments/PowderlessEnchantment.java (88%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/enchantments/RapidReloadEnchantment.java (88%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/enchantments/RecoilEnchantment.java (89%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/graphics/ClientRegistration.java (79%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/graphics/DrillBitRenderer.java (96%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/BlastFurnaceGUI.java (93%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/CoalBoilerGUI.java (92%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/ElectricBoilerGUI.java (91%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/GUIHelper.java (97%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/GeothermalBoilerGUI.java (91%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/OilBoilerGUI.java (92%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/RockCrusherGUI.java (91%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/SteamDrillGUI.java (91%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/SteamPumpGUI.java (92%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/SteamStillGUI.java (92%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/SteamTankGUI.java (90%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/init/Blocks.java (77%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/init/Enchantments.java (78%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/init/Entities.java (78%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/init/GUI.java (86%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/init/Items.java (89%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/init/Power.java (90%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/init/Recipes.java (81%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/init/TreasureChests.java (86%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/init/Villages.java (96%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/items/MusketItem.java (97%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/BlastFurnaceBlock.java (92%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/BlastFurnaceTileEntity.java (95%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/CoalBoilerBlock.java (88%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/CoalBoilerTileEntity.java (95%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/ElectricBoilerBlock.java (85%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/ElectricBoilerTileEntity.java (95%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/GeothermalBoilerBlock.java (86%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/GeothermalBoilerTileEntity.java (96%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/OilBoilerBlock.java (87%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/OilBoilerTileEntity.java (96%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/RockCrusherBlock.java (92%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/RockCrusherTileEntity.java (94%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamDrillBlock.java (96%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamDrillTileEntity.java (95%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamElevatorBlock.java (92%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamElevatorTileEntity.java (92%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamPumpBlock.java (89%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamPumpTileEntity.java (93%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamStillBlock.java (86%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamStillTileEntity.java (94%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamTankBlock.java (92%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamTankTileEntity.java (91%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/migration/SteamLegacyMigrations.java (83%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/recipe/RecipeConditions.java (92%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/util/FurnaceFuelHelper.java (94%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/util/LegacyFluidHandler.java (83%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/util/SoundHelper.java (98%) create mode 100644 src/main/resources/assets/basesteam/blockstates/drillbit.json create mode 100644 src/main/resources/assets/basesteam/blockstates/platform.json create mode 100644 src/main/resources/assets/basesteam/blockstates/pump_pipe_steam.json create mode 100644 src/main/resources/assets/basesteam/blockstates/steam_boiler_coal.json create mode 100644 src/main/resources/assets/basesteam/blockstates/steam_boiler_electric.json create mode 100644 src/main/resources/assets/basesteam/blockstates/steam_boiler_geothermal.json create mode 100644 src/main/resources/assets/basesteam/blockstates/steam_boiler_oil.json create mode 100644 src/main/resources/assets/basesteam/blockstates/steam_crusher.json create mode 100644 src/main/resources/assets/basesteam/blockstates/steam_drill.json create mode 100644 src/main/resources/assets/basesteam/blockstates/steam_elevator.json create mode 100644 src/main/resources/assets/basesteam/blockstates/steam_furnace.json create mode 100644 src/main/resources/assets/basesteam/blockstates/steam_pipe.json create mode 100644 src/main/resources/assets/basesteam/blockstates/steam_pump.json create mode 100644 src/main/resources/assets/basesteam/blockstates/steam_still.json create mode 100644 src/main/resources/assets/basesteam/blockstates/steam_switch.json create mode 100644 src/main/resources/assets/basesteam/blockstates/steam_tank.json create mode 100644 src/main/resources/assets/basesteam/blockstates/steam_track.json create mode 100644 src/main/resources/assets/basesteam/lang/de_de.json create mode 100644 src/main/resources/assets/basesteam/lang/en_au.json create mode 100644 src/main/resources/assets/basesteam/lang/en_ca.json create mode 100644 src/main/resources/assets/basesteam/lang/en_en.json create mode 100644 src/main/resources/assets/basesteam/lang/en_gb.json create mode 100644 src/main/resources/assets/basesteam/lang/en_pt.json create mode 100644 src/main/resources/assets/basesteam/lang/en_us.json create mode 100644 src/main/resources/assets/basesteam/lang/es_es.json create mode 100644 src/main/resources/assets/basesteam/lang/es_mx.json create mode 100644 src/main/resources/assets/basesteam/lang/fr_ca.json create mode 100644 src/main/resources/assets/basesteam/lang/fr_fr.json create mode 100644 src/main/resources/assets/basesteam/lang/it_it.json create mode 100644 src/main/resources/assets/basesteam/lang/ja_jp.json create mode 100644 src/main/resources/assets/basesteam/lang/ko_kr.json create mode 100644 src/main/resources/assets/basesteam/lang/pt_br.json create mode 100644 src/main/resources/assets/basesteam/lang/zh_cn.json rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/drillbit.json (82%) rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/platform1.json (79%) rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/platform2.json (88%) rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/platform3.json (88%) rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/platform4.json (88%) rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/platform_shaft.json (79%) create mode 100644 src/main/resources/assets/basesteam/models/block/steam_boiler_coal.json create mode 100644 src/main/resources/assets/basesteam/models/block/steam_boiler_electric.json create mode 100644 src/main/resources/assets/basesteam/models/block/steam_boiler_geothermal.json rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/steam_boiler_oil.json (96%) create mode 100644 src/main/resources/assets/basesteam/models/block/steam_crusher.json rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/steam_drill.json (93%) create mode 100644 src/main/resources/assets/basesteam/models/block/steam_elevator.json create mode 100644 src/main/resources/assets/basesteam/models/block/steam_furnace.json rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/steam_machine_base.json (100%) create mode 100644 src/main/resources/assets/basesteam/models/block/steam_pipe_0.json create mode 100644 src/main/resources/assets/basesteam/models/block/steam_pipe_densuw.json create mode 100644 src/main/resources/assets/basesteam/models/block/steam_pipe_desuw.json create mode 100644 src/main/resources/assets/basesteam/models/block/steam_pipe_dnu.json create mode 100644 src/main/resources/assets/basesteam/models/block/steam_pipe_ensw.json create mode 100644 src/main/resources/assets/basesteam/models/block/steam_pipe_n.json create mode 100644 src/main/resources/assets/basesteam/models/block/steam_pipe_ns.json create mode 100644 src/main/resources/assets/basesteam/models/block/steam_pipe_nsuw.json create mode 100644 src/main/resources/assets/basesteam/models/block/steam_pipe_nsw.json create mode 100644 src/main/resources/assets/basesteam/models/block/steam_pipe_nuw.json create mode 100644 src/main/resources/assets/basesteam/models/block/steam_pipe_nw.json create mode 100644 src/main/resources/assets/basesteam/models/block/steam_pump.json rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/steam_still.json (96%) create mode 100644 src/main/resources/assets/basesteam/models/block/steam_switch_off.json create mode 100644 src/main/resources/assets/basesteam/models/block/steam_switch_on.json rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/steam_tank.json (94%) rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/steam_track_0.json (90%) rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/steam_track_densuw.json (95%) rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/steam_track_desuw.json (95%) rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/steam_track_dnu.json (94%) rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/steam_track_ensw.json (94%) rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/steam_track_n.json (93%) rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/steam_track_ns.json (94%) rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/steam_track_nsuw.json (95%) rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/steam_track_nsw.json (94%) rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/steam_track_nuw.json (94%) rename src/main/resources/assets/{steamadvantage => basesteam}/models/block/steam_track_nw.json (93%) create mode 100644 src/main/resources/assets/basesteam/models/item/blackpowder_cartridge.json rename src/main/resources/assets/{steamadvantage => basesteam}/models/item/drillbit.json (88%) rename src/main/resources/assets/{steamadvantage => basesteam}/models/item/musket.json (64%) rename src/main/resources/assets/{steamadvantage => basesteam}/models/item/musket_loaded.json (91%) rename src/main/resources/assets/{steamadvantage => basesteam}/models/item/musket_loading.json (91%) rename src/main/resources/assets/{steamadvantage => basesteam}/models/item/musket_unloaded.json (91%) create mode 100644 src/main/resources/assets/basesteam/models/item/platform.json create mode 100644 src/main/resources/assets/basesteam/models/item/pump_pipe_steam.json create mode 100644 src/main/resources/assets/basesteam/models/item/steam_boiler_coal.json create mode 100644 src/main/resources/assets/basesteam/models/item/steam_boiler_electric.json create mode 100644 src/main/resources/assets/basesteam/models/item/steam_boiler_geothermal.json create mode 100644 src/main/resources/assets/basesteam/models/item/steam_boiler_oil.json create mode 100644 src/main/resources/assets/basesteam/models/item/steam_crusher.json create mode 100644 src/main/resources/assets/basesteam/models/item/steam_drill.json rename src/main/resources/assets/{steamadvantage => basesteam}/models/item/steam_drill_bit.json (50%) create mode 100644 src/main/resources/assets/basesteam/models/item/steam_elevator.json create mode 100644 src/main/resources/assets/basesteam/models/item/steam_furnace.json rename src/main/resources/assets/{steamadvantage => basesteam}/models/item/steam_governor.json (50%) create mode 100644 src/main/resources/assets/basesteam/models/item/steam_pipe.json create mode 100644 src/main/resources/assets/basesteam/models/item/steam_pump.json create mode 100644 src/main/resources/assets/basesteam/models/item/steam_still.json create mode 100644 src/main/resources/assets/basesteam/models/item/steam_switch.json create mode 100644 src/main/resources/assets/basesteam/models/item/steam_tank.json create mode 100644 src/main/resources/assets/basesteam/models/item/steam_track.json rename src/main/resources/assets/{steamadvantage => basesteam}/textures/blocks/coal_boiler_front.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/blocks/electric_boiler_back.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/blocks/electric_boiler_front.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/blocks/geothermal_boiler_side.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/blocks/geothermal_boiler_top.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/blocks/oil_tank_end.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/blocks/platform_top.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/blocks/rock_crusher_front.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/blocks/rock_crusher_top.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/blocks/steam_drill_bottom.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/blocks/steam_drill_top.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/blocks/steam_elevator_side.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/blocks/steam_furnace_front.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/blocks/steam_furnace_top.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/blocks/steam_pipe.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/blocks/steam_pump_front.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/blocks/steam_pump_side.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/blocks/steam_switch_off.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/blocks/steam_switch_on.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/entity/drill_bit.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/gui/container/coal_boiler.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/gui/container/electric_boiler.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/gui/container/geothermal_boiler.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/gui/container/oil_boiler.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/gui/container/rock_crusher.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/gui/container/steam_drill.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/gui/container/steam_furnace.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/gui/container/steam_pump.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/gui/container/steam_still.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/gui/container/steam_tank.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/items/blackpowder_cartridge.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/items/steam_drill_bit.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/items/steam_governor.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/materials/bolted_brass.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/materials/bolted_copper.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/materials/bolted_iron.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/materials/iron.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/materials/steel_dark_hole.png (100%) rename src/main/resources/assets/{steamadvantage => basesteam}/textures/materials/wood_panel.png (100%) delete mode 100644 src/main/resources/assets/steamadvantage/blockstates/drillbit.json delete mode 100644 src/main/resources/assets/steamadvantage/blockstates/platform.json delete mode 100644 src/main/resources/assets/steamadvantage/blockstates/pump_pipe_steam.json delete mode 100644 src/main/resources/assets/steamadvantage/blockstates/steam_boiler_coal.json delete mode 100644 src/main/resources/assets/steamadvantage/blockstates/steam_boiler_electric.json delete mode 100644 src/main/resources/assets/steamadvantage/blockstates/steam_boiler_geothermal.json delete mode 100644 src/main/resources/assets/steamadvantage/blockstates/steam_boiler_oil.json delete mode 100644 src/main/resources/assets/steamadvantage/blockstates/steam_crusher.json delete mode 100644 src/main/resources/assets/steamadvantage/blockstates/steam_drill.json delete mode 100644 src/main/resources/assets/steamadvantage/blockstates/steam_elevator.json delete mode 100644 src/main/resources/assets/steamadvantage/blockstates/steam_furnace.json delete mode 100644 src/main/resources/assets/steamadvantage/blockstates/steam_pipe.json delete mode 100644 src/main/resources/assets/steamadvantage/blockstates/steam_pump.json delete mode 100644 src/main/resources/assets/steamadvantage/blockstates/steam_still.json delete mode 100644 src/main/resources/assets/steamadvantage/blockstates/steam_switch.json delete mode 100644 src/main/resources/assets/steamadvantage/blockstates/steam_tank.json delete mode 100644 src/main/resources/assets/steamadvantage/blockstates/steam_track.json delete mode 100644 src/main/resources/assets/steamadvantage/lang/de_de.json delete mode 100644 src/main/resources/assets/steamadvantage/lang/en_au.json delete mode 100644 src/main/resources/assets/steamadvantage/lang/en_ca.json delete mode 100644 src/main/resources/assets/steamadvantage/lang/en_en.json delete mode 100644 src/main/resources/assets/steamadvantage/lang/en_gb.json delete mode 100644 src/main/resources/assets/steamadvantage/lang/en_pt.json delete mode 100644 src/main/resources/assets/steamadvantage/lang/en_us.json delete mode 100644 src/main/resources/assets/steamadvantage/lang/es_es.json delete mode 100644 src/main/resources/assets/steamadvantage/lang/es_mx.json delete mode 100644 src/main/resources/assets/steamadvantage/lang/fr_ca.json delete mode 100644 src/main/resources/assets/steamadvantage/lang/fr_fr.json delete mode 100644 src/main/resources/assets/steamadvantage/lang/it_it.json delete mode 100644 src/main/resources/assets/steamadvantage/lang/ja_jp.json delete mode 100644 src/main/resources/assets/steamadvantage/lang/ko_kr.json delete mode 100644 src/main/resources/assets/steamadvantage/lang/pt_br.json delete mode 100644 src/main/resources/assets/steamadvantage/lang/zh_cn.json delete mode 100644 src/main/resources/assets/steamadvantage/models/block/steam_boiler_coal.json delete mode 100644 src/main/resources/assets/steamadvantage/models/block/steam_boiler_electric.json delete mode 100644 src/main/resources/assets/steamadvantage/models/block/steam_boiler_geothermal.json delete mode 100644 src/main/resources/assets/steamadvantage/models/block/steam_crusher.json delete mode 100644 src/main/resources/assets/steamadvantage/models/block/steam_elevator.json delete mode 100644 src/main/resources/assets/steamadvantage/models/block/steam_furnace.json delete mode 100644 src/main/resources/assets/steamadvantage/models/block/steam_pipe_0.json delete mode 100644 src/main/resources/assets/steamadvantage/models/block/steam_pipe_densuw.json delete mode 100644 src/main/resources/assets/steamadvantage/models/block/steam_pipe_desuw.json delete mode 100644 src/main/resources/assets/steamadvantage/models/block/steam_pipe_dnu.json delete mode 100644 src/main/resources/assets/steamadvantage/models/block/steam_pipe_ensw.json delete mode 100644 src/main/resources/assets/steamadvantage/models/block/steam_pipe_n.json delete mode 100644 src/main/resources/assets/steamadvantage/models/block/steam_pipe_ns.json delete mode 100644 src/main/resources/assets/steamadvantage/models/block/steam_pipe_nsuw.json delete mode 100644 src/main/resources/assets/steamadvantage/models/block/steam_pipe_nsw.json delete mode 100644 src/main/resources/assets/steamadvantage/models/block/steam_pipe_nuw.json delete mode 100644 src/main/resources/assets/steamadvantage/models/block/steam_pipe_nw.json delete mode 100644 src/main/resources/assets/steamadvantage/models/block/steam_pump.json delete mode 100644 src/main/resources/assets/steamadvantage/models/block/steam_switch_off.json delete mode 100644 src/main/resources/assets/steamadvantage/models/block/steam_switch_on.json delete mode 100644 src/main/resources/assets/steamadvantage/models/item/blackpowder_cartridge.json delete mode 100644 src/main/resources/assets/steamadvantage/models/item/platform.json delete mode 100644 src/main/resources/assets/steamadvantage/models/item/pump_pipe_steam.json delete mode 100644 src/main/resources/assets/steamadvantage/models/item/steam_boiler_coal.json delete mode 100644 src/main/resources/assets/steamadvantage/models/item/steam_boiler_electric.json delete mode 100644 src/main/resources/assets/steamadvantage/models/item/steam_boiler_geothermal.json delete mode 100644 src/main/resources/assets/steamadvantage/models/item/steam_boiler_oil.json delete mode 100644 src/main/resources/assets/steamadvantage/models/item/steam_crusher.json delete mode 100644 src/main/resources/assets/steamadvantage/models/item/steam_drill.json delete mode 100644 src/main/resources/assets/steamadvantage/models/item/steam_elevator.json delete mode 100644 src/main/resources/assets/steamadvantage/models/item/steam_furnace.json delete mode 100644 src/main/resources/assets/steamadvantage/models/item/steam_pipe.json delete mode 100644 src/main/resources/assets/steamadvantage/models/item/steam_pump.json delete mode 100644 src/main/resources/assets/steamadvantage/models/item/steam_still.json delete mode 100644 src/main/resources/assets/steamadvantage/models/item/steam_switch.json delete mode 100644 src/main/resources/assets/steamadvantage/models/item/steam_tank.json delete mode 100644 src/main/resources/assets/steamadvantage/models/item/steam_track.json rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/blackpowder_cartridge.json (90%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/musket_left_normal.json (90%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/musket_left_tech.json (91%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/musket_right_normal.json (90%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/musket_right_tech.json (91%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/steam_boiler_coal.json (92%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/steam_boiler_electric.json (93%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/steam_boiler_geothermal.json (93%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/steam_boiler_oil.json (93%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/steam_crusher.json (94%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/steam_drill.json (89%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/steam_drill_bit.json (91%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/steam_drill_diamond_pickaxe_normal.json (90%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/steam_elevator.json (94%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/steam_furnace.json (93%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/steam_governor_apocalyptic.json (89%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/steam_governor_normal.json (87%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/steam_governor_tech.json (90%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/steam_pipe.json (86%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/steam_pump.json (94%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/steam_still.json (93%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/steam_switch.json (91%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/steam_tank.json (92%) rename src/main/resources/data/{steamadvantage => basesteam}/advancements/recipes/steam_track.json (78%) rename src/main/resources/data/{steamadvantage/loot_tables/blocks/steam_switch.json => basesteam/loot_tables/blocks/steam_boiler_coal.json} (68%) rename src/main/resources/data/{steamadvantage/loot_tables/blocks/steam_boiler_oil.json => basesteam/loot_tables/blocks/steam_boiler_electric.json} (68%) create mode 100644 src/main/resources/data/basesteam/loot_tables/blocks/steam_boiler_geothermal.json rename src/main/resources/data/{steamadvantage/loot_tables/blocks/steam_track.json => basesteam/loot_tables/blocks/steam_boiler_oil.json} (68%) create mode 100644 src/main/resources/data/basesteam/loot_tables/blocks/steam_crusher.json create mode 100644 src/main/resources/data/basesteam/loot_tables/blocks/steam_drill.json create mode 100644 src/main/resources/data/basesteam/loot_tables/blocks/steam_elevator.json create mode 100644 src/main/resources/data/basesteam/loot_tables/blocks/steam_furnace.json create mode 100644 src/main/resources/data/basesteam/loot_tables/blocks/steam_pipe.json create mode 100644 src/main/resources/data/basesteam/loot_tables/blocks/steam_pump.json create mode 100644 src/main/resources/data/basesteam/loot_tables/blocks/steam_still.json create mode 100644 src/main/resources/data/basesteam/loot_tables/blocks/steam_switch.json create mode 100644 src/main/resources/data/basesteam/loot_tables/blocks/steam_tank.json create mode 100644 src/main/resources/data/basesteam/loot_tables/blocks/steam_track.json rename src/main/resources/data/{steamadvantage => basesteam}/loot_tables/chests/advantage_parts.json (79%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/blackpowder_cartridge.json (70%) create mode 100644 src/main/resources/data/basesteam/recipes/crushing_steam_boiler_coal.json create mode 100644 src/main/resources/data/basesteam/recipes/crushing_steam_boiler_electric.json create mode 100644 src/main/resources/data/basesteam/recipes/crushing_steam_boiler_geothermal.json create mode 100644 src/main/resources/data/basesteam/recipes/crushing_steam_crusher.json create mode 100644 src/main/resources/data/basesteam/recipes/crushing_steam_drill.json create mode 100644 src/main/resources/data/basesteam/recipes/crushing_steam_elevator.json create mode 100644 src/main/resources/data/basesteam/recipes/crushing_steam_furnace.json create mode 100644 src/main/resources/data/basesteam/recipes/crushing_steam_governor.json create mode 100644 src/main/resources/data/basesteam/recipes/crushing_steam_tank.json rename src/main/resources/data/{steamadvantage => basesteam}/recipes/musket_left_normal.json (65%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/musket_left_tech.json (66%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/musket_right_normal.json (65%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/musket_right_tech.json (66%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/steam_boiler_coal.json (65%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/steam_boiler_electric.json (66%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/steam_boiler_geothermal.json (67%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/steam_boiler_oil.json (70%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/steam_crusher.json (69%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/steam_drill.json (62%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/steam_drill_bit.json (65%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/steam_drill_diamond_pickaxe_normal.json (66%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/steam_elevator.json (68%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/steam_furnace.json (68%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/steam_governor_apocalyptic.json (65%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/steam_governor_normal.json (68%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/steam_governor_tech.json (65%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/steam_pipe.json (67%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/steam_pump.json (71%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/steam_still.json (71%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/steam_switch.json (68%) rename src/main/resources/data/{steamadvantage => basesteam}/recipes/steam_tank.json (67%) create mode 100644 src/main/resources/data/basesteam/recipes/steam_track.json delete mode 100644 src/main/resources/data/steamadvantage/loot_tables/blocks/steam_boiler_coal.json delete mode 100644 src/main/resources/data/steamadvantage/loot_tables/blocks/steam_boiler_electric.json delete mode 100644 src/main/resources/data/steamadvantage/loot_tables/blocks/steam_boiler_geothermal.json delete mode 100644 src/main/resources/data/steamadvantage/loot_tables/blocks/steam_crusher.json delete mode 100644 src/main/resources/data/steamadvantage/loot_tables/blocks/steam_drill.json delete mode 100644 src/main/resources/data/steamadvantage/loot_tables/blocks/steam_elevator.json delete mode 100644 src/main/resources/data/steamadvantage/loot_tables/blocks/steam_furnace.json delete mode 100644 src/main/resources/data/steamadvantage/loot_tables/blocks/steam_pipe.json delete mode 100644 src/main/resources/data/steamadvantage/loot_tables/blocks/steam_pump.json delete mode 100644 src/main/resources/data/steamadvantage/loot_tables/blocks/steam_still.json delete mode 100644 src/main/resources/data/steamadvantage/loot_tables/blocks/steam_tank.json delete mode 100644 src/main/resources/data/steamadvantage/recipes/crushing_steam_boiler_coal.json delete mode 100644 src/main/resources/data/steamadvantage/recipes/crushing_steam_boiler_electric.json delete mode 100644 src/main/resources/data/steamadvantage/recipes/crushing_steam_boiler_geothermal.json delete mode 100644 src/main/resources/data/steamadvantage/recipes/crushing_steam_crusher.json delete mode 100644 src/main/resources/data/steamadvantage/recipes/crushing_steam_drill.json delete mode 100644 src/main/resources/data/steamadvantage/recipes/crushing_steam_elevator.json delete mode 100644 src/main/resources/data/steamadvantage/recipes/crushing_steam_furnace.json delete mode 100644 src/main/resources/data/steamadvantage/recipes/crushing_steam_governor.json delete mode 100644 src/main/resources/data/steamadvantage/recipes/crushing_steam_tank.json delete mode 100644 src/main/resources/data/steamadvantage/recipes/steam_track.json rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/blocks/DrillBitPersistenceTest.java (97%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/GUIHelperTest.java (96%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/items/MusketLoadedCartridgeTest.java (96%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/items/MusketPersistenceTest.java (97%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/items/MusketTargetingContractTest.java (97%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/CoalBoilerFillPersistenceTest.java (96%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/RockCrusherComparatorTest.java (75%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/RockCrusherReloadRedstoneTest.java (85%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamDrillPersistenceTest.java (98%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamOperationalPumpSourceTest.java (97%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamOperationalStillCapacityTest.java (93%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/WaterBoilerFluidBoundaryTest.java (88%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/WaterBoilerTankNotificationTest.java (91%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/migration/SteamLegacyMigrationsTest.java (80%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/resources/ClientResourceContractTest.java (92%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/resources/NativeLootContractTest.java (90%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/resources/RecipeUnlockContractTest.java (98%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/util/SoundHelperLoadedPlayersTest.java (98%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 80c3d53..f150f06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ permissions: contents: read concurrency: - group: steamadvantage-1.14-${{ github.workflow }}-${{ github.ref }} + group: basesteam-1.14-${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 105 steps: - - name: Check out SteamAdvantage + - name: Check out baseSteam uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 - name: Check out pinned OreSpawn uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 @@ -36,11 +36,21 @@ jobs: repository: MinecraftModDevelopmentMods/BaseMetals ref: 713802f93f2d1f650e1593fa35c487ea43add4a5 path: .ci-dependencies/BaseMetals - - name: Check out PowerAdvantage 1.14.4 + - name: Read basePower source pin + id: power-pin + shell: bash + run: | + ref=$(sed -n 's/^poweradvantage_source_ref=//p' gradle.properties) + if [[ ! "$ref" =~ ^[a-f0-9]{40}$ ]]; then + echo "::error::Set poweradvantage_source_ref to the exact hosted basePower commit before building in CI." + exit 1 + fi + echo "ref=$ref" >> "$GITHUB_OUTPUT" + - name: Check out pinned basePower uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: - repository: MinecraftModDevelopmentMods/PowerAdvantage - ref: 1d498ca02b6795b16435f0ece35ac04c67ef6948 + repository: MinecraftModDevelopmentMods/basePower + ref: ${{ steps.power-pin.outputs.ref }} path: .ci-dependencies/PowerAdvantage - name: Install Java 8 toolchain uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 @@ -70,38 +80,36 @@ jobs: (cd "$power" && ./gradlew jar verifyReleaseDependencies \ -PbaseMetalsDeobfJar="$bmjar" -PoreSpawnDeobfJar="$osjar" \ --no-daemon --stacktrace) - powerjar="$power/build/libs-dev/PowerAdvantage-2.4.5.114041-deobf.jar" + powerjar="$power/build/libs-dev/basePower-2.4.6.114041-deobf.jar" test -f "$osjar" && test -f "$bmjar" && test -f "$powerjar" echo "orespawn=$osjar" >> "$GITHUB_OUTPUT" echo "basemetals=$bmjar" >> "$GITHUB_OUTPUT" echo "power=$powerjar" >> "$GITHUB_OUTPUT" - echo "power_ref=$(git -C "$power" rev-parse HEAD)" >> "$GITHUB_OUTPUT" - name: Build and audit release artifacts run: >- ./gradlew clean check build javadoc verifyReleaseDependencies verifyReleaseArtifacts writeReleaseChecksums verifyEclipseProductionClasspath -PpowerAdvantageDeobfJar=${{ steps.dependencies.outputs.power }} - -Ppoweradvantage_source_ref=${{ steps.dependencies.outputs.power_ref }} -PbaseMetalsDeobfJar=${{ steps.dependencies.outputs.basemetals }} -PoreSpawnDeobfJar=${{ steps.dependencies.outputs.orespawn }} --no-daemon --stacktrace - name: Upload audited release candidate uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: SteamAdvantage-1.14.4-${{ github.sha }} + name: baseSteam-1.14.4-${{ github.sha }} if-no-files-found: error retention-days: 30 path: | - build/libs/SteamAdvantage-2.2.6.114041.jar - build/libs/SteamAdvantage-2.2.6.114041-sources.jar - build/libs/SteamAdvantage-2.2.6.114041-javadoc.jar + build/libs/baseSteam-2.2.8.114041.jar + build/libs/baseSteam-2.2.8.114041-sources.jar + build/libs/baseSteam-2.2.8.114041-javadoc.jar build/release/SHA256SUMS CHANGELOG.txt - name: Upload diagnostics on failure if: failure() uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: SteamAdvantage-1.14.4-diagnostics-${{ github.sha }} + name: baseSteam-1.14.4-diagnostics-${{ github.sha }} if-no-files-found: ignore retention-days: 14 path: | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9bf204f..880d022 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -36,11 +36,21 @@ jobs: repository: MinecraftModDevelopmentMods/BaseMetals ref: 713802f93f2d1f650e1593fa35c487ea43add4a5 path: .ci-dependencies/BaseMetals - - name: Check out PowerAdvantage 1.14.4 + - name: Read basePower source pin + id: power-pin + shell: bash + run: | + ref=$(sed -n 's/^poweradvantage_source_ref=//p' gradle.properties) + if [[ ! "$ref" =~ ^[a-f0-9]{40}$ ]]; then + echo "::error::Set poweradvantage_source_ref to the exact hosted basePower commit before building in CI." + exit 1 + fi + echo "ref=$ref" >> "$GITHUB_OUTPUT" + - name: Check out pinned basePower uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: - repository: MinecraftModDevelopmentMods/PowerAdvantage - ref: 1d498ca02b6795b16435f0ece35ac04c67ef6948 + repository: MinecraftModDevelopmentMods/basePower + ref: ${{ steps.power-pin.outputs.ref }} path: .ci-dependencies/PowerAdvantage - name: Install Java 8 toolchain uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 @@ -70,12 +80,11 @@ jobs: (cd "$power" && ./gradlew jar verifyReleaseDependencies \ -PbaseMetalsDeobfJar="$bmjar" -PoreSpawnDeobfJar="$osjar" \ --no-daemon --stacktrace) - powerjar="$power/build/libs-dev/PowerAdvantage-2.4.5.114041-deobf.jar" + powerjar="$power/build/libs-dev/basePower-2.4.6.114041-deobf.jar" test -f "$osjar" && test -f "$bmjar" && test -f "$powerjar" echo "orespawn=$osjar" >> "$GITHUB_OUTPUT" echo "basemetals=$bmjar" >> "$GITHUB_OUTPUT" echo "power=$powerjar" >> "$GITHUB_OUTPUT" - echo "power_ref=$(git -C "$power" rev-parse HEAD)" >> "$GITHUB_OUTPUT" - name: Initialize CodeQL uses: github/codeql-action/init@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4 with: @@ -85,7 +94,6 @@ jobs: chmod +x ./gradlew ./gradlew clean classes --rerun-tasks --no-build-cache --no-daemon --stacktrace \ -PpowerAdvantageDeobfJar=${{ steps.dependencies.outputs.power }} \ - -Ppoweradvantage_source_ref=${{ steps.dependencies.outputs.power_ref }} \ -PbaseMetalsDeobfJar=${{ steps.dependencies.outputs.basemetals }} \ -PoreSpawnDeobfJar=${{ steps.dependencies.outputs.orespawn }} - name: Analyze diff --git a/.github/workflows/release-on-tag.yml b/.github/workflows/release-on-tag.yml index 42fd0e3..993c803 100644 --- a/.github/workflows/release-on-tag.yml +++ b/.github/workflows/release-on-tag.yml @@ -10,13 +10,13 @@ permissions: contents: read concurrency: - group: steamadvantage-release-tag-${{ github.ref_name }} + group: basesteam-release-tag-${{ github.ref_name }} cancel-in-progress: false jobs: validate-release-tag: name: Validate tag for manual release confirmation - if: github.repository == 'MinecraftModDevelopmentMods/SteamAdvantage' + if: github.repository == 'MinecraftModDevelopmentMods/baseSteam' runs-on: ubuntu-latest timeout-minutes: 10 diff --git a/CHANGELOG.txt b/CHANGELOG.txt index cab0e7d..4c59324 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,11 @@ -Unreleased - Minecraft 1.14.4 +2.2.8.114041 - baseSteam for Minecraft 1.14.4 + +- Continue Steam Advantage under the baseSteam name on Forge 1.14.4. +- Built and tested with the published basePower 2.4.6.114041 release. +- Keep the old steam machine IDs and musket enchantments readable when upgrading. +- Find the steam machines and parts on the shared basePower creative tab. + +Earlier 1.14.4 fixes - Keep waterlogged blocks intact when the steam pump collects their water, and only charge for successful pickup. - Keep fluid in the steam pump when an attached tank refuses it. diff --git a/README.md b/README.md index eeb9f08..4c8d724 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,12 @@ -# SteamAdvantage +# baseSteam for Minecraft 1.14.4 -**Minecraft 1.14.4 port, version 2.2.6.114041.** Native compilation and 27 unit/resource tests pass. -The combined-mod automated checks also cover client resources, connected machinery, -drill movement, chunk lifecycle, restart persistence and disposable-copy migration. -The [1.14 test results](https://github.com/MinecraftModDevelopmentMods/PowerAdvantage/blob/master-1.14.4/docs/1.14/BROADER-QUALIFICATION.md) -describe the tested scenarios and remaining limits, not a guarantee for an entire modpack. +baseSteam continues DrCyano's Steam Advantage. It adds boilers, pipes and steam-powered machines to basePower. Find them on the **basePower** creative tab. -Steam Advantage adds steam-powered machines and infrastructure to Power Advantage for Minecraft 1.14.4. +Use [basePower 2.4.6.114041](https://www.curseforge.com/minecraft/mc-mods/basepower/files/9477873) for Minecraft 1.14.4. Back up your world and config before upgrading, and test the upgrade on a copy first. Every crafting variant has an ingredient-triggered recipe-book discovery. See the [shared material checklist and discovery tests](https://github.com/MinecraftModDevelopmentMods/PowerAdvantage/blob/master-1.13.2/docs/1.13/RECIPE-DISCOVERY.md). Regenerate unlock JSON after recipe changes with `node tools/generate-recipe-unlocks.js`; `check` audits recipe coverage and criteria. Crushing recipes are deliberately excluded from the crafting book. -The historical [manufacturing progression protocol](https://github.com/MinecraftModDevelopmentMods/PowerAdvantage/blob/master-1.13.2/docs/1.13/MANUFACTURING-PROGRESSION.md) describes raw-material, processing and loot acquisition paths in every mode, including restart persistence. See the 1.14 test results above for this port's coverage. +The historical [manufacturing progression protocol](https://github.com/MinecraftModDevelopmentMods/PowerAdvantage/blob/master-1.13.2/docs/1.13/MANUFACTURING-PROGRESSION.md) describes raw-material, processing and loot acquisition paths in every mode, including restart persistence. ## Building Minecraft 1.14.4 @@ -18,10 +14,9 @@ The `master-1.14.4` build targets Forge 28.2.26, snapshot `20190719-1.14.3` mapp and MCP `20190829.143755`. It uses ForgeGradle 7.0.34 and Gradle 9.6.1. Run Gradle with Java 17; production code is compiled for Java 8. -Build the matching 1.14 PowerAdvantage, Base Metals and OreSpawn deobf jars first. -Dependency versions, checksums and the exact Power source reference belong in -`gradle.properties`. Release audits reject missing or placeholder pins; do not -bypass those checks or substitute a 1.13 dependency. +Build the matching 1.14 basePower, Base Metals and OreSpawn deobf jars first. +`gradle.properties` records the published basePower file and its SHA-256, +along with the exact source commit and development jar hash used to build baseSteam. With the standard sibling layout: ```text diff --git a/build.gradle b/build.gradle index 23326f7..9b794a0 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { group = project.mod_group version = project.mod_version -base.archivesName = 'SteamAdvantage' +base.archivesName = 'baseSteam' def versionParts = project.mod_version.toString().tokenize('.') if (versionParts.size() != 4 || !versionParts.every { it ==~ /\d+/ }) { @@ -101,7 +101,7 @@ minecraft { workingDir.convention layout.projectDirectory.dir(configuredRunDirectory) systemProperty 'forge.logging.markers', 'REGISTRIES' systemProperty 'forge.logging.console.level', 'info' - mods { steamadvantage { source sourceSets.main } } + mods { basesteam { source sourceSets.main } } environment 'target', forge28RunTargets[name] environment 'MCP_MAPPINGS', "${mapping_channel}_${mapping_version}" environment 'MCP_VERSION', mcp_version @@ -166,7 +166,7 @@ repositories { // Local builds use the sibling FG7 output; CI supplies the same pinned jar via // -PpowerAdvantageDeobfJar after building the audited upstream commit. def defaultPowerAdvantageDeobfJar = file("../../PowerAdvantage/build/libs-dev/" \ - + "PowerAdvantage-${project.poweradvantage_version}-deobf.jar") + + "basePower-${project.poweradvantage_version}-deobf.jar") def powerAdvantageDeobfJar = providers.gradleProperty('powerAdvantageDeobfJar') .map { file(it) } .getOrElse(defaultPowerAdvantageDeobfJar) @@ -341,7 +341,7 @@ tasks.register('verifyReleaseConfiguration') { group = 'verification' description = 'Validates release identity, target metadata, and dependency policy.' doLast { - if (project.mod_version != '2.2.6.114041') { + if (project.mod_version != '2.2.8.114041') { throw new GradleException("Unexpected SteamAdvantage release version: ${project.mod_version}") } if (project.minecraft_version != '1.14.4' @@ -357,33 +357,35 @@ tasks.register('verifyReleaseConfiguration') { || project.gradle_java_version != '17') { throw new GradleException('Unexpected release dispatcher target metadata') } - if (project.mod_id != 'steamadvantage' - || project.group.toString() != 'zone.moddev.mc.steamadvantage' - || base.archivesName.get() != 'SteamAdvantage' + if (project.mod_id != 'basesteam' + || project.group.toString() != 'zone.moddev.mc.basesteam' + || base.archivesName.get() != 'baseSteam' || project.mod_license != 'GPL-3.0-only' - || project.curseforge_project_id != '240984') { + || project.curseforge_project_id != '1781373') { throw new GradleException('Unexpected Forge, Maven, archive, or CurseForge identity') } - if (project.cf_requirements != 'power-advantage,base-metals' + if (project.cf_requirements != 'basepower,base-metals' || project.cf_optionals != '' || project.cf_versions != '1.14.4') { throw new GradleException('Unexpected CurseForge dependency or game-version metadata') } - if (project.poweradvantage_version != '2.4.5.114041' - || project.poweradvantage_source_repository != 'MinecraftModDevelopmentMods/PowerAdvantage' + if (project.poweradvantage_version != '2.4.6.114041' + || project.poweradvantage_source_repository != 'MinecraftModDevelopmentMods/basePower' || !(project.poweradvantage_source_ref ==~ /[a-f0-9]{40}/) + || !(project.poweradvantage_curse_file_id ==~ /[0-9]+/) + || !(project.poweradvantage_release_sha256 ==~ /[A-F0-9]{64}/) || !(project.poweradvantage_deobf_sha256 ==~ /[A-F0-9]{64}/)) { - throw new GradleException('Unexpected PowerAdvantage compile dependency identity') + throw new GradleException('Unexpected basePower release or development dependency identity') } String mainSource = file( - 'src/main/java/zone/moddev/mc/steamadvantage/SteamAdvantage.java').getText('UTF-8') - if (!mainSource.contains('MODID = "steamadvantage"') - || !mainSource.contains('VERSION = "2.2.6.114041"')) { + 'src/main/java/zone/moddev/mc/basesteam/SteamAdvantage.java').getText('UTF-8') + if (!mainSource.contains('MODID = "basesteam"') + || !mainSource.contains('VERSION = "2.2.8.114041"')) { throw new GradleException('SteamAdvantage source identity changed') } String metadata = file('src/main/resources/META-INF/mods.toml').getText('UTF-8').replace('\r\n', '\n') - ['modId="steamadvantage"', 'modId="poweradvantage"', 'modId="basemetals"', - 'versionRange="[2.4.5.114041,3.0.0)"'].each { marker -> + ['modId="basesteam"', 'modId="basepower"', 'modId="basemetals"', + 'versionRange="[2.4.6.114041,3.0.0)"'].each { marker -> if (!metadata.contains(marker)) { throw new GradleException("Source mods.toml is missing ${marker}") } @@ -409,8 +411,8 @@ tasks.register('verifyReleaseDependencies') { ['cyano/poweradvantage/api/PoweredEntity.class', 'cyano/poweradvantage/api/GUIBlock.class', 'cyano/poweradvantage/api/FluidCategoryRegistry.class', - 'zone/moddev/mc/poweradvantage/conduitnetwork/ConduitRegistry.class', - 'zone/moddev/mc/poweradvantage/init/Fluids.class'].each { required -> + 'zone/moddev/mc/basepower/conduitnetwork/ConduitRegistry.class', + 'zone/moddev/mc/basepower/init/Fluids.class'].each { required -> if (zip.getEntry(required) == null) { throw new GradleException("PowerAdvantage dependency is missing ${required}") } @@ -501,13 +503,13 @@ tasks.register('verifyReleaseArtifacts') { new ZipFile(mainJar).withCloseable { zip -> List names = zip.entries().collect { it.name } ['META-INF/mods.toml', 'pack.mcmeta', - 'zone/moddev/mc/steamadvantage/SteamAdvantage.class', - 'zone/moddev/mc/steamadvantage/machines/SteamDrillTileEntity.class', - 'zone/moddev/mc/steamadvantage/machines/SteamPumpTileEntity.class', - 'zone/moddev/mc/steamadvantage/machines/GeothermalBoilerTileEntity.class', - 'assets/steamadvantage/lang/en_us.json', - 'data/steamadvantage/recipes/steam_pipe.json', - 'data/steamadvantage/advancements/recipes/steam_pipe.json'].each { required -> + 'zone/moddev/mc/basesteam/SteamAdvantage.class', + 'zone/moddev/mc/basesteam/machines/SteamDrillTileEntity.class', + 'zone/moddev/mc/basesteam/machines/SteamPumpTileEntity.class', + 'zone/moddev/mc/basesteam/machines/GeothermalBoilerTileEntity.class', + 'assets/basesteam/lang/en_us.json', + 'data/basesteam/recipes/steam_pipe.json', + 'data/basesteam/advancements/recipes/steam_pipe.json'].each { required -> if (!names.contains(required)) { throw new GradleException("Release jar is missing ${required}") } @@ -516,7 +518,7 @@ tasks.register('verifyReleaseArtifacts') { 'steam_boiler_geothermal', 'steam_tank', 'steam_furnace', 'steam_crusher', 'steam_drill', 'steam_elevator', 'steam_switch', 'steam_still', 'steam_pump', 'steam_boiler_oil'].each { id -> - if (!names.contains("data/steamadvantage/loot_tables/blocks/${id}.json".toString())) { + if (!names.contains("data/basesteam/loot_tables/blocks/${id}.json".toString())) { throw new GradleException("Release jar is missing native block loot for ${id}") } } @@ -527,7 +529,7 @@ tasks.register('verifyReleaseArtifacts') { } ['agent-notes/', '.codex/', 'src/test/', 'fernflower_abstract_parameter_names.txt', 'cyano/poweradvantage/', - 'zone/moddev/mc/poweradvantage/', 'zone/moddev/mc/basemetals/', 'cyano/basemetals/', 'com/mcmoddev/lib/', + 'zone/moddev/mc/basepower/', 'zone/moddev/mc/basemetals/', 'cyano/basemetals/', 'com/mcmoddev/lib/', 'cyano/orespawn/', 'com/mcmoddev/orespawn/', 'cofh/api/', 'reborncore/', 'net/minecraft/', 'net/minecraftforge/'].each { forbidden -> if (names.any { it.contains(forbidden) }) { @@ -536,7 +538,7 @@ tasks.register('verifyReleaseArtifacts') { } String metadata = zip.getInputStream(zip.getEntry('META-INF/mods.toml')) .getText(StandardCharsets.UTF_8.name()) - if (!metadata.contains('modId="steamadvantage"') + if (!metadata.contains('modId="basesteam"') || !metadata.contains("version=\"${project.mod_version}\"")) { throw new GradleException('Packaged mods.toml identity or version is incorrect') } @@ -562,8 +564,8 @@ tasks.register('verifyReleaseArtifacts') { } new ZipFile(new File(libs, expectedReleaseFiles.get()[1])).withCloseable { sourceZip -> - if (sourceZip.getEntry('zone/moddev/mc/steamadvantage/SteamAdvantage.java') == null - || sourceZip.getEntry('zone/moddev/mc/steamadvantage/machines/SteamDrillTileEntity.java') == null) { + if (sourceZip.getEntry('zone/moddev/mc/basesteam/SteamAdvantage.java') == null + || sourceZip.getEntry('zone/moddev/mc/basesteam/machines/SteamDrillTileEntity.java') == null) { throw new GradleException('Sources jar is missing required SteamAdvantage sources') } } @@ -663,7 +665,7 @@ publishing { pom { name = 'Steam Advantage' description = project.mod_description - url = 'https://github.com/MinecraftModDevelopmentMods/SteamAdvantage' + url = 'https://github.com/MinecraftModDevelopmentMods/baseSteam' licenses { license { name = 'GNU General Public License, Version 3' @@ -671,9 +673,9 @@ publishing { } } scm { - connection = 'scm:git:https://github.com/MinecraftModDevelopmentMods/SteamAdvantage.git' - developerConnection = 'scm:git:ssh://git@github.com/MinecraftModDevelopmentMods/SteamAdvantage.git' - url = 'https://github.com/MinecraftModDevelopmentMods/SteamAdvantage' + connection = 'scm:git:https://github.com/MinecraftModDevelopmentMods/baseSteam.git' + developerConnection = 'scm:git:ssh://git@github.com/MinecraftModDevelopmentMods/baseSteam.git' + url = 'https://github.com/MinecraftModDevelopmentMods/baseSteam' } } } @@ -1015,7 +1017,7 @@ tasks.register('verifyModelAssets') { int separator = reference.indexOf(':') String namespace = separator >= 0 ? reference.substring(0, separator) : 'minecraft' String path = separator >= 0 ? reference.substring(separator + 1) : reference - if (namespace != project.mod_id && namespace != 'poweradvantage') return + if (namespace != project.mod_id && namespace != 'basepower') return String suffix = assetType == 'textures' ? '.png' : '.json' String targetPath = "assets/${namespace}/${assetType}/${path}${suffix}" @@ -1134,9 +1136,9 @@ tasks.register('verifyRecipeTagGuards') { throw new GradleException("${recipeFile.path} contains a non-object recipe condition") } Set guards = conditions - .findAll { it instanceof Map && it.type == 'poweradvantage:tag_not_empty' } + .findAll { it instanceof Map && it.type == 'basepower:tag_not_empty' } .collect { it.tag as String } as Set - Set emptyGuards = conditions.findAll { it.type == 'poweradvantage:tag_empty' } + Set emptyGuards = conditions.findAll { it.type == 'basepower:tag_empty' } .collect { it.tag as String } as Set if (!(emptyGuards.intersect(guards)).isEmpty()) { throw new GradleException("${recipeFile.path} requires the same tag to be empty and nonempty") diff --git a/gradle.properties b/gradle.properties index fd46c88..c9c1082 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,25 +20,27 @@ java_version=8 java_toolchain_version=8.0.502+7 java_setup_version=8.0.502+7 gradle_java_version=17 -curseforge_project_id=240984 +curseforge_project_id=1781373 -mod_id=steamadvantage -mod_name=Steam Advantage +mod_id=basesteam +mod_name=baseSteam mod_license=GPL-3.0-only -mod_version=2.2.6.114041 -mod_group=zone.moddev.mc.steamadvantage +mod_version=2.2.8.114041 +mod_group=zone.moddev.mc.basesteam mod_authors=DrCyano mod_description=Steam-powered machines and infrastructure for the Power Advantage platform. -cf_requirements=power-advantage,base-metals +cf_requirements=basepower,base-metals cf_optionals= cf_versions=1.14.4 -poweradvantage_version=2.4.5.114041 -poweradvantage_source_repository=MinecraftModDevelopmentMods/PowerAdvantage -# Exact Power Advantage source and development jar used by local and CI builds. -poweradvantage_source_ref=1d498ca02b6795b16435f0ece35ac04c67ef6948 -poweradvantage_deobf_sha256=8D8831D54B700FBFB2B9C43EE3D8D70D2B7E57185A4DBDF12202C47D5E387B39 +poweradvantage_version=2.4.6.114041 +poweradvantage_source_repository=MinecraftModDevelopmentMods/basePower +# The published basePower release and the exact development jar built from its source. +poweradvantage_source_ref=5862623c8030ef249a768e784b536d75a5097223 +poweradvantage_curse_file_id=9477873 +poweradvantage_release_sha256=C97A457D4B29FED49226EAA14DFD653C05E55CB30811899688DCBF08DF2F241B +poweradvantage_deobf_sha256=C01405EB14B721C747AE621C2B1ED30C46EDAB1F16A085416D248C5308D811F7 basemetals_version=3.0.1.114041 basemetals_deobf_sha256=A14A87E3BF30964F901E715A9B4EF2F1E7317ABE7F9ACEBE60D8E6A900CA6EB2 diff --git a/gradlew.bat b/gradlew.bat index e95643d..f955316 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,84 +1,84 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/main/java/zone/moddev/mc/steamadvantage/SteamAdvantage.java b/src/main/java/zone/moddev/mc/basesteam/SteamAdvantage.java similarity index 77% rename from src/main/java/zone/moddev/mc/steamadvantage/SteamAdvantage.java rename to src/main/java/zone/moddev/mc/basesteam/SteamAdvantage.java index c2aad97..c677018 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/SteamAdvantage.java +++ b/src/main/java/zone/moddev/mc/basesteam/SteamAdvantage.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage; +package zone.moddev.mc.basesteam; import java.util.HashMap; import java.util.Map; @@ -18,24 +18,24 @@ import cyano.poweradvantage.api.migration.LegacyConfigMigration; import cyano.poweradvantage.api.migration.LegacyConfigMigration.Mapping; import cyano.poweradvantage.api.migration.LegacyConfigMigration.ValueType; -import zone.moddev.mc.steamadvantage.config.SteamAdvantageConfig; -import zone.moddev.mc.steamadvantage.init.Blocks; -import zone.moddev.mc.steamadvantage.init.Enchantments; -import zone.moddev.mc.steamadvantage.init.Entities; -import zone.moddev.mc.steamadvantage.init.GUI; -import zone.moddev.mc.steamadvantage.init.Items; -import zone.moddev.mc.steamadvantage.init.Recipes; -import zone.moddev.mc.steamadvantage.init.TreasureChests; -import zone.moddev.mc.steamadvantage.init.Villages; -import zone.moddev.mc.steamadvantage.migration.SteamLegacyMigrations; -import zone.moddev.mc.steamadvantage.recipe.RecipeConditions; +import zone.moddev.mc.basesteam.config.SteamAdvantageConfig; +import zone.moddev.mc.basesteam.init.Blocks; +import zone.moddev.mc.basesteam.init.Enchantments; +import zone.moddev.mc.basesteam.init.Entities; +import zone.moddev.mc.basesteam.init.GUI; +import zone.moddev.mc.basesteam.init.Items; +import zone.moddev.mc.basesteam.init.Recipes; +import zone.moddev.mc.basesteam.init.TreasureChests; +import zone.moddev.mc.basesteam.init.Villages; +import zone.moddev.mc.basesteam.migration.SteamLegacyMigrations; +import zone.moddev.mc.basesteam.recipe.RecipeConditions; /** Forge 1.14 entry point for Steam Advantage. */ @Mod(SteamAdvantage.MODID) public final class SteamAdvantage { - public static final String MODID = "steamadvantage"; + public static final String MODID = "basesteam"; public static final String NAME = "Steam Advantage"; - public static final String VERSION = "2.2.6.114041"; + public static final String VERSION = "2.2.8.114041"; public static final Logger LOGGER = LogManager.getLogger(MODID); public static float MUSKET_DAMAGE = 20.0F; @@ -59,13 +59,13 @@ public SteamAdvantage() { DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> { FMLJavaModLoadingContext.get().getModEventBus().addListener( - zone.moddev.mc.steamadvantage.graphics.ClientRegistration::onClientSetup); + zone.moddev.mc.basesteam.graphics.ClientRegistration::onClientSetup); }); } private static void migrateLegacyConfiguration() { try { - LegacyConfigMigration.Result result = LegacyConfigMigration.migrate(FMLPaths.CONFIGDIR.get(), MODID, + LegacyConfigMigration.Result result = LegacyConfigMigration.migrate(FMLPaths.CONFIGDIR.get(), MODID, "steamadvantage", Mapping.of("options", "musket_damage", "options", "musketDamage", ValueType.DOUBLE), Mapping.of("options", "musket_reload_time", "options", "musketReloadTime", ValueType.INTEGER), Mapping.of("options", "musket_allowed", "options", "musketAllowed", ValueType.BOOLEAN), diff --git a/src/main/java/zone/moddev/mc/steamadvantage/blocks/DrillBitBlock.java b/src/main/java/zone/moddev/mc/basesteam/blocks/DrillBitBlock.java similarity index 96% rename from src/main/java/zone/moddev/mc/steamadvantage/blocks/DrillBitBlock.java rename to src/main/java/zone/moddev/mc/basesteam/blocks/DrillBitBlock.java index 03558dd..9050178 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/blocks/DrillBitBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/blocks/DrillBitBlock.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.blocks; +package zone.moddev.mc.basesteam.blocks; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; @@ -18,7 +18,7 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraft.item.ItemStack; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; /** Hidden moving drill helper. It deliberately has no item form or drops. */ public class DrillBitBlock extends Block implements ITileEntityProvider { diff --git a/src/main/java/zone/moddev/mc/steamadvantage/blocks/DrillBitTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/blocks/DrillBitTileEntity.java similarity index 93% rename from src/main/java/zone/moddev/mc/steamadvantage/blocks/DrillBitTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/blocks/DrillBitTileEntity.java index 9e8f89b..632549a 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/blocks/DrillBitTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/blocks/DrillBitTileEntity.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.steamadvantage.blocks; +package zone.moddev.mc.basesteam.blocks; -import zone.moddev.mc.steamadvantage.init.Blocks; +import zone.moddev.mc.basesteam.init.Blocks; import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.NetworkManager; @@ -20,7 +20,7 @@ public class DrillBitTileEntity extends TileEntity implements ITickableTileEntit private Direction direction = Direction.DOWN; public DrillBitTileEntity(){ - super(zone.moddev.mc.steamadvantage.init.Entities.DRILLBIT); + super(zone.moddev.mc.basesteam.init.Entities.DRILLBIT); } @Override @@ -40,7 +40,7 @@ public Direction.Axis getDirection(){ } public static void createDrillBitBlock(World w, BlockPos coord, Direction dir){ - w.setBlockState(coord, zone.moddev.mc.steamadvantage.init.Blocks.drillbit.getDefaultState()); + w.setBlockState(coord, zone.moddev.mc.basesteam.init.Blocks.drillbit.getDefaultState()); TileEntity tile = w.getTileEntity(coord); if(tile instanceof DrillBitTileEntity) ((DrillBitTileEntity) tile).setDirection(dir); } diff --git a/src/main/java/zone/moddev/mc/steamadvantage/blocks/PlatformBlock.java b/src/main/java/zone/moddev/mc/basesteam/blocks/PlatformBlock.java similarity index 96% rename from src/main/java/zone/moddev/mc/steamadvantage/blocks/PlatformBlock.java rename to src/main/java/zone/moddev/mc/basesteam/blocks/PlatformBlock.java index ff9349b..59917cd 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/blocks/PlatformBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/blocks/PlatformBlock.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.blocks; +package zone.moddev.mc.basesteam.blocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -15,7 +15,7 @@ import net.minecraft.world.storage.loot.LootContext; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import zone.moddev.mc.steamadvantage.init.Blocks; +import zone.moddev.mc.basesteam.init.Blocks; /** Hidden elevator platform segments. HEIGHT preserves the legacy metadata values 0-4. */ public class PlatformBlock extends Block { diff --git a/src/main/java/zone/moddev/mc/steamadvantage/blocks/PumpPipeBlock.java b/src/main/java/zone/moddev/mc/basesteam/blocks/PumpPipeBlock.java similarity index 98% rename from src/main/java/zone/moddev/mc/steamadvantage/blocks/PumpPipeBlock.java rename to src/main/java/zone/moddev/mc/basesteam/blocks/PumpPipeBlock.java index 496eb22..080dc3c 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/blocks/PumpPipeBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/blocks/PumpPipeBlock.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.blocks; +package zone.moddev.mc.basesteam.blocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/blocks/SteamPipeBlock.java b/src/main/java/zone/moddev/mc/basesteam/blocks/SteamPipeBlock.java similarity index 71% rename from src/main/java/zone/moddev/mc/steamadvantage/blocks/SteamPipeBlock.java rename to src/main/java/zone/moddev/mc/basesteam/blocks/SteamPipeBlock.java index 1926307..78681ff 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/blocks/SteamPipeBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/blocks/SteamPipeBlock.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.steamadvantage.blocks; +package zone.moddev.mc.basesteam.blocks; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; public class SteamPipeBlock extends cyano.poweradvantage.api.simple.BlockSimplePowerConduit{ diff --git a/src/main/java/zone/moddev/mc/steamadvantage/blocks/SteamTrackBlock.java b/src/main/java/zone/moddev/mc/basesteam/blocks/SteamTrackBlock.java similarity index 93% rename from src/main/java/zone/moddev/mc/steamadvantage/blocks/SteamTrackBlock.java rename to src/main/java/zone/moddev/mc/basesteam/blocks/SteamTrackBlock.java index a3cca5b..95b4c52 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/blocks/SteamTrackBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/blocks/SteamTrackBlock.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.blocks; +package zone.moddev.mc.basesteam.blocks; import cyano.poweradvantage.api.simple.BlockSimplePowerConduit; import net.minecraft.block.material.Material; @@ -11,7 +11,7 @@ import net.minecraft.world.IBlockReader; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; public class SteamTrackBlock extends BlockSimplePowerConduit { public SteamTrackBlock() { super(Material.PISTON, 0.75F, 2.0F / 16.0F, Power.steam_power); } diff --git a/src/main/java/zone/moddev/mc/steamadvantage/compat/BaseMetalsCompat.java b/src/main/java/zone/moddev/mc/basesteam/compat/BaseMetalsCompat.java similarity index 98% rename from src/main/java/zone/moddev/mc/steamadvantage/compat/BaseMetalsCompat.java rename to src/main/java/zone/moddev/mc/basesteam/compat/BaseMetalsCompat.java index af63216..ba98a24 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/compat/BaseMetalsCompat.java +++ b/src/main/java/zone/moddev/mc/basesteam/compat/BaseMetalsCompat.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.compat; +package zone.moddev.mc.basesteam.compat; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/config/SteamAdvantageConfig.java b/src/main/java/zone/moddev/mc/basesteam/config/SteamAdvantageConfig.java similarity index 95% rename from src/main/java/zone/moddev/mc/steamadvantage/config/SteamAdvantageConfig.java rename to src/main/java/zone/moddev/mc/basesteam/config/SteamAdvantageConfig.java index 12340a7..58ca892 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/config/SteamAdvantageConfig.java +++ b/src/main/java/zone/moddev/mc/basesteam/config/SteamAdvantageConfig.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.steamadvantage.config; +package zone.moddev.mc.basesteam.config; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.fml.config.ModConfig; -import zone.moddev.mc.steamadvantage.SteamAdvantage; +import zone.moddev.mc.basesteam.SteamAdvantage; /** Common configuration retaining the legacy gameplay defaults. */ public final class SteamAdvantageConfig { diff --git a/src/main/java/zone/moddev/mc/steamadvantage/enchantments/HighExplosiveEnchantment.java b/src/main/java/zone/moddev/mc/basesteam/enchantments/HighExplosiveEnchantment.java similarity index 89% rename from src/main/java/zone/moddev/mc/steamadvantage/enchantments/HighExplosiveEnchantment.java rename to src/main/java/zone/moddev/mc/basesteam/enchantments/HighExplosiveEnchantment.java index 6adee66..3a3854b 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/enchantments/HighExplosiveEnchantment.java +++ b/src/main/java/zone/moddev/mc/basesteam/enchantments/HighExplosiveEnchantment.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.steamadvantage.enchantments; +package zone.moddev.mc.basesteam.enchantments; -import zone.moddev.mc.steamadvantage.init.Items; +import zone.moddev.mc.basesteam.init.Items; import net.minecraft.enchantment.EnchantmentType; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/enchantments/PowderlessEnchantment.java b/src/main/java/zone/moddev/mc/basesteam/enchantments/PowderlessEnchantment.java similarity index 88% rename from src/main/java/zone/moddev/mc/steamadvantage/enchantments/PowderlessEnchantment.java rename to src/main/java/zone/moddev/mc/basesteam/enchantments/PowderlessEnchantment.java index 307e77a..1e1bcb3 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/enchantments/PowderlessEnchantment.java +++ b/src/main/java/zone/moddev/mc/basesteam/enchantments/PowderlessEnchantment.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.steamadvantage.enchantments; +package zone.moddev.mc.basesteam.enchantments; -import zone.moddev.mc.steamadvantage.init.Items; +import zone.moddev.mc.basesteam.init.Items; import net.minecraft.enchantment.EnchantmentType; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/enchantments/RapidReloadEnchantment.java b/src/main/java/zone/moddev/mc/basesteam/enchantments/RapidReloadEnchantment.java similarity index 88% rename from src/main/java/zone/moddev/mc/steamadvantage/enchantments/RapidReloadEnchantment.java rename to src/main/java/zone/moddev/mc/basesteam/enchantments/RapidReloadEnchantment.java index 7f0a89e..234e217 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/enchantments/RapidReloadEnchantment.java +++ b/src/main/java/zone/moddev/mc/basesteam/enchantments/RapidReloadEnchantment.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.steamadvantage.enchantments; +package zone.moddev.mc.basesteam.enchantments; -import zone.moddev.mc.steamadvantage.init.Items; +import zone.moddev.mc.basesteam.init.Items; import net.minecraft.enchantment.EnchantmentType; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/enchantments/RecoilEnchantment.java b/src/main/java/zone/moddev/mc/basesteam/enchantments/RecoilEnchantment.java similarity index 89% rename from src/main/java/zone/moddev/mc/steamadvantage/enchantments/RecoilEnchantment.java rename to src/main/java/zone/moddev/mc/basesteam/enchantments/RecoilEnchantment.java index d0a2614..15c0e44 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/enchantments/RecoilEnchantment.java +++ b/src/main/java/zone/moddev/mc/basesteam/enchantments/RecoilEnchantment.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.steamadvantage.enchantments; +package zone.moddev.mc.basesteam.enchantments; -import zone.moddev.mc.steamadvantage.init.Items; +import zone.moddev.mc.basesteam.init.Items; import net.minecraft.enchantment.EnchantmentType; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/graphics/ClientRegistration.java b/src/main/java/zone/moddev/mc/basesteam/graphics/ClientRegistration.java similarity index 79% rename from src/main/java/zone/moddev/mc/steamadvantage/graphics/ClientRegistration.java rename to src/main/java/zone/moddev/mc/basesteam/graphics/ClientRegistration.java index 2ac4591..e548f4b 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/graphics/ClientRegistration.java +++ b/src/main/java/zone/moddev/mc/basesteam/graphics/ClientRegistration.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.steamadvantage.graphics; +package zone.moddev.mc.basesteam.graphics; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; -import zone.moddev.mc.steamadvantage.blocks.DrillBitTileEntity; +import zone.moddev.mc.basesteam.blocks.DrillBitTileEntity; /** Client-only renderer registration. */ public final class ClientRegistration { diff --git a/src/main/java/zone/moddev/mc/steamadvantage/graphics/DrillBitRenderer.java b/src/main/java/zone/moddev/mc/basesteam/graphics/DrillBitRenderer.java similarity index 96% rename from src/main/java/zone/moddev/mc/steamadvantage/graphics/DrillBitRenderer.java rename to src/main/java/zone/moddev/mc/basesteam/graphics/DrillBitRenderer.java index 6a95cee..1a1bf84 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/graphics/DrillBitRenderer.java +++ b/src/main/java/zone/moddev/mc/basesteam/graphics/DrillBitRenderer.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.steamadvantage.graphics; +package zone.moddev.mc.basesteam.graphics; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.blocks.DrillBitTileEntity; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.blocks.DrillBitTileEntity; import net.minecraft.client.Minecraft; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.renderer.RenderHelper; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/BlastFurnaceGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/BlastFurnaceGUI.java similarity index 93% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/BlastFurnaceGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/BlastFurnaceGUI.java index 24dd0ea..1b110fa 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/BlastFurnaceGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/BlastFurnaceGUI.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.Slot; @@ -6,9 +6,9 @@ import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.machines.BlastFurnaceTileEntity; +import zone.moddev.mc.basepower.math.Integer2D; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.machines.BlastFurnaceTileEntity; public class BlastFurnaceGUI extends SimpleMachineGUI{ diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/CoalBoilerGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/CoalBoilerGUI.java similarity index 92% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/CoalBoilerGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/CoalBoilerGUI.java index 6391db8..382886f 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/CoalBoilerGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/CoalBoilerGUI.java @@ -1,11 +1,11 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.machines.CoalBoilerTileEntity; +import zone.moddev.mc.basepower.math.Integer2D; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.machines.CoalBoilerTileEntity; public class CoalBoilerGUI extends SimpleMachineGUI{ diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/ElectricBoilerGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/ElectricBoilerGUI.java similarity index 91% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/ElectricBoilerGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/ElectricBoilerGUI.java index 2523589..d3caba7 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/ElectricBoilerGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/ElectricBoilerGUI.java @@ -1,11 +1,11 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.machines.ElectricBoilerTileEntity; +import zone.moddev.mc.basepower.math.Integer2D; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.machines.ElectricBoilerTileEntity; public class ElectricBoilerGUI extends SimpleMachineGUI{ diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/GUIHelper.java b/src/main/java/zone/moddev/mc/basesteam/gui/GUIHelper.java similarity index 97% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/GUIHelper.java rename to src/main/java/zone/moddev/mc/basesteam/gui/GUIHelper.java index c5dffaa..9700b33 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/GUIHelper.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/GUIHelper.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import cyano.poweradvantage.api.simple.SimpleMachineGUI.GUIContainer; -import zone.moddev.mc.poweradvantage.gui.FluidTankGUI; +import zone.moddev.mc.basepower.gui.FluidTankGUI; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/GeothermalBoilerGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/GeothermalBoilerGUI.java similarity index 91% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/GeothermalBoilerGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/GeothermalBoilerGUI.java index e9a12d7..621ed9d 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/GeothermalBoilerGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/GeothermalBoilerGUI.java @@ -1,11 +1,11 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.machines.GeothermalBoilerTileEntity; +import zone.moddev.mc.basepower.math.Integer2D; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.machines.GeothermalBoilerTileEntity; public class GeothermalBoilerGUI extends SimpleMachineGUI{ diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/OilBoilerGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/OilBoilerGUI.java similarity index 92% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/OilBoilerGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/OilBoilerGUI.java index b31d60d..88e34eb 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/OilBoilerGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/OilBoilerGUI.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.machines.OilBoilerTileEntity; +import zone.moddev.mc.basepower.math.Integer2D; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.machines.OilBoilerTileEntity; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.fluid.FluidStack; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/RockCrusherGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/RockCrusherGUI.java similarity index 91% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/RockCrusherGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/RockCrusherGUI.java index aaf4521..95cb1cf 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/RockCrusherGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/RockCrusherGUI.java @@ -1,11 +1,11 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.machines.RockCrusherTileEntity; +import zone.moddev.mc.basepower.math.Integer2D; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.machines.RockCrusherTileEntity; public class RockCrusherGUI extends SimpleMachineGUI{ diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/SteamDrillGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/SteamDrillGUI.java similarity index 91% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/SteamDrillGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/SteamDrillGUI.java index d2b819e..7cb02b4 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/SteamDrillGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/SteamDrillGUI.java @@ -1,11 +1,11 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.machines.SteamDrillTileEntity; +import zone.moddev.mc.basepower.math.Integer2D; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.machines.SteamDrillTileEntity; public class SteamDrillGUI extends SimpleMachineGUI{ diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/SteamPumpGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/SteamPumpGUI.java similarity index 92% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/SteamPumpGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/SteamPumpGUI.java index 7cc893c..1f7b7d4 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/SteamPumpGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/SteamPumpGUI.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.machines.SteamPumpTileEntity; +import zone.moddev.mc.basepower.math.Integer2D; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.machines.SteamPumpTileEntity; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.fluid.FluidStack; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/SteamStillGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/SteamStillGUI.java similarity index 92% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/SteamStillGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/SteamStillGUI.java index 6a509c5..24ad39f 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/SteamStillGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/SteamStillGUI.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.machines.SteamStillTileEntity; +import zone.moddev.mc.basepower.math.Integer2D; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.machines.SteamStillTileEntity; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.fluid.FluidStack; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/SteamTankGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/SteamTankGUI.java similarity index 90% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/SteamTankGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/SteamTankGUI.java index 0f36084..8dc86c2 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/SteamTankGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/SteamTankGUI.java @@ -1,11 +1,11 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.machines.SteamTankTileEntity; +import zone.moddev.mc.basepower.math.Integer2D; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.machines.SteamTankTileEntity; public class SteamTankGUI extends SimpleMachineGUI{ diff --git a/src/main/java/zone/moddev/mc/steamadvantage/init/Blocks.java b/src/main/java/zone/moddev/mc/basesteam/init/Blocks.java similarity index 77% rename from src/main/java/zone/moddev/mc/steamadvantage/init/Blocks.java rename to src/main/java/zone/moddev/mc/basesteam/init/Blocks.java index affa95d..119eaad 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/init/Blocks.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/Blocks.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.init; +package zone.moddev.mc.basesteam.init; import java.util.LinkedHashMap; import java.util.Map; @@ -11,25 +11,25 @@ import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import zone.moddev.mc.poweradvantage.blocks.BlockPowerSwitch; -import zone.moddev.mc.poweradvantage.init.ItemGroups; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.blocks.DrillBitBlock; -import zone.moddev.mc.steamadvantage.blocks.PlatformBlock; -import zone.moddev.mc.steamadvantage.blocks.PumpPipeBlock; -import zone.moddev.mc.steamadvantage.blocks.SteamPipeBlock; -import zone.moddev.mc.steamadvantage.blocks.SteamTrackBlock; -import zone.moddev.mc.steamadvantage.machines.BlastFurnaceBlock; -import zone.moddev.mc.steamadvantage.machines.CoalBoilerBlock; -import zone.moddev.mc.steamadvantage.machines.ElectricBoilerBlock; -import zone.moddev.mc.steamadvantage.machines.GeothermalBoilerBlock; -import zone.moddev.mc.steamadvantage.machines.OilBoilerBlock; -import zone.moddev.mc.steamadvantage.machines.RockCrusherBlock; -import zone.moddev.mc.steamadvantage.machines.SteamDrillBlock; -import zone.moddev.mc.steamadvantage.machines.SteamElevatorBlock; -import zone.moddev.mc.steamadvantage.machines.SteamPumpBlock; -import zone.moddev.mc.steamadvantage.machines.SteamStillBlock; -import zone.moddev.mc.steamadvantage.machines.SteamTankBlock; +import zone.moddev.mc.basepower.blocks.BlockPowerSwitch; +import zone.moddev.mc.basepower.init.ItemGroups; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.blocks.DrillBitBlock; +import zone.moddev.mc.basesteam.blocks.PlatformBlock; +import zone.moddev.mc.basesteam.blocks.PumpPipeBlock; +import zone.moddev.mc.basesteam.blocks.SteamPipeBlock; +import zone.moddev.mc.basesteam.blocks.SteamTrackBlock; +import zone.moddev.mc.basesteam.machines.BlastFurnaceBlock; +import zone.moddev.mc.basesteam.machines.CoalBoilerBlock; +import zone.moddev.mc.basesteam.machines.ElectricBoilerBlock; +import zone.moddev.mc.basesteam.machines.GeothermalBoilerBlock; +import zone.moddev.mc.basesteam.machines.OilBoilerBlock; +import zone.moddev.mc.basesteam.machines.RockCrusherBlock; +import zone.moddev.mc.basesteam.machines.SteamDrillBlock; +import zone.moddev.mc.basesteam.machines.SteamElevatorBlock; +import zone.moddev.mc.basesteam.machines.SteamPumpBlock; +import zone.moddev.mc.basesteam.machines.SteamStillBlock; +import zone.moddev.mc.basesteam.machines.SteamTankBlock; @Mod.EventBusSubscriber(modid = SteamAdvantage.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) public final class Blocks { diff --git a/src/main/java/zone/moddev/mc/steamadvantage/init/Enchantments.java b/src/main/java/zone/moddev/mc/basesteam/init/Enchantments.java similarity index 78% rename from src/main/java/zone/moddev/mc/steamadvantage/init/Enchantments.java rename to src/main/java/zone/moddev/mc/basesteam/init/Enchantments.java index 98c3a9e..b317255 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/init/Enchantments.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/Enchantments.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.init; +package zone.moddev.mc.basesteam.init; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.enchantments.HighExplosiveEnchantment; -import zone.moddev.mc.steamadvantage.enchantments.PowderlessEnchantment; -import zone.moddev.mc.steamadvantage.enchantments.RapidReloadEnchantment; -import zone.moddev.mc.steamadvantage.enchantments.RecoilEnchantment; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.enchantments.HighExplosiveEnchantment; +import zone.moddev.mc.basesteam.enchantments.PowderlessEnchantment; +import zone.moddev.mc.basesteam.enchantments.RapidReloadEnchantment; +import zone.moddev.mc.basesteam.enchantments.RecoilEnchantment; import net.minecraft.enchantment.Enchantment; import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.RegistryEvent; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/init/Entities.java b/src/main/java/zone/moddev/mc/basesteam/init/Entities.java similarity index 78% rename from src/main/java/zone/moddev/mc/steamadvantage/init/Entities.java rename to src/main/java/zone/moddev/mc/basesteam/init/Entities.java index 1661127..fa3a691 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/init/Entities.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/Entities.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.init; +package zone.moddev.mc.basesteam.init; import java.util.function.Supplier; @@ -8,19 +8,19 @@ import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.blocks.DrillBitTileEntity; -import zone.moddev.mc.steamadvantage.machines.BlastFurnaceTileEntity; -import zone.moddev.mc.steamadvantage.machines.CoalBoilerTileEntity; -import zone.moddev.mc.steamadvantage.machines.ElectricBoilerTileEntity; -import zone.moddev.mc.steamadvantage.machines.GeothermalBoilerTileEntity; -import zone.moddev.mc.steamadvantage.machines.OilBoilerTileEntity; -import zone.moddev.mc.steamadvantage.machines.RockCrusherTileEntity; -import zone.moddev.mc.steamadvantage.machines.SteamDrillTileEntity; -import zone.moddev.mc.steamadvantage.machines.SteamElevatorTileEntity; -import zone.moddev.mc.steamadvantage.machines.SteamPumpTileEntity; -import zone.moddev.mc.steamadvantage.machines.SteamStillTileEntity; -import zone.moddev.mc.steamadvantage.machines.SteamTankTileEntity; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.blocks.DrillBitTileEntity; +import zone.moddev.mc.basesteam.machines.BlastFurnaceTileEntity; +import zone.moddev.mc.basesteam.machines.CoalBoilerTileEntity; +import zone.moddev.mc.basesteam.machines.ElectricBoilerTileEntity; +import zone.moddev.mc.basesteam.machines.GeothermalBoilerTileEntity; +import zone.moddev.mc.basesteam.machines.OilBoilerTileEntity; +import zone.moddev.mc.basesteam.machines.RockCrusherTileEntity; +import zone.moddev.mc.basesteam.machines.SteamDrillTileEntity; +import zone.moddev.mc.basesteam.machines.SteamElevatorTileEntity; +import zone.moddev.mc.basesteam.machines.SteamPumpTileEntity; +import zone.moddev.mc.basesteam.machines.SteamStillTileEntity; +import zone.moddev.mc.basesteam.machines.SteamTankTileEntity; /** Stable tile entity registrations; registry names are unchanged from 1.12. */ @Mod.EventBusSubscriber(modid = SteamAdvantage.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) diff --git a/src/main/java/zone/moddev/mc/steamadvantage/init/GUI.java b/src/main/java/zone/moddev/mc/basesteam/init/GUI.java similarity index 86% rename from src/main/java/zone/moddev/mc/steamadvantage/init/GUI.java rename to src/main/java/zone/moddev/mc/basesteam/init/GUI.java index d064e07..7699ef5 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/init/GUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/GUI.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.steamadvantage.init; +package zone.moddev.mc.basesteam.init; -import zone.moddev.mc.poweradvantage.PowerAdvantage; -import zone.moddev.mc.poweradvantage.registry.MachineGUIRegistry; -import zone.moddev.mc.steamadvantage.gui.*; +import zone.moddev.mc.basepower.PowerAdvantage; +import zone.moddev.mc.basepower.registry.MachineGUIRegistry; +import zone.moddev.mc.basesteam.gui.*; public class GUI { diff --git a/src/main/java/zone/moddev/mc/steamadvantage/init/Items.java b/src/main/java/zone/moddev/mc/basesteam/init/Items.java similarity index 89% rename from src/main/java/zone/moddev/mc/steamadvantage/init/Items.java rename to src/main/java/zone/moddev/mc/basesteam/init/Items.java index 05c66c6..c923a4e 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/init/Items.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/Items.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.init; +package zone.moddev.mc.basesteam.init; import java.util.LinkedHashMap; import java.util.Map; @@ -8,9 +8,9 @@ import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import zone.moddev.mc.poweradvantage.init.ItemGroups; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.items.MusketItem; +import zone.moddev.mc.basepower.init.ItemGroups; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.items.MusketItem; @Mod.EventBusSubscriber(modid = SteamAdvantage.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) public final class Items { diff --git a/src/main/java/zone/moddev/mc/steamadvantage/init/Power.java b/src/main/java/zone/moddev/mc/basesteam/init/Power.java similarity index 90% rename from src/main/java/zone/moddev/mc/steamadvantage/init/Power.java rename to src/main/java/zone/moddev/mc/basesteam/init/Power.java index 94fcab3..1febd10 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/init/Power.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/Power.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.init; +package zone.moddev.mc.basesteam.init; import net.minecraft.util.DamageSource; import cyano.poweradvantage.api.ConduitType; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/init/Recipes.java b/src/main/java/zone/moddev/mc/basesteam/init/Recipes.java similarity index 81% rename from src/main/java/zone/moddev/mc/steamadvantage/init/Recipes.java rename to src/main/java/zone/moddev/mc/basesteam/init/Recipes.java index 833e953..3492930 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/init/Recipes.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/Recipes.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.steamadvantage.init; +package zone.moddev.mc.basesteam.init; import net.minecraft.item.ItemStack; -import zone.moddev.mc.poweradvantage.PowerAdvantage; -import zone.moddev.mc.poweradvantage.RecipeMode; -import zone.moddev.mc.steamadvantage.compat.BaseMetalsCompat; +import zone.moddev.mc.basepower.PowerAdvantage; +import zone.moddev.mc.basepower.RecipeMode; +import zone.moddev.mc.basesteam.compat.BaseMetalsCompat; public class Recipes { @@ -19,7 +19,7 @@ public static void init(){ RecipeMode recipeMode = PowerAdvantage.recipeMode; if(recipeMode == RecipeMode.APOCALYPTIC){ - BaseMetalsCompat.addCrusherRecipe(Items.steam_governor, new ItemStack(zone.moddev.mc.poweradvantage.init.Items.sprocket,2)); + BaseMetalsCompat.addCrusherRecipe(Items.steam_governor, new ItemStack(zone.moddev.mc.basepower.init.Items.sprocket,2)); BaseMetalsCompat.addCrusherRecipe(Blocks.steam_crusher, new ItemStack(Items.steam_governor,2)); BaseMetalsCompat.addCrusherRecipe(Blocks.steam_furnace, new ItemStack(Items.steam_governor,2)); diff --git a/src/main/java/zone/moddev/mc/steamadvantage/init/TreasureChests.java b/src/main/java/zone/moddev/mc/basesteam/init/TreasureChests.java similarity index 86% rename from src/main/java/zone/moddev/mc/steamadvantage/init/TreasureChests.java rename to src/main/java/zone/moddev/mc/basesteam/init/TreasureChests.java index 9d45ff2..587d76d 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/init/TreasureChests.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/TreasureChests.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.steamadvantage.init; +package zone.moddev.mc.basesteam.init; -import zone.moddev.mc.steamadvantage.SteamAdvantage; +import zone.moddev.mc.basesteam.SteamAdvantage; import java.io.IOException; import java.nio.charset.Charset; @@ -48,7 +48,7 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"steamadvantage:steam_governor\",\n" + + " \"name\": \"basesteam:steam_governor\",\n" + " \"weight\": 50,\n" + " \"functions\": [\n" + " {\n" + @@ -62,7 +62,7 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"steamadvantage:steam_pipe\",\n" + + " \"name\": \"basesteam:steam_pipe\",\n" + " \"weight\": 25,\n" + " \"functions\": [\n" + " {\n" + @@ -76,7 +76,7 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"steamadvantage:blackpowder_cartridge\",\n" + + " \"name\": \"basesteam:blackpowder_cartridge\",\n" + " \"weight\": 50,\n" + " \"functions\": [\n" + " {\n" + @@ -90,14 +90,14 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"steamadvantage:musket\",\n" + - " \"entryName\": \"steamadvantage:musket_plain\",\n" + + " \"name\": \"basesteam:musket\",\n" + + " \"entryName\": \"basesteam:musket_plain\",\n" + " \"weight\": 18\n" + " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"steamadvantage:musket\",\n" + - " \"entryName\": \"steamadvantage:musket_enchanted\",\n" + + " \"name\": \"basesteam:musket\",\n" + + " \"entryName\": \"basesteam:musket_enchanted\",\n" + " \"weight\": 2,\n" + " \"functions\": [\n" + " {\n" + diff --git a/src/main/java/zone/moddev/mc/steamadvantage/init/Villages.java b/src/main/java/zone/moddev/mc/basesteam/init/Villages.java similarity index 96% rename from src/main/java/zone/moddev/mc/steamadvantage/init/Villages.java rename to src/main/java/zone/moddev/mc/basesteam/init/Villages.java index d17d8d8..c288e22 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/init/Villages.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/Villages.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.init; +package zone.moddev.mc.basesteam.init; import java.util.List; import java.util.Random; @@ -11,7 +11,7 @@ import net.minecraftforge.event.village.VillagerTradesEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import zone.moddev.mc.steamadvantage.SteamAdvantage; +import zone.moddev.mc.basesteam.SteamAdvantage; /** Legacy smith careers map to their native 1.14 professions; prices and levels are unchanged. */ @Mod.EventBusSubscriber(modid = SteamAdvantage.MODID) diff --git a/src/main/java/zone/moddev/mc/steamadvantage/items/MusketItem.java b/src/main/java/zone/moddev/mc/basesteam/items/MusketItem.java similarity index 97% rename from src/main/java/zone/moddev/mc/steamadvantage/items/MusketItem.java rename to src/main/java/zone/moddev/mc/basesteam/items/MusketItem.java index e56d053..80e13ef 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/items/MusketItem.java +++ b/src/main/java/zone/moddev/mc/basesteam/items/MusketItem.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.steamadvantage.items; +package zone.moddev.mc.basesteam.items; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playBigSoundAtPosition; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtPosition; +import static zone.moddev.mc.basesteam.util.SoundHelper.playBigSoundAtPosition; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtPosition; import java.util.List; import java.util.Iterator; @@ -10,9 +10,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.init.Enchantments; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.init.Enchantments; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.TNTBlock; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -456,7 +456,7 @@ public void addInformation(ItemStack stack, World world, List li list.add(new TranslationTextComponent("tooltip.musket.loaded")); } else { list.add(new TranslationTextComponent("tooltip.musket.unloaded")); - list.add(new TranslationTextComponent("tooltip.musket.ammo", new TranslationTextComponent("item.steamadvantage.blackpowder_cartridge"))); + list.add(new TranslationTextComponent("tooltip.musket.ammo", new TranslationTextComponent("item.basesteam.blackpowder_cartridge"))); } } diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/BlastFurnaceBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/BlastFurnaceBlock.java similarity index 92% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/BlastFurnaceBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/BlastFurnaceBlock.java index a25374d..ca8037a 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/BlastFurnaceBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/BlastFurnaceBlock.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/BlastFurnaceTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/BlastFurnaceTileEntity.java similarity index 95% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/BlastFurnaceTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/BlastFurnaceTileEntity.java index e41a90c..61efdba 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/BlastFurnaceTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/BlastFurnaceTileEntity.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.SoundEvents; import net.minecraft.item.ItemStack; @@ -18,7 +18,7 @@ import java.util.Arrays; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtTileEntity; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtTileEntity; public class BlastFurnaceTileEntity extends cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine{ @@ -47,7 +47,7 @@ public void onLoad() { } public BlastFurnaceTileEntity() { - super(zone.moddev.mc.steamadvantage.init.Entities.STEAM_FURNACE, Power.steam_power, 200, "tile.steamadvantage.steam_furnace.name"); + super(zone.moddev.mc.basesteam.init.Entities.STEAM_FURNACE, Power.steam_power, 200, "tile.basesteam.steam_furnace.name"); allSlots = new int[inventory.length]; for(int i = 0; i < allSlots.length; i++){ allSlots[i] = i; @@ -199,7 +199,7 @@ private void energyDecay() { private int getFuelBurnTime(ItemStack item) { if(item == null) return 0; - return zone.moddev.mc.steamadvantage.util.FurnaceFuelHelper.getBurnTime(item); + return zone.moddev.mc.basesteam.util.FurnaceFuelHelper.getBurnTime(item); } private void decrementFuel() { diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/CoalBoilerBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/CoalBoilerBlock.java similarity index 88% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/CoalBoilerBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/CoalBoilerBlock.java index 3369b94..04fec3d 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/CoalBoilerBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/CoalBoilerBlock.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/CoalBoilerTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/CoalBoilerTileEntity.java similarity index 95% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/CoalBoilerTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/CoalBoilerTileEntity.java index c3215f7..8c5d881 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/CoalBoilerTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/CoalBoilerTileEntity.java @@ -1,12 +1,12 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtTileEntity; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtTileEntity; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerRequest; import cyano.poweradvantage.api.fluid.FluidRequest; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.SoundEvents; import net.minecraft.item.ItemStack; @@ -19,7 +19,7 @@ import cyano.poweradvantage.api.fluid.FluidStack; import cyano.poweradvantage.api.fluid.FluidTank; import cyano.poweradvantage.api.fluid.FluidTankInfo; -import zone.moddev.mc.steamadvantage.util.LegacyFluidHandler; +import zone.moddev.mc.basesteam.util.LegacyFluidHandler; @SuppressWarnings("deprecation") public class CoalBoilerTileEntity extends cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine implements LegacyFluidHandler{ @@ -38,7 +38,7 @@ public class CoalBoilerTileEntity extends cyano.poweradvantage.api.simple.TileEn private final int[] dataSyncArray = new int[4]; public CoalBoilerTileEntity() { - super(zone.moddev.mc.steamadvantage.init.Entities.STEAM_BOILER_COAL, new ConduitType[]{Power.steam_power,Fluids.fluidConduit_general}, new float[]{1000,1000}, "tile.steamadvantage.steam_boiler_coal.name"); + super(zone.moddev.mc.basesteam.init.Entities.STEAM_BOILER_COAL, new ConduitType[]{Power.steam_power,Fluids.fluidConduit_general}, new float[]{1000,1000}, "tile.basesteam.steam_boiler_coal.name"); tank = new FluidTank(FluidTank.BUCKET_VOLUME * 4) { @Override protected void onContentsChanged() { @@ -105,7 +105,7 @@ private void energyDecay() { private int getFuelBurnTime() { if(inventory[0] == null) return 0; - return zone.moddev.mc.steamadvantage.util.FurnaceFuelHelper.getBurnTime(inventory[0]); + return zone.moddev.mc.basesteam.util.FurnaceFuelHelper.getBurnTime(inventory[0]); } @@ -433,7 +433,7 @@ public FluidTankInfo[] getTankInfo(Direction face) { @Override public boolean isItemValidForSlot(final int slot, final ItemStack item) { - return super.isItemValidForSlot(slot, item) && zone.moddev.mc.steamadvantage.util.FurnaceFuelHelper.getBurnTime(item) > 0; + return super.isItemValidForSlot(slot, item) && zone.moddev.mc.basesteam.util.FurnaceFuelHelper.getBurnTime(item) > 0; } @Override diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/ElectricBoilerBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/ElectricBoilerBlock.java similarity index 85% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/ElectricBoilerBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/ElectricBoilerBlock.java index a892f61..005eb96 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/ElectricBoilerBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/ElectricBoilerBlock.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/ElectricBoilerTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/ElectricBoilerTileEntity.java similarity index 95% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/ElectricBoilerTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/ElectricBoilerTileEntity.java index 3195b8e..4d05278 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/ElectricBoilerTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/ElectricBoilerTileEntity.java @@ -1,12 +1,12 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtTileEntity; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtTileEntity; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerRequest; import cyano.poweradvantage.api.fluid.FluidRequest; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.SoundEvents; import net.minecraft.item.ItemStack; @@ -18,7 +18,7 @@ import cyano.poweradvantage.api.fluid.FluidStack; import cyano.poweradvantage.api.fluid.FluidTank; import cyano.poweradvantage.api.fluid.FluidTankInfo; -import zone.moddev.mc.steamadvantage.util.LegacyFluidHandler; +import zone.moddev.mc.basesteam.util.LegacyFluidHandler; @SuppressWarnings("deprecation") public class ElectricBoilerTileEntity extends cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine implements LegacyFluidHandler{ @@ -37,9 +37,9 @@ public class ElectricBoilerTileEntity extends cyano.poweradvantage.api.simple.Ti private final int[] dataSyncArray = new int[3]; public ElectricBoilerTileEntity() { - super(zone.moddev.mc.steamadvantage.init.Entities.STEAM_BOILER_ELECTRIC, new ConduitType[]{Power.steam_power, ELECTRIC_POWER, Fluids.fluidConduit_general}, + super(zone.moddev.mc.basesteam.init.Entities.STEAM_BOILER_ELECTRIC, new ConduitType[]{Power.steam_power, ELECTRIC_POWER, Fluids.fluidConduit_general}, new float[]{100, MAX_ELECTRICITY, 1000}, - "tile.steamadvantage.steam_boiler_electric.name"); + "tile.basesteam.steam_boiler_electric.name"); tank = new FluidTank(FluidTank.BUCKET_VOLUME * 2) { @Override protected void onContentsChanged() { diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/GeothermalBoilerBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/GeothermalBoilerBlock.java similarity index 86% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/GeothermalBoilerBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/GeothermalBoilerBlock.java index 488ae45..1ee5a98 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/GeothermalBoilerBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/GeothermalBoilerBlock.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/GeothermalBoilerTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/GeothermalBoilerTileEntity.java similarity index 96% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/GeothermalBoilerTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/GeothermalBoilerTileEntity.java index 2ea16e8..3918664 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/GeothermalBoilerTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/GeothermalBoilerTileEntity.java @@ -1,12 +1,12 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; -import zone.moddev.mc.steamadvantage.util.LegacyFluidHandler; +import zone.moddev.mc.basesteam.util.LegacyFluidHandler; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerRequest; import cyano.poweradvantage.api.fluid.FluidRequest; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; @@ -21,7 +21,7 @@ import cyano.poweradvantage.api.fluid.FluidTank; import cyano.poweradvantage.api.fluid.FluidTankInfo; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtTileEntity; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtTileEntity; @SuppressWarnings("deprecation") public class GeothermalBoilerTileEntity extends cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine implements LegacyFluidHandler{ @@ -42,7 +42,7 @@ public class GeothermalBoilerTileEntity extends cyano.poweradvantage.api.simple. private final int[] dataSyncArray = new int[3]; public GeothermalBoilerTileEntity() { - super(zone.moddev.mc.steamadvantage.init.Entities.STEAM_BOILER_GEOTHERMAL, new ConduitType[]{Power.steam_power,Fluids.fluidConduit_general}, new float[]{100,1000}, "tile.steamadvantage.steam_boiler_geothermal.name"); + super(zone.moddev.mc.basesteam.init.Entities.STEAM_BOILER_GEOTHERMAL, new ConduitType[]{Power.steam_power,Fluids.fluidConduit_general}, new float[]{100,1000}, "tile.basesteam.steam_boiler_geothermal.name"); tank = new FluidTank(FluidTank.BUCKET_VOLUME * 2) { @Override protected void onContentsChanged() { diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/OilBoilerBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerBlock.java similarity index 87% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/OilBoilerBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerBlock.java index 4d5de8f..34cac37 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/OilBoilerBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerBlock.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/OilBoilerTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerTileEntity.java similarity index 96% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/OilBoilerTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerTileEntity.java index 3905166..973b847 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/OilBoilerTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerTileEntity.java @@ -1,17 +1,17 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; -import zone.moddev.mc.poweradvantage.util.FluidIdHelper; +import zone.moddev.mc.basepower.util.FluidIdHelper; -import zone.moddev.mc.steamadvantage.util.LegacyFluidHandler; +import zone.moddev.mc.basesteam.util.LegacyFluidHandler; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.FluidCategoryRegistry; import cyano.poweradvantage.api.PowerRequest; import cyano.poweradvantage.api.fluid.FluidRequest; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.poweradvantage.registry.FuelRegistry; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basepower.registry.FuelRegistry; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.SoundEvents; import net.minecraft.item.ItemStack; @@ -28,7 +28,7 @@ import java.util.HashMap; import java.util.Map; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtTileEntity; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtTileEntity; @SuppressWarnings("deprecation") public class OilBoilerTileEntity extends cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine implements LegacyFluidHandler{ @@ -45,7 +45,7 @@ public class OilBoilerTileEntity extends cyano.poweradvantage.api.simple.TileEnt private final int[] dataSyncArray = new int[6]; public OilBoilerTileEntity() { - super(zone.moddev.mc.steamadvantage.init.Entities.STEAM_BOILER_OIL, new ConduitType[]{Power.steam_power, Fluids.fluidConduit_general}, new float[]{1000,1000}, "tile.steamadvantage.steam_boiler_oil.name"); + super(zone.moddev.mc.basesteam.init.Entities.STEAM_BOILER_OIL, new ConduitType[]{Power.steam_power, Fluids.fluidConduit_general}, new float[]{1000,1000}, "tile.basesteam.steam_boiler_oil.name"); waterTank = new FluidTank(FluidTank.BUCKET_VOLUME * 4); fuelTank = new FluidTank(FluidTank.BUCKET_VOLUME * 4); } diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/RockCrusherBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/RockCrusherBlock.java similarity index 92% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/RockCrusherBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/RockCrusherBlock.java index cf87c1a..ca5f726 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/RockCrusherBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/RockCrusherBlock.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/RockCrusherTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/RockCrusherTileEntity.java similarity index 94% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/RockCrusherTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/RockCrusherTileEntity.java index 60e492b..3bca6a2 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/RockCrusherTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/RockCrusherTileEntity.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import net.minecraft.entity.player.PlayerEntity; @@ -6,11 +6,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.Direction; -import zone.moddev.mc.steamadvantage.compat.BaseMetalsCompat; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.compat.BaseMetalsCompat; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.util.SoundCategory; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtTileEntity; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtTileEntity; public class RockCrusherTileEntity extends cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine{ @@ -25,7 +25,7 @@ public class RockCrusherTileEntity extends cyano.poweradvantage.api.simple.TileE private int progress = 0; public RockCrusherTileEntity() { - super(zone.moddev.mc.steamadvantage.init.Entities.STEAM_CRUSHER, Power.steam_power, 50, "tile.steamadvantage.steam_crusher.name"); + super(zone.moddev.mc.basesteam.init.Entities.STEAM_CRUSHER, Power.steam_power, 50, "tile.basesteam.steam_crusher.name"); allSlots = new int[inventory.length]; for(int i = 0; i < allSlots.length; i++){ allSlots[i] = i; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamDrillBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamDrillBlock.java similarity index 96% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/SteamDrillBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamDrillBlock.java index f481e46..112e999 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamDrillBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamDrillBlock.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.*; import cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.steamadvantage.blocks.DrillBitTileEntity; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basesteam.blocks.DrillBitTileEntity; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.state.DirectionProperty; import net.minecraft.state.StateContainer; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamDrillTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamDrillTileEntity.java similarity index 95% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/SteamDrillTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamDrillTileEntity.java index 16cb299..1822c39 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamDrillTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamDrillTileEntity.java @@ -1,11 +1,11 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; -import zone.moddev.mc.poweradvantage.util.InventoryWrapper; -import zone.moddev.mc.steamadvantage.blocks.DrillBitTileEntity; -import zone.moddev.mc.steamadvantage.compat.BaseMetalsCompat; -import zone.moddev.mc.steamadvantage.init.Blocks; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.util.InventoryWrapper; +import zone.moddev.mc.basesteam.blocks.DrillBitTileEntity; +import zone.moddev.mc.basesteam.compat.BaseMetalsCompat; +import zone.moddev.mc.basesteam.init.Blocks; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; @@ -26,8 +26,8 @@ import java.util.Arrays; import java.util.List; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtPosition; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtTileEntity; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtPosition; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtTileEntity; @SuppressWarnings("deprecation") public class SteamDrillTileEntity extends cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine{ @@ -54,7 +54,7 @@ public class SteamDrillTileEntity extends cyano.poweradvantage.api.simple.TileEn private boolean deferred = false; public SteamDrillTileEntity() { - super(zone.moddev.mc.steamadvantage.init.Entities.STEAM_DRILL, Power.steam_power, 50, "tile.steamadvantage.steam_drill.name"); + super(zone.moddev.mc.basesteam.init.Entities.STEAM_DRILL, Power.steam_power, 50, "tile.basesteam.steam_drill.name"); } @@ -198,7 +198,7 @@ private boolean followTrack(){ // replace this block with steam pipe destroyDrillBit(drillDirection); - w.setBlockState(currentPos.offset(drillDirection), zone.moddev.mc.poweradvantage.init.Blocks.steel_frame.getDefaultState()); + w.setBlockState(currentPos.offset(drillDirection), zone.moddev.mc.basepower.init.Blocks.steel_frame.getDefaultState()); w.setBlockState(currentPos, Blocks.steam_pipe.getDefaultState(), 2); return true; } @@ -287,7 +287,7 @@ public void onDataFieldUpdate() { if(hitEnd){ boolean moved = followTrack(); if(moved){ - zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry.getInstance() + zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry.getInstance() .conduitBlockRemovedEvent(powerAdvantageWorld(), powerAdvantageWorld().dimension.getType().getId(), powerAdvantagePos(), Power.steam_power); return; } @@ -317,7 +317,7 @@ public void onDataFieldUpdate() { private void destroyDrillBit(Direction f) { BlockPos n = powerAdvantagePos().offset(f); - while(powerAdvantageWorld().getBlockState(n).getBlock() == zone.moddev.mc.steamadvantage.init.Blocks.drillbit){ + while(powerAdvantageWorld().getBlockState(n).getBlock() == zone.moddev.mc.basesteam.init.Blocks.drillbit){ powerAdvantageWorld().removeBlock(n, false); n = n.offset(f); } diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamElevatorBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamElevatorBlock.java similarity index 92% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/SteamElevatorBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamElevatorBlock.java index 6bb7fb4..37253db 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamElevatorBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamElevatorBlock.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamElevatorTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamElevatorTileEntity.java similarity index 92% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/SteamElevatorTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamElevatorTileEntity.java index 3390870..31142da 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamElevatorTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamElevatorTileEntity.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; -import zone.moddev.mc.steamadvantage.init.Blocks; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Blocks; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.SoundEvents; @@ -14,7 +14,7 @@ import java.util.List; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtTileEntity; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtTileEntity; public class SteamElevatorTileEntity extends cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine{ @@ -29,7 +29,7 @@ public class SteamElevatorTileEntity extends cyano.poweradvantage.api.simple.Til private boolean up = false; public SteamElevatorTileEntity() { - super(zone.moddev.mc.steamadvantage.init.Entities.STEAM_ELEVATOR, Power.steam_power, STEAM_PER_ELEVATOR_MOVE*2, "tile.steamadvantage.steam_elevator.name"); + super(zone.moddev.mc.basesteam.init.Entities.STEAM_ELEVATOR, Power.steam_power, STEAM_PER_ELEVATOR_MOVE*2, "tile.basesteam.steam_elevator.name"); } private boolean redstone = true; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamPumpBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamPumpBlock.java similarity index 89% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/SteamPumpBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamPumpBlock.java index e318960..76460d6 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamPumpBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamPumpBlock.java @@ -1,11 +1,11 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.steamadvantage.init.Blocks; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basesteam.init.Blocks; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamPumpTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamPumpTileEntity.java similarity index 93% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/SteamPumpTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamPumpTileEntity.java index a397adf..de0a953 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamPumpTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamPumpTileEntity.java @@ -1,15 +1,15 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; -import zone.moddev.mc.poweradvantage.util.FluidIdHelper; +import zone.moddev.mc.basepower.util.FluidIdHelper; -import zone.moddev.mc.steamadvantage.util.LegacyFluidHandler; +import zone.moddev.mc.basesteam.util.LegacyFluidHandler; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerRequest; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.poweradvantage.util.FluidHandlerHelper; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basepower.util.FluidHandlerHelper; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.BlockState; import net.minecraft.block.IBucketPickupHandler; import net.minecraft.entity.player.PlayerEntity; @@ -31,7 +31,7 @@ import java.util.HashSet; import java.util.Set; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtTileEntity; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtTileEntity; @SuppressWarnings("deprecation") public class SteamPumpTileEntity extends cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine implements LegacyFluidHandler{ @@ -50,7 +50,7 @@ public class SteamPumpTileEntity extends cyano.poweradvantage.api.simple.TileEnt private byte timeUntilNextPump = PUMP_INTERVAL; public SteamPumpTileEntity() { - super(zone.moddev.mc.steamadvantage.init.Entities.STEAM_PUMP, new ConduitType[]{Power.steam_power,Fluids.fluidConduit_general}, new float[]{300f,1000f}, "tile.steamadvantage.steam_pump.name"); + super(zone.moddev.mc.basesteam.init.Entities.STEAM_PUMP, new ConduitType[]{Power.steam_power,Fluids.fluidConduit_general}, new float[]{300f,1000f}, "tile.basesteam.steam_pump.name"); tank = new FluidTank(FluidTank.BUCKET_VOLUME); } @@ -67,12 +67,12 @@ public void tickUpdate(boolean isServerWorld) { World w = getWorld(); boolean success = false; BlockPos target = this.getPos().down(); - while(target.getY() > 0 && w.getBlockState(target).getBlock() == zone.moddev.mc.steamadvantage.init.Blocks.pump_pipe_steam){ + while(target.getY() > 0 && w.getBlockState(target).getBlock() == zone.moddev.mc.basesteam.init.Blocks.pump_pipe_steam){ target = target.down(); } if(target.getY() > 0 && w.isAirBlock(target) && getEnergy(Power.steam_power) >= ENERGY_COST_PIPE){ // place pipe - w.setBlockState(target, zone.moddev.mc.steamadvantage.init.Blocks.pump_pipe_steam.getDefaultState()); + w.setBlockState(target, zone.moddev.mc.basesteam.init.Blocks.pump_pipe_steam.getDefaultState()); this.subtractEnergy(ENERGY_COST_PIPE, Power.steam_power); timeUntilNextPump = PIPE_INTERVAL; playSoundAtTileEntity( SoundEvents.BLOCK_STONE_PLACE, SoundCategory.BLOCKS, 0.3f, 1f, this); @@ -197,7 +197,7 @@ public void powerUpdate(){ FluidStack fluid = getTank().getFluid(); ConduitType type = Fluids.fluidToConduitType(fluid.getFluid()); float availableAmount = getTank().getFluidAmount(); - float delta = ConduitRegistry.transmitPowerToConsumers(availableAmount, zone.moddev.mc.poweradvantage.init.Fluids.fluidConduit_general, type, + float delta = ConduitRegistry.transmitPowerToConsumers(availableAmount, zone.moddev.mc.basepower.init.Fluids.fluidConduit_general, type, PowerRequest.LAST_PRIORITY, getWorld(), getPos(), this); if(delta > 0){ getTank().drain(Math.max((int)delta,1),true); // no free energy! @@ -324,7 +324,7 @@ public boolean isPowerSink(ConduitType type){ @Override public boolean isPowerSource(ConduitType type){ - return zone.moddev.mc.poweradvantage.init.Fluids.isFluidType(type); + return zone.moddev.mc.basepower.init.Fluids.isFluidType(type); } /** * Adds "energy" as a fluid to the FluidTank returned by getTank(). This implementation ignores diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamStillBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamStillBlock.java similarity index 86% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/SteamStillBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamStillBlock.java index 2087cb5..a70e89c 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamStillBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamStillBlock.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamStillTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamStillTileEntity.java similarity index 94% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/SteamStillTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamStillTileEntity.java index 6569ad3..ea44759 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamStillTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamStillTileEntity.java @@ -1,17 +1,17 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; -import zone.moddev.mc.poweradvantage.util.FluidIdHelper; +import zone.moddev.mc.basepower.util.FluidIdHelper; -import zone.moddev.mc.steamadvantage.util.LegacyFluidHandler; +import zone.moddev.mc.basesteam.util.LegacyFluidHandler; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerRequest; import cyano.poweradvantage.api.fluid.FluidRequest; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.poweradvantage.registry.still.recipe.DistillationRecipe; -import zone.moddev.mc.poweradvantage.registry.still.recipe.DistillationRecipeRegistry; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basepower.registry.still.recipe.DistillationRecipe; +import zone.moddev.mc.basepower.registry.still.recipe.DistillationRecipeRegistry; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.SoundEvents; import net.minecraft.item.ItemStack; @@ -23,7 +23,7 @@ import cyano.poweradvantage.api.fluid.FluidTank; import cyano.poweradvantage.api.fluid.FluidTankInfo; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtTileEntity; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtTileEntity; @SuppressWarnings("deprecation") public class SteamStillTileEntity extends cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine implements LegacyFluidHandler{ @@ -37,7 +37,7 @@ public class SteamStillTileEntity extends cyano.poweradvantage.api.simple.TileEn private final int[] dataSyncArray = new int[5]; public SteamStillTileEntity() { - super(zone.moddev.mc.steamadvantage.init.Entities.STEAM_STILL, new ConduitType[]{Power.steam_power, Fluids.fluidConduit_general}, new float[]{100,1000}, "tile.steamadvantage.steam_still.name"); + super(zone.moddev.mc.basesteam.init.Entities.STEAM_STILL, new ConduitType[]{Power.steam_power, Fluids.fluidConduit_general}, new float[]{100,1000}, "tile.basesteam.steam_still.name"); outputTank = new FluidTank(FluidTank.BUCKET_VOLUME ); inputTank = new FluidTank(FluidTank.BUCKET_VOLUME); } @@ -90,7 +90,7 @@ public void powerUpdate(){ if(this.getOutputTank().getFluidAmount() > 0){ ConduitType type = Fluids.fluidToConduitType(getOutputTank().getFluid().getFluid()); float availableAmount = getOutputTank().getFluidAmount(); - float delta = ConduitRegistry.transmitPowerToConsumers(availableAmount, zone.moddev.mc.poweradvantage.init.Fluids.fluidConduit_general, type, + float delta = ConduitRegistry.transmitPowerToConsumers(availableAmount, zone.moddev.mc.basepower.init.Fluids.fluidConduit_general, type, this.getMinimumSinkPriority(), getWorld(), getPos(), this); if(delta > 0){ getOutputTank().drain(Math.max((int)delta,1),true); // no free energy! diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamTankBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamTankBlock.java similarity index 92% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/SteamTankBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamTankBlock.java index 9c3f526..fbcdd56 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamTankBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamTankBlock.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamTankTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamTankTileEntity.java similarity index 91% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/SteamTankTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamTankTileEntity.java index 565362b..1c9721f 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamTankTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamTankTileEntity.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerRequest; import cyano.poweradvantage.api.fluid.FluidTank; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.fluid.Fluid; @@ -15,7 +15,7 @@ public class SteamTankTileEntity extends cyano.poweradvantage.api.simple.TileEn private final int[] dataSyncArray = new int[1]; public SteamTankTileEntity() { - super(zone.moddev.mc.steamadvantage.init.Entities.STEAM_TANK, Power.steam_power, FluidTank.BUCKET_VOLUME * 10, "tile.steamadvantage.steam_tank.name"); + super(zone.moddev.mc.basesteam.init.Entities.STEAM_TANK, Power.steam_power, FluidTank.BUCKET_VOLUME * 10, "tile.basesteam.steam_tank.name"); } private boolean redstone = true; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/migration/SteamLegacyMigrations.java b/src/main/java/zone/moddev/mc/basesteam/migration/SteamLegacyMigrations.java similarity index 83% rename from src/main/java/zone/moddev/mc/steamadvantage/migration/SteamLegacyMigrations.java rename to src/main/java/zone/moddev/mc/basesteam/migration/SteamLegacyMigrations.java index a7e1c02..113b478 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/migration/SteamLegacyMigrations.java +++ b/src/main/java/zone/moddev/mc/basesteam/migration/SteamLegacyMigrations.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.migration; +package zone.moddev.mc.basesteam.migration; import cyano.poweradvantage.api.migration.LegacyMigrationApi; import cyano.poweradvantage.api.simple.BlockSimplePowerMachine; @@ -7,10 +7,10 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; -import zone.moddev.mc.poweradvantage.blocks.BlockPowerSwitch; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.blocks.PlatformBlock; -import zone.moddev.mc.steamadvantage.machines.SteamDrillBlock; +import zone.moddev.mc.basepower.blocks.BlockPowerSwitch; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.blocks.PlatformBlock; +import zone.moddev.mc.basesteam.machines.SteamDrillBlock; /** Registers SteamAdvantage's 1.10 and 1.12 identities with PowerAdvantage's shared migration hook. */ public final class SteamLegacyMigrations { @@ -21,7 +21,7 @@ private SteamLegacyMigrations() {} public static synchronized void register() { if (registered) return; - LegacyMigrationApi.registerNamespace(SteamAdvantage.MODID); + LegacyMigrationApi.registerNamespaceAlias("steamadvantage", SteamAdvantage.MODID); for (String path : new String[] { "steam_pipe", "steam_track", "steam_boiler_coal", "steam_boiler_electric", "steam_boiler_geothermal", "steam_tank", "steam_furnace", "steam_crusher", @@ -44,16 +44,13 @@ public static synchronized void register() { registerTile("steam_boiler_oil"); LegacyMigrationApi.registerDurableItem(id("musket")); - LegacyMigrationApi.registerNbtMigration("steamadvantage:persistence_keys", + LegacyMigrationApi.registerNbtMigration("basesteam:persistence_keys", SteamLegacyMigrations::repairPersistenceKeys); registered = true; } private static void registerTile(String path) { - String current = id(path).toString(); - LegacyMigrationApi.registerTileEntityAlias(current, current); - LegacyMigrationApi.registerTileEntityAlias(SteamAdvantage.MODID + "." + path, current); - LegacyMigrationApi.registerTileEntityAlias("minecraft:" + SteamAdvantage.MODID + "." + path, current); + LegacyMigrationApi.registerTileEntityAliases(id(path)); } private static BlockState decodeState(Block block, int metadata) { diff --git a/src/main/java/zone/moddev/mc/steamadvantage/recipe/RecipeConditions.java b/src/main/java/zone/moddev/mc/basesteam/recipe/RecipeConditions.java similarity index 92% rename from src/main/java/zone/moddev/mc/steamadvantage/recipe/RecipeConditions.java rename to src/main/java/zone/moddev/mc/basesteam/recipe/RecipeConditions.java index 056984d..71aef80 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/recipe/RecipeConditions.java +++ b/src/main/java/zone/moddev/mc/basesteam/recipe/RecipeConditions.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.recipe; +package zone.moddev.mc.basesteam.recipe; import com.google.gson.JsonObject; import java.util.Locale; @@ -7,9 +7,9 @@ import net.minecraftforge.common.crafting.CraftingHelper; import net.minecraftforge.common.crafting.conditions.ICondition; import net.minecraftforge.common.crafting.conditions.IConditionSerializer; -import zone.moddev.mc.poweradvantage.PowerAdvantage; -import zone.moddev.mc.poweradvantage.RecipeMode; -import zone.moddev.mc.steamadvantage.SteamAdvantage; +import zone.moddev.mc.basepower.PowerAdvantage; +import zone.moddev.mc.basepower.RecipeMode; +import zone.moddev.mc.basesteam.SteamAdvantage; /** Registers the data-pack conditions used by SteamAdvantage recipes. */ public final class RecipeConditions { diff --git a/src/main/java/zone/moddev/mc/steamadvantage/util/FurnaceFuelHelper.java b/src/main/java/zone/moddev/mc/basesteam/util/FurnaceFuelHelper.java similarity index 94% rename from src/main/java/zone/moddev/mc/steamadvantage/util/FurnaceFuelHelper.java rename to src/main/java/zone/moddev/mc/basesteam/util/FurnaceFuelHelper.java index 2920f87..9a3cbae 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/util/FurnaceFuelHelper.java +++ b/src/main/java/zone/moddev/mc/basesteam/util/FurnaceFuelHelper.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.util; +package zone.moddev.mc.basesteam.util; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/util/LegacyFluidHandler.java b/src/main/java/zone/moddev/mc/basesteam/util/LegacyFluidHandler.java similarity index 83% rename from src/main/java/zone/moddev/mc/steamadvantage/util/LegacyFluidHandler.java rename to src/main/java/zone/moddev/mc/basesteam/util/LegacyFluidHandler.java index 9d88309..a08870e 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/util/LegacyFluidHandler.java +++ b/src/main/java/zone/moddev/mc/basesteam/util/LegacyFluidHandler.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.util; +package zone.moddev.mc.basesteam.util; import cyano.poweradvantage.api.fluid.IAdvantageFluidHandler; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/util/SoundHelper.java b/src/main/java/zone/moddev/mc/basesteam/util/SoundHelper.java similarity index 98% rename from src/main/java/zone/moddev/mc/steamadvantage/util/SoundHelper.java rename to src/main/java/zone/moddev/mc/basesteam/util/SoundHelper.java index d82e35f..cb842bc 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/util/SoundHelper.java +++ b/src/main/java/zone/moddev/mc/basesteam/util/SoundHelper.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.util; +package zone.moddev.mc.basesteam.util; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 4aee25d..a830fac 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,38 +1,38 @@ modLoader="javafml" loaderVersion="${loader_version_range}" license="GPL-3.0-only" -issueTrackerURL="https://github.com/MinecraftModDevelopmentMods/SteamAdvantage/issues" +issueTrackerURL="https://github.com/MinecraftModDevelopmentMods/baseSteam/issues" [[mods]] -modId="steamadvantage" +modId="basesteam" version="${version}" -displayName="Steam Advantage" -displayURL="https://www.curseforge.com/minecraft/mc-mods/steam-advantage" +displayName="baseSteam" +displayURL="https://www.curseforge.com/minecraft/mc-mods/basesteam" authors="DrCyano, the MMD Team" description='''Steam-powered machines and infrastructure for the Power Advantage platform.''' -[[dependencies.steamadvantage]] -modId="poweradvantage" +[[dependencies.basesteam]] +modId="basepower" mandatory=true -versionRange="[2.4.5.114041,3.0.0)" +versionRange="[2.4.6.114041,3.0.0)" ordering="AFTER" side="BOTH" -[[dependencies.steamadvantage]] +[[dependencies.basesteam]] modId="basemetals" mandatory=false versionRange="[3.0.1.114041,4.0.0)" ordering="AFTER" side="BOTH" -[[dependencies.steamadvantage]] +[[dependencies.basesteam]] modId="forge" mandatory=true versionRange="${forge_version_range}" ordering="NONE" side="BOTH" -[[dependencies.steamadvantage]] +[[dependencies.basesteam]] modId="minecraft" mandatory=true versionRange="${minecraft_version_range}" diff --git a/src/main/resources/assets/basesteam/blockstates/drillbit.json b/src/main/resources/assets/basesteam/blockstates/drillbit.json new file mode 100644 index 0000000..fb4f3bb --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/drillbit.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "basesteam:block/drillbit" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/basesteam/blockstates/platform.json b/src/main/resources/assets/basesteam/blockstates/platform.json new file mode 100644 index 0000000..dfb6c5a --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/platform.json @@ -0,0 +1,9 @@ +{ + "variants": { + "height=0": { "model": "basesteam:block/platform_shaft" }, + "height=1": { "model": "basesteam:block/platform1" }, + "height=2": { "model": "basesteam:block/platform2" }, + "height=3": { "model": "basesteam:block/platform3" }, + "height=4": { "model": "basesteam:block/platform4" } + } +} diff --git a/src/main/resources/assets/basesteam/blockstates/pump_pipe_steam.json b/src/main/resources/assets/basesteam/blockstates/pump_pipe_steam.json new file mode 100644 index 0000000..1f6c9c3 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/pump_pipe_steam.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": {"model": "basepower:block/fluid_pipe_ns", "x": 90, "y": 0, "uvlock": false } + } +} diff --git a/src/main/resources/assets/basesteam/blockstates/steam_boiler_coal.json b/src/main/resources/assets/basesteam/blockstates/steam_boiler_coal.json new file mode 100644 index 0000000..90590a2 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_boiler_coal.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "basesteam:block/steam_boiler_coal", "y": 90 }, + "facing=north": { "model": "basesteam:block/steam_boiler_coal" }, + "facing=south": { "model": "basesteam:block/steam_boiler_coal", "y": 180 }, + "facing=west": { "model": "basesteam:block/steam_boiler_coal", "y": 270 } + } +} diff --git a/src/main/resources/assets/basesteam/blockstates/steam_boiler_electric.json b/src/main/resources/assets/basesteam/blockstates/steam_boiler_electric.json new file mode 100644 index 0000000..48562bd --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_boiler_electric.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "basesteam:block/steam_boiler_electric", "y": 90 }, + "facing=north": { "model": "basesteam:block/steam_boiler_electric" }, + "facing=south": { "model": "basesteam:block/steam_boiler_electric", "y": 180 }, + "facing=west": { "model": "basesteam:block/steam_boiler_electric", "y": 270 } + } +} diff --git a/src/main/resources/assets/basesteam/blockstates/steam_boiler_geothermal.json b/src/main/resources/assets/basesteam/blockstates/steam_boiler_geothermal.json new file mode 100644 index 0000000..b74a449 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_boiler_geothermal.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "basesteam:block/steam_boiler_geothermal", "y": 90 }, + "facing=north": { "model": "basesteam:block/steam_boiler_geothermal" }, + "facing=south": { "model": "basesteam:block/steam_boiler_geothermal", "y": 180 }, + "facing=west": { "model": "basesteam:block/steam_boiler_geothermal", "y": 270 } + } +} diff --git a/src/main/resources/assets/basesteam/blockstates/steam_boiler_oil.json b/src/main/resources/assets/basesteam/blockstates/steam_boiler_oil.json new file mode 100644 index 0000000..8e1862f --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_boiler_oil.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "basesteam:block/steam_boiler_oil", "x":270, "y": 90 }, + "facing=north": { "model": "basesteam:block/steam_boiler_oil", "x":270 }, + "facing=south": { "model": "basesteam:block/steam_boiler_oil", "x":270, "y": 180 }, + "facing=west": { "model": "basesteam:block/steam_boiler_oil", "x":270, "y": 270 } + } +} diff --git a/src/main/resources/assets/basesteam/blockstates/steam_crusher.json b/src/main/resources/assets/basesteam/blockstates/steam_crusher.json new file mode 100644 index 0000000..8a19f59 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_crusher.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "basesteam:block/steam_crusher", "y": 90 }, + "facing=north": { "model": "basesteam:block/steam_crusher" }, + "facing=south": { "model": "basesteam:block/steam_crusher", "y": 180 }, + "facing=west": { "model": "basesteam:block/steam_crusher", "y": 270 } + } +} diff --git a/src/main/resources/assets/basesteam/blockstates/steam_drill.json b/src/main/resources/assets/basesteam/blockstates/steam_drill.json new file mode 100644 index 0000000..d2d5c70 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_drill.json @@ -0,0 +1,10 @@ +{ + "variants": { + "facing=down": { "model": "basesteam:block/steam_drill", "x": 90 }, + "facing=up": { "model": "basesteam:block/steam_drill", "x": 270 }, + "facing=east": { "model": "basesteam:block/steam_drill", "y": 90 }, + "facing=north": { "model": "basesteam:block/steam_drill" }, + "facing=south": { "model": "basesteam:block/steam_drill", "y": 180 }, + "facing=west": { "model": "basesteam:block/steam_drill", "y": 270 } + } +} diff --git a/src/main/resources/assets/basesteam/blockstates/steam_elevator.json b/src/main/resources/assets/basesteam/blockstates/steam_elevator.json new file mode 100644 index 0000000..19f6c1e --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_elevator.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "basesteam:block/steam_elevator", "y": 90}, + "facing=north": { "model": "basesteam:block/steam_elevator" }, + "facing=south": { "model": "basesteam:block/steam_elevator", "y": 180}, + "facing=west": { "model": "basesteam:block/steam_elevator", "y": 270} + } +} diff --git a/src/main/resources/assets/basesteam/blockstates/steam_furnace.json b/src/main/resources/assets/basesteam/blockstates/steam_furnace.json new file mode 100644 index 0000000..43b0cd1 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_furnace.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "basesteam:block/steam_furnace", "y": 90 }, + "facing=north": { "model": "basesteam:block/steam_furnace" }, + "facing=south": { "model": "basesteam:block/steam_furnace", "y": 180 }, + "facing=west": { "model": "basesteam:block/steam_furnace", "y": 270 } + } +} diff --git a/src/main/resources/assets/basesteam/blockstates/steam_pipe.json b/src/main/resources/assets/basesteam/blockstates/steam_pipe.json new file mode 100644 index 0000000..20a8cc1 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_pipe.json @@ -0,0 +1,70 @@ +{ + "__comment": "blockstate parameters MUST be in alphabetical order!", + "variants": { + "down=false,east=false,north=false,south=false,up=false,west=false": { "model": "basesteam:block/steam_pipe_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=false,west=false": { "model": "basesteam:block/steam_pipe_n", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=false,west=false": { "model": "basesteam:block/steam_pipe_n", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=false,west=false": { "model": "basesteam:block/steam_pipe_n", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=false,west=false": { "model": "basesteam:block/steam_pipe_n", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=true,west=false": { "model": "basesteam:block/steam_pipe_n", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=false,west=true": { "model": "basesteam:block/steam_pipe_n", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=false,west=false": { "model": "basesteam:block/steam_pipe_nw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=false,west=false": { "model": "basesteam:block/steam_pipe_nw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=false,west=false": { "model": "basesteam:block/steam_pipe_nw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=true,west=false": { "model": "basesteam:block/steam_pipe_ns", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=false,west=true": { "model": "basesteam:block/steam_pipe_nw", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=false,west=false": { "model": "basesteam:block/steam_pipe_nw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=false,west=false": { "model": "basesteam:block/steam_pipe_nw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=true,west=false": { "model": "basesteam:block/steam_pipe_nw", "x": 270, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=false,west=true": { "model": "basesteam:block/steam_pipe_ns", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=false,west=false": { "model": "basesteam:block/steam_pipe_ns", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=true,west=false": { "model": "basesteam:block/steam_pipe_nw", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=false,west=true": { "model": "basesteam:block/steam_pipe_nw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=true,west=false": { "model": "basesteam:block/steam_pipe_nw", "x": 270, "y": 270, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=false,west=true": { "model": "basesteam:block/steam_pipe_nw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=true,west=true": { "model": "basesteam:block/steam_pipe_nw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=false,west=false": { "model": "basesteam:block/steam_pipe_nuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=false,west=false": { "model": "basesteam:block/steam_pipe_nuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=true,west=false": { "model": "basesteam:block/steam_pipe_dnu", "x": 0, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=false,west=true": { "model": "basesteam:block/steam_pipe_dnu", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=false,west=false": { "model": "basesteam:block/steam_pipe_dnu", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=true,west=false": { "model": "basesteam:block/steam_pipe_dnu", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=false,west=true": { "model": "basesteam:block/steam_pipe_nuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=true,west=false": { "model": "basesteam:block/steam_pipe_dnu", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=false,west=true": { "model": "basesteam:block/steam_pipe_nuw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=true,west=true": { "model": "basesteam:block/steam_pipe_dnu", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=false,west=false": { "model": "basesteam:block/steam_pipe_nsw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=true,west=false": { "model": "basesteam:block/steam_pipe_nuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=false,west=true": { "model": "basesteam:block/steam_pipe_nsw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=true,west=false": { "model": "basesteam:block/steam_pipe_nuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=false,west=true": { "model": "basesteam:block/steam_pipe_nsw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=true,west=true": { "model": "basesteam:block/steam_pipe_dnu", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=true,west=false": { "model": "basesteam:block/steam_pipe_dnu", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=false,west=true": { "model": "basesteam:block/steam_pipe_nsw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=true,west=true": { "model": "basesteam:block/steam_pipe_nuw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=true,west=true": { "model": "basesteam:block/steam_pipe_nuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=false,west=false": { "model": "basesteam:block/steam_pipe_nsuw", "x": 180, "y": 180, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=true,west=false": { "model": "basesteam:block/steam_pipe_nsuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=false,west=true": { "model": "basesteam:block/steam_pipe_nsuw", "x": 180, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=true,west=false": { "model": "basesteam:block/steam_pipe_nsuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=false,west=true": { "model": "basesteam:block/steam_pipe_nsuw", "x": 180, "y": 270, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=true,west=true": { "model": "basesteam:block/steam_pipe_ensw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=true,west=false": { "model": "basesteam:block/steam_pipe_ensw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=false,west=true": { "model": "basesteam:block/steam_pipe_nsuw", "x": 180, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=true,west=true": { "model": "basesteam:block/steam_pipe_nsuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=true,west=true": { "model": "basesteam:block/steam_pipe_nsuw", "x": 90, "y": 270, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=true,west=false": { "model": "basesteam:block/steam_pipe_nsuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=false,west=true": { "model": "basesteam:block/steam_pipe_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=true,west=true": { "model": "basesteam:block/steam_pipe_nsuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=true,west=true": { "model": "basesteam:block/steam_pipe_nsuw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=true,west=true": { "model": "basesteam:block/steam_pipe_nsuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=true,west=false": { "model": "basesteam:block/steam_pipe_desuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=false,west=true": { "model": "basesteam:block/steam_pipe_desuw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=true,west=true": { "model": "basesteam:block/steam_pipe_desuw", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=true,west=true": { "model": "basesteam:block/steam_pipe_desuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=true,west=true": { "model": "basesteam:block/steam_pipe_desuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=true,west=true": { "model": "basesteam:block/steam_pipe_desuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=true,west=true": { "model": "basesteam:block/steam_pipe_densuw", "x": 0, "y": 0, "uvlock": false } + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/basesteam/blockstates/steam_pump.json b/src/main/resources/assets/basesteam/blockstates/steam_pump.json new file mode 100644 index 0000000..5b0a200 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_pump.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "basesteam:block/steam_pump", "y": 90 }, + "facing=north": { "model": "basesteam:block/steam_pump" }, + "facing=south": { "model": "basesteam:block/steam_pump", "y": 180 }, + "facing=west": { "model": "basesteam:block/steam_pump", "y": 270 } + } +} diff --git a/src/main/resources/assets/basesteam/blockstates/steam_still.json b/src/main/resources/assets/basesteam/blockstates/steam_still.json new file mode 100644 index 0000000..34f6798 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_still.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "basesteam:block/steam_still", "y": 90 }, + "facing=north": { "model": "basesteam:block/steam_still" }, + "facing=south": { "model": "basesteam:block/steam_still", "y": 180 }, + "facing=west": { "model": "basesteam:block/steam_still", "y": 270 } + } +} diff --git a/src/main/resources/assets/basesteam/blockstates/steam_switch.json b/src/main/resources/assets/basesteam/blockstates/steam_switch.json new file mode 100644 index 0000000..c83cb49 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_switch.json @@ -0,0 +1,6 @@ +{ + "variants": { + "active=false": { "model": "basesteam:block/steam_switch_off"}, + "active=true": { "model": "basesteam:block/steam_switch_on"} + } +} diff --git a/src/main/resources/assets/basesteam/blockstates/steam_tank.json b/src/main/resources/assets/basesteam/blockstates/steam_tank.json new file mode 100644 index 0000000..348f050 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_tank.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "basesteam:block/steam_tank", "y": 90, "uvlock": true }, + "facing=north": { "model": "basesteam:block/steam_tank", "uvlock": true }, + "facing=south": { "model": "basesteam:block/steam_tank", "y": 180, "uvlock": true }, + "facing=west": { "model": "basesteam:block/steam_tank", "y": 270, "uvlock": true } + } +} diff --git a/src/main/resources/assets/basesteam/blockstates/steam_track.json b/src/main/resources/assets/basesteam/blockstates/steam_track.json new file mode 100644 index 0000000..ffb9e0c --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_track.json @@ -0,0 +1,70 @@ +{ + "__comment": "blockstate parameters MUST be in alphabetical order!", + "variants": { + "down=false,east=false,north=false,south=false,up=false,west=false": { "model": "basesteam:block/steam_track_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=false,west=false": { "model": "basesteam:block/steam_track_n", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=false,west=false": { "model": "basesteam:block/steam_track_n", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=false,west=false": { "model": "basesteam:block/steam_track_n", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=false,west=false": { "model": "basesteam:block/steam_track_n", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=true,west=false": { "model": "basesteam:block/steam_track_n", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=false,west=true": { "model": "basesteam:block/steam_track_n", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=false,west=false": { "model": "basesteam:block/steam_track_nw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=false,west=false": { "model": "basesteam:block/steam_track_nw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=false,west=false": { "model": "basesteam:block/steam_track_nw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=true,west=false": { "model": "basesteam:block/steam_track_ns", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=false,west=true": { "model": "basesteam:block/steam_track_nw", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=false,west=false": { "model": "basesteam:block/steam_track_nw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=false,west=false": { "model": "basesteam:block/steam_track_nw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=true,west=false": { "model": "basesteam:block/steam_track_nw", "x": 270, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=false,west=true": { "model": "basesteam:block/steam_track_ns", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=false,west=false": { "model": "basesteam:block/steam_track_ns", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=true,west=false": { "model": "basesteam:block/steam_track_nw", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=false,west=true": { "model": "basesteam:block/steam_track_nw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=true,west=false": { "model": "basesteam:block/steam_track_nw", "x": 270, "y": 270, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=false,west=true": { "model": "basesteam:block/steam_track_nw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=true,west=true": { "model": "basesteam:block/steam_track_nw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=false,west=false": { "model": "basesteam:block/steam_track_nuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=false,west=false": { "model": "basesteam:block/steam_track_nuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=true,west=false": { "model": "basesteam:block/steam_track_dnu", "x": 0, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=false,west=true": { "model": "basesteam:block/steam_track_dnu", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=false,west=false": { "model": "basesteam:block/steam_track_dnu", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=true,west=false": { "model": "basesteam:block/steam_track_dnu", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=false,west=true": { "model": "basesteam:block/steam_track_nuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=true,west=false": { "model": "basesteam:block/steam_track_dnu", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=false,west=true": { "model": "basesteam:block/steam_track_nuw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=true,west=true": { "model": "basesteam:block/steam_track_dnu", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=false,west=false": { "model": "basesteam:block/steam_track_nsw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=true,west=false": { "model": "basesteam:block/steam_track_nuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=false,west=true": { "model": "basesteam:block/steam_track_nsw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=true,west=false": { "model": "basesteam:block/steam_track_nuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=false,west=true": { "model": "basesteam:block/steam_track_nsw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=true,west=true": { "model": "basesteam:block/steam_track_dnu", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=true,west=false": { "model": "basesteam:block/steam_track_dnu", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=false,west=true": { "model": "basesteam:block/steam_track_nsw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=true,west=true": { "model": "basesteam:block/steam_track_nuw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=true,west=true": { "model": "basesteam:block/steam_track_nuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=false,west=false": { "model": "basesteam:block/steam_track_nsuw", "x": 180, "y": 180, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=true,west=false": { "model": "basesteam:block/steam_track_nsuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=false,west=true": { "model": "basesteam:block/steam_track_nsuw", "x": 180, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=true,west=false": { "model": "basesteam:block/steam_track_nsuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=false,west=true": { "model": "basesteam:block/steam_track_nsuw", "x": 180, "y": 270, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=true,west=true": { "model": "basesteam:block/steam_track_ensw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=true,west=false": { "model": "basesteam:block/steam_track_ensw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=false,west=true": { "model": "basesteam:block/steam_track_nsuw", "x": 180, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=true,west=true": { "model": "basesteam:block/steam_track_nsuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=true,west=true": { "model": "basesteam:block/steam_track_nsuw", "x": 90, "y": 270, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=true,west=false": { "model": "basesteam:block/steam_track_nsuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=false,west=true": { "model": "basesteam:block/steam_track_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=true,west=true": { "model": "basesteam:block/steam_track_nsuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=true,west=true": { "model": "basesteam:block/steam_track_nsuw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=true,west=true": { "model": "basesteam:block/steam_track_nsuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=true,west=false": { "model": "basesteam:block/steam_track_desuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=false,west=true": { "model": "basesteam:block/steam_track_desuw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=true,west=true": { "model": "basesteam:block/steam_track_desuw", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=true,west=true": { "model": "basesteam:block/steam_track_desuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=true,west=true": { "model": "basesteam:block/steam_track_desuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=true,west=true": { "model": "basesteam:block/steam_track_desuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=true,west=true": { "model": "basesteam:block/steam_track_densuw", "x": 0, "y": 0, "uvlock": false } + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/basesteam/lang/de_de.json b/src/main/resources/assets/basesteam/lang/de_de.json new file mode 100644 index 0000000..f1ea3d8 --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/de_de.json @@ -0,0 +1,57 @@ +{ + "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", + "item.basesteam.steam_governor.name": "Dampfkraft Steuerventil", + "tile.basesteam.steam_pipe.name": "Dampfrohr", + "tile.basesteam.steam_boiler_coal.name": "Dampfkraft Kessel", + "tile.basesteam.steam_tank.name": "Dampftank", + "tile.basesteam.steam_furnace.name": "Dampfkraft Ofen", + "tile.basesteam.steam_crusher.name": "Dampfkraft Steinbrecher", + "tile.basesteam.drillbit.name": "Bohrer", + "tile.basesteam.steam_drill.name": "Dampfkraft Bohrmaschine", + "item.basesteam.steam_drill_bit.name": "Bohrer", + "death.attack.steam_machine": "%1$s wurde zwischen die Zahnräder einer Maschine geschliffen", + "death.attack.steam_machine.player": "%1$s wurde zwischen die Zahnräder einer Maschine von %2$s geschliffen", + "tile.basesteam.steam_elevator.name": "Dampfkraft Aufzug", + "tile.basesteam.platform.name": "Dampfkraft Aufzugplattform", + "death.attack.musket": "%1$s wurde angeschossen", + "death.attack.musket.player": "%1$s schuss %2$s tot", + "item.basesteam.blackpowder_cartridge.name": "Schießpulver Patrone", + "item.basesteam.musket.name": "Schießpulver Muskete", + "tooltip.musket.damage": "Shot befasst %x Schäden", + "tooltip.musket.ammo": "Erfordert %x zu laden", + "tooltip.musket.loaded": "Geladen", + "tooltip.musket.unloaded": "Nicht geladen", + "enchantment.powderless": "Unendlich Munition", + "enchantment.rapid_reload": "Schnell neu laden", + "enchantment.high_explosive": "Bombe", + "enchantment.recoil": "Rückstoß", + "tile.basesteam.steam_track.name": "Dampfkraftzug", + "tile.basesteam.steam_boiler_electric.name": "Elektro-Dampfkessel", + "tile.basesteam.steam_boiler_geothermal.name": "Geothermische Dampfkessel", + "tile.basesteam.steam_switch.name": "Dampfventil", + "tile.basesteam.steam_still.name": "Dampfkraft Brennerei", + "tile.basesteam.steam_pump.name": "Dampfkraft Pumpe", + "tile.basesteam.steam_boiler_oil.name": "Ölfeuerung Dampfkraft Kessel", + "tile.basesteam.pump_pipe_steam.name": "Pumpenrohr", + "item.basesteam.steam_governor": "Dampfkraft Steuerventil", + "block.basesteam.steam_pipe": "Dampfrohr", + "block.basesteam.steam_boiler_coal": "Dampfkraft Kessel", + "block.basesteam.steam_tank": "Dampftank", + "block.basesteam.steam_furnace": "Dampfkraft Ofen", + "block.basesteam.steam_crusher": "Dampfkraft Steinbrecher", + "block.basesteam.drillbit": "Bohrer", + "block.basesteam.steam_drill": "Dampfkraft Bohrmaschine", + "item.basesteam.steam_drill_bit": "Bohrer", + "block.basesteam.steam_elevator": "Dampfkraft Aufzug", + "block.basesteam.platform": "Dampfkraft Aufzugplattform", + "item.basesteam.blackpowder_cartridge": "Schießpulver Patrone", + "item.basesteam.musket": "Schießpulver Muskete", + "block.basesteam.steam_track": "Dampfkraftzug", + "block.basesteam.steam_boiler_electric": "Elektro-Dampfkessel", + "block.basesteam.steam_boiler_geothermal": "Geothermische Dampfkessel", + "block.basesteam.steam_switch": "Dampfventil", + "block.basesteam.steam_still": "Dampfkraft Brennerei", + "block.basesteam.steam_pump": "Dampfkraft Pumpe", + "block.basesteam.steam_boiler_oil": "Ölfeuerung Dampfkraft Kessel", + "block.basesteam.pump_pipe_steam": "Pumpenrohr" +} diff --git a/src/main/resources/assets/basesteam/lang/en_au.json b/src/main/resources/assets/basesteam/lang/en_au.json new file mode 100644 index 0000000..fd31c69 --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/en_au.json @@ -0,0 +1,57 @@ +{ + "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", + "item.basesteam.steam_governor.name": "Steam Governor", + "tile.basesteam.steam_pipe.name": "Brass Steam Pipe", + "tile.basesteam.steam_boiler_coal.name": "Coal-Fired Steam Boiler", + "tile.basesteam.steam_tank.name": "Steam Boiler Tank", + "tile.basesteam.steam_furnace.name": "Steam-Powered Furnace", + "tile.basesteam.steam_crusher.name": "Steam-Powered Rock Crusher", + "tile.basesteam.drillbit.name": "Drill", + "tile.basesteam.steam_drill.name": "Steam-Powered Drill", + "item.basesteam.steam_drill_bit.name": "Drill Bit", + "death.attack.steam_machine": "%1$s was ground between the gears of a machine", + "death.attack.steam_machine.player": "%1$s was fed into the gears of a machine by %2$s", + "tile.basesteam.steam_elevator.name": "Steam-Powered Elevator", + "tile.basesteam.platform.name": "Steam Elevator Platform", + "death.attack.musket": "%1$s got shot", + "death.attack.musket.player": "%2$s shot %1$s dead", + "item.basesteam.blackpowder_cartridge.name": "Black-Powder Cartridge", + "item.basesteam.musket.name": "Black-Powder Musket", + "tooltip.musket.damage": "Shot deals %x damage", + "tooltip.musket.ammo": "Requires %x to reload", + "tooltip.musket.loaded": "Loaded", + "tooltip.musket.unloaded": "Not loaded", + "enchantment.powderless": "Powderless", + "enchantment.rapid_reload": "Quick Reload", + "enchantment.high_explosive": "High-Explosive", + "enchantment.recoil": "Recoil", + "tile.basesteam.steam_track.name": "Steam Track", + "tile.basesteam.steam_boiler_electric.name": "Electric Steam Boiler", + "tile.basesteam.steam_boiler_geothermal.name": "Geothermal Steam Boiler", + "tile.basesteam.steam_switch.name": "Steam Switch Valve", + "tile.basesteam.steam_still.name": "Steam-Powered Still", + "tile.basesteam.steam_pump.name": "Steam-Powered Pump", + "tile.basesteam.steam_boiler_oil.name": "Oil-Burning Steam Boiler", + "tile.basesteam.pump_pipe_steam.name": "Pump Pipe", + "item.basesteam.steam_governor": "Steam Governor", + "block.basesteam.steam_pipe": "Brass Steam Pipe", + "block.basesteam.steam_boiler_coal": "Coal-Fired Steam Boiler", + "block.basesteam.steam_tank": "Steam Boiler Tank", + "block.basesteam.steam_furnace": "Steam-Powered Furnace", + "block.basesteam.steam_crusher": "Steam-Powered Rock Crusher", + "block.basesteam.drillbit": "Drill", + "block.basesteam.steam_drill": "Steam-Powered Drill", + "item.basesteam.steam_drill_bit": "Drill Bit", + "block.basesteam.steam_elevator": "Steam-Powered Elevator", + "block.basesteam.platform": "Steam Elevator Platform", + "item.basesteam.blackpowder_cartridge": "Black-Powder Cartridge", + "item.basesteam.musket": "Black-Powder Musket", + "block.basesteam.steam_track": "Steam Track", + "block.basesteam.steam_boiler_electric": "Electric Steam Boiler", + "block.basesteam.steam_boiler_geothermal": "Geothermal Steam Boiler", + "block.basesteam.steam_switch": "Steam Switch Valve", + "block.basesteam.steam_still": "Steam-Powered Still", + "block.basesteam.steam_pump": "Steam-Powered Pump", + "block.basesteam.steam_boiler_oil": "Oil-Burning Steam Boiler", + "block.basesteam.pump_pipe_steam": "Pump Pipe" +} diff --git a/src/main/resources/assets/basesteam/lang/en_ca.json b/src/main/resources/assets/basesteam/lang/en_ca.json new file mode 100644 index 0000000..cb50321 --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/en_ca.json @@ -0,0 +1,56 @@ +{ + "item.basesteam.steam_governor.name": "Steam Governor", + "tile.basesteam.steam_pipe.name": "Brass Steam Pipe", + "tile.basesteam.steam_boiler_coal.name": "Coal-Fired Steam Boiler", + "tile.basesteam.steam_tank.name": "Steam Boiler Tank", + "tile.basesteam.steam_furnace.name": "Steam-Powered Furnace", + "tile.basesteam.steam_crusher.name": "Steam-Powered Rock Crusher", + "tile.basesteam.drillbit.name": "Drill", + "tile.basesteam.steam_drill.name": "Steam-Powered Drill", + "item.basesteam.steam_drill_bit.name": "Drill Bit", + "death.attack.steam_machine": "%1$s was ground between the gears of a machine", + "death.attack.steam_machine.player": "%1$s was fed into the gears of a machine by %2$s", + "tile.basesteam.steam_elevator.name": "Steam-Powered Elevator", + "tile.basesteam.platform.name": "Steam Elevator Platform", + "death.attack.musket": "%1$s got shot", + "death.attack.musket.player": "%2$s shot %1$s dead", + "item.basesteam.blackpowder_cartridge.name": "Black-Powder Cartridge", + "item.basesteam.musket.name": "Black-Powder Musket", + "tooltip.musket.damage": "Shot deals %x damage", + "tooltip.musket.ammo": "Requires %x to reload", + "tooltip.musket.loaded": "Loaded", + "tooltip.musket.unloaded": "Not loaded", + "enchantment.powderless": "Powderless", + "enchantment.rapid_reload": "Quick Reload", + "enchantment.high_explosive": "High-Explosive", + "enchantment.recoil": "Recoil", + "tile.basesteam.steam_track.name": "Steam Track", + "tile.basesteam.steam_boiler_electric.name": "Electric Steam Boiler", + "tile.basesteam.steam_boiler_geothermal.name": "Geothermal Steam Boiler", + "tile.basesteam.steam_switch.name": "Steam Switch Valve", + "tile.basesteam.steam_still.name": "Steam-Powered Still", + "tile.basesteam.steam_pump.name": "Steam-Powered Pump", + "tile.basesteam.steam_boiler_oil.name": "Oil-Burning Steam Boiler", + "tile.basesteam.pump_pipe_steam.name": "Pump Pipe", + "item.basesteam.steam_governor": "Steam Governor", + "block.basesteam.steam_pipe": "Brass Steam Pipe", + "block.basesteam.steam_boiler_coal": "Coal-Fired Steam Boiler", + "block.basesteam.steam_tank": "Steam Boiler Tank", + "block.basesteam.steam_furnace": "Steam-Powered Furnace", + "block.basesteam.steam_crusher": "Steam-Powered Rock Crusher", + "block.basesteam.drillbit": "Drill", + "block.basesteam.steam_drill": "Steam-Powered Drill", + "item.basesteam.steam_drill_bit": "Drill Bit", + "block.basesteam.steam_elevator": "Steam-Powered Elevator", + "block.basesteam.platform": "Steam Elevator Platform", + "item.basesteam.blackpowder_cartridge": "Black-Powder Cartridge", + "item.basesteam.musket": "Black-Powder Musket", + "block.basesteam.steam_track": "Steam Track", + "block.basesteam.steam_boiler_electric": "Electric Steam Boiler", + "block.basesteam.steam_boiler_geothermal": "Geothermal Steam Boiler", + "block.basesteam.steam_switch": "Steam Switch Valve", + "block.basesteam.steam_still": "Steam-Powered Still", + "block.basesteam.steam_pump": "Steam-Powered Pump", + "block.basesteam.steam_boiler_oil": "Oil-Burning Steam Boiler", + "block.basesteam.pump_pipe_steam": "Pump Pipe" +} diff --git a/src/main/resources/assets/basesteam/lang/en_en.json b/src/main/resources/assets/basesteam/lang/en_en.json new file mode 100644 index 0000000..cb50321 --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/en_en.json @@ -0,0 +1,56 @@ +{ + "item.basesteam.steam_governor.name": "Steam Governor", + "tile.basesteam.steam_pipe.name": "Brass Steam Pipe", + "tile.basesteam.steam_boiler_coal.name": "Coal-Fired Steam Boiler", + "tile.basesteam.steam_tank.name": "Steam Boiler Tank", + "tile.basesteam.steam_furnace.name": "Steam-Powered Furnace", + "tile.basesteam.steam_crusher.name": "Steam-Powered Rock Crusher", + "tile.basesteam.drillbit.name": "Drill", + "tile.basesteam.steam_drill.name": "Steam-Powered Drill", + "item.basesteam.steam_drill_bit.name": "Drill Bit", + "death.attack.steam_machine": "%1$s was ground between the gears of a machine", + "death.attack.steam_machine.player": "%1$s was fed into the gears of a machine by %2$s", + "tile.basesteam.steam_elevator.name": "Steam-Powered Elevator", + "tile.basesteam.platform.name": "Steam Elevator Platform", + "death.attack.musket": "%1$s got shot", + "death.attack.musket.player": "%2$s shot %1$s dead", + "item.basesteam.blackpowder_cartridge.name": "Black-Powder Cartridge", + "item.basesteam.musket.name": "Black-Powder Musket", + "tooltip.musket.damage": "Shot deals %x damage", + "tooltip.musket.ammo": "Requires %x to reload", + "tooltip.musket.loaded": "Loaded", + "tooltip.musket.unloaded": "Not loaded", + "enchantment.powderless": "Powderless", + "enchantment.rapid_reload": "Quick Reload", + "enchantment.high_explosive": "High-Explosive", + "enchantment.recoil": "Recoil", + "tile.basesteam.steam_track.name": "Steam Track", + "tile.basesteam.steam_boiler_electric.name": "Electric Steam Boiler", + "tile.basesteam.steam_boiler_geothermal.name": "Geothermal Steam Boiler", + "tile.basesteam.steam_switch.name": "Steam Switch Valve", + "tile.basesteam.steam_still.name": "Steam-Powered Still", + "tile.basesteam.steam_pump.name": "Steam-Powered Pump", + "tile.basesteam.steam_boiler_oil.name": "Oil-Burning Steam Boiler", + "tile.basesteam.pump_pipe_steam.name": "Pump Pipe", + "item.basesteam.steam_governor": "Steam Governor", + "block.basesteam.steam_pipe": "Brass Steam Pipe", + "block.basesteam.steam_boiler_coal": "Coal-Fired Steam Boiler", + "block.basesteam.steam_tank": "Steam Boiler Tank", + "block.basesteam.steam_furnace": "Steam-Powered Furnace", + "block.basesteam.steam_crusher": "Steam-Powered Rock Crusher", + "block.basesteam.drillbit": "Drill", + "block.basesteam.steam_drill": "Steam-Powered Drill", + "item.basesteam.steam_drill_bit": "Drill Bit", + "block.basesteam.steam_elevator": "Steam-Powered Elevator", + "block.basesteam.platform": "Steam Elevator Platform", + "item.basesteam.blackpowder_cartridge": "Black-Powder Cartridge", + "item.basesteam.musket": "Black-Powder Musket", + "block.basesteam.steam_track": "Steam Track", + "block.basesteam.steam_boiler_electric": "Electric Steam Boiler", + "block.basesteam.steam_boiler_geothermal": "Geothermal Steam Boiler", + "block.basesteam.steam_switch": "Steam Switch Valve", + "block.basesteam.steam_still": "Steam-Powered Still", + "block.basesteam.steam_pump": "Steam-Powered Pump", + "block.basesteam.steam_boiler_oil": "Oil-Burning Steam Boiler", + "block.basesteam.pump_pipe_steam": "Pump Pipe" +} diff --git a/src/main/resources/assets/basesteam/lang/en_gb.json b/src/main/resources/assets/basesteam/lang/en_gb.json new file mode 100644 index 0000000..cb50321 --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/en_gb.json @@ -0,0 +1,56 @@ +{ + "item.basesteam.steam_governor.name": "Steam Governor", + "tile.basesteam.steam_pipe.name": "Brass Steam Pipe", + "tile.basesteam.steam_boiler_coal.name": "Coal-Fired Steam Boiler", + "tile.basesteam.steam_tank.name": "Steam Boiler Tank", + "tile.basesteam.steam_furnace.name": "Steam-Powered Furnace", + "tile.basesteam.steam_crusher.name": "Steam-Powered Rock Crusher", + "tile.basesteam.drillbit.name": "Drill", + "tile.basesteam.steam_drill.name": "Steam-Powered Drill", + "item.basesteam.steam_drill_bit.name": "Drill Bit", + "death.attack.steam_machine": "%1$s was ground between the gears of a machine", + "death.attack.steam_machine.player": "%1$s was fed into the gears of a machine by %2$s", + "tile.basesteam.steam_elevator.name": "Steam-Powered Elevator", + "tile.basesteam.platform.name": "Steam Elevator Platform", + "death.attack.musket": "%1$s got shot", + "death.attack.musket.player": "%2$s shot %1$s dead", + "item.basesteam.blackpowder_cartridge.name": "Black-Powder Cartridge", + "item.basesteam.musket.name": "Black-Powder Musket", + "tooltip.musket.damage": "Shot deals %x damage", + "tooltip.musket.ammo": "Requires %x to reload", + "tooltip.musket.loaded": "Loaded", + "tooltip.musket.unloaded": "Not loaded", + "enchantment.powderless": "Powderless", + "enchantment.rapid_reload": "Quick Reload", + "enchantment.high_explosive": "High-Explosive", + "enchantment.recoil": "Recoil", + "tile.basesteam.steam_track.name": "Steam Track", + "tile.basesteam.steam_boiler_electric.name": "Electric Steam Boiler", + "tile.basesteam.steam_boiler_geothermal.name": "Geothermal Steam Boiler", + "tile.basesteam.steam_switch.name": "Steam Switch Valve", + "tile.basesteam.steam_still.name": "Steam-Powered Still", + "tile.basesteam.steam_pump.name": "Steam-Powered Pump", + "tile.basesteam.steam_boiler_oil.name": "Oil-Burning Steam Boiler", + "tile.basesteam.pump_pipe_steam.name": "Pump Pipe", + "item.basesteam.steam_governor": "Steam Governor", + "block.basesteam.steam_pipe": "Brass Steam Pipe", + "block.basesteam.steam_boiler_coal": "Coal-Fired Steam Boiler", + "block.basesteam.steam_tank": "Steam Boiler Tank", + "block.basesteam.steam_furnace": "Steam-Powered Furnace", + "block.basesteam.steam_crusher": "Steam-Powered Rock Crusher", + "block.basesteam.drillbit": "Drill", + "block.basesteam.steam_drill": "Steam-Powered Drill", + "item.basesteam.steam_drill_bit": "Drill Bit", + "block.basesteam.steam_elevator": "Steam-Powered Elevator", + "block.basesteam.platform": "Steam Elevator Platform", + "item.basesteam.blackpowder_cartridge": "Black-Powder Cartridge", + "item.basesteam.musket": "Black-Powder Musket", + "block.basesteam.steam_track": "Steam Track", + "block.basesteam.steam_boiler_electric": "Electric Steam Boiler", + "block.basesteam.steam_boiler_geothermal": "Geothermal Steam Boiler", + "block.basesteam.steam_switch": "Steam Switch Valve", + "block.basesteam.steam_still": "Steam-Powered Still", + "block.basesteam.steam_pump": "Steam-Powered Pump", + "block.basesteam.steam_boiler_oil": "Oil-Burning Steam Boiler", + "block.basesteam.pump_pipe_steam": "Pump Pipe" +} diff --git a/src/main/resources/assets/basesteam/lang/en_pt.json b/src/main/resources/assets/basesteam/lang/en_pt.json new file mode 100644 index 0000000..dfef46f --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/en_pt.json @@ -0,0 +1,57 @@ +{ + "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", + "item.basesteam.steam_governor.name": "Steam Gov'ner", + "tile.basesteam.steam_pipe.name": "Brass Pipe", + "tile.basesteam.steam_boiler_coal.name": "Boiler", + "tile.basesteam.steam_tank.name": "Clockwerk Boiler Tank", + "tile.basesteam.steam_furnace.name": "Clockwerk Furnace", + "tile.basesteam.steam_crusher.name": "Clockwerk Stone-Chewer", + "tile.basesteam.drillbit.name": "Drill", + "tile.basesteam.steam_drill.name": "Clockwerk Drill", + "item.basesteam.steam_drill_bit.name": "Drill Bit", + "death.attack.steam_machine": "%1$s kissed the iron maiden", + "death.attack.steam_machine.player": "%1$s convinced %2$s to kiss the iron maiden", + "tile.basesteam.steam_elevator.name": "Clockwerk Plank-Raiser", + "tile.basesteam.platform.name": "Mecha-Plank", + "death.attack.musket": "%1$s got shot", + "death.attack.musket.player": "%2$s filled %1$s full of daylight", + "item.basesteam.blackpowder_cartridge.name": "Death Ball", + "item.basesteam.musket.name": "Blunderbuss", + "tooltip.musket.damage": "Shot deals %x damage", + "tooltip.musket.ammo": "Requires %x to reload", + "tooltip.musket.loaded": "Loaded", + "tooltip.musket.unloaded": "Not loaded", + "enchantment.powderless": "Unending Glory", + "enchantment.rapid_reload": "Faster Blaster", + "enchantment.high_explosive": "Big Boom", + "enchantment.recoil": "Kickback", + "tile.basesteam.steam_track.name": "Steam Path", + "tile.basesteam.steam_boiler_electric.name": "Lightnin' Boiler", + "tile.basesteam.steam_boiler_geothermal.name": "Lava Boiler", + "tile.basesteam.steam_switch.name": "Steam Valve", + "tile.basesteam.steam_still.name": "Clockwerk 'Stillery", + "tile.basesteam.steam_pump.name": "Clockwerk Bilge Pump", + "tile.basesteam.steam_boiler_oil.name": "Oil Boiler", + "tile.basesteam.pump_pipe_steam.name": "Pump Pipe", + "item.basesteam.steam_governor": "Steam Gov'ner", + "block.basesteam.steam_pipe": "Brass Pipe", + "block.basesteam.steam_boiler_coal": "Boiler", + "block.basesteam.steam_tank": "Clockwerk Boiler Tank", + "block.basesteam.steam_furnace": "Clockwerk Furnace", + "block.basesteam.steam_crusher": "Clockwerk Stone-Chewer", + "block.basesteam.drillbit": "Drill", + "block.basesteam.steam_drill": "Clockwerk Drill", + "item.basesteam.steam_drill_bit": "Drill Bit", + "block.basesteam.steam_elevator": "Clockwerk Plank-Raiser", + "block.basesteam.platform": "Mecha-Plank", + "item.basesteam.blackpowder_cartridge": "Death Ball", + "item.basesteam.musket": "Blunderbuss", + "block.basesteam.steam_track": "Steam Path", + "block.basesteam.steam_boiler_electric": "Lightnin' Boiler", + "block.basesteam.steam_boiler_geothermal": "Lava Boiler", + "block.basesteam.steam_switch": "Steam Valve", + "block.basesteam.steam_still": "Clockwerk 'Stillery", + "block.basesteam.steam_pump": "Clockwerk Bilge Pump", + "block.basesteam.steam_boiler_oil": "Oil Boiler", + "block.basesteam.pump_pipe_steam": "Pump Pipe" +} diff --git a/src/main/resources/assets/basesteam/lang/en_us.json b/src/main/resources/assets/basesteam/lang/en_us.json new file mode 100644 index 0000000..fd31c69 --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/en_us.json @@ -0,0 +1,57 @@ +{ + "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", + "item.basesteam.steam_governor.name": "Steam Governor", + "tile.basesteam.steam_pipe.name": "Brass Steam Pipe", + "tile.basesteam.steam_boiler_coal.name": "Coal-Fired Steam Boiler", + "tile.basesteam.steam_tank.name": "Steam Boiler Tank", + "tile.basesteam.steam_furnace.name": "Steam-Powered Furnace", + "tile.basesteam.steam_crusher.name": "Steam-Powered Rock Crusher", + "tile.basesteam.drillbit.name": "Drill", + "tile.basesteam.steam_drill.name": "Steam-Powered Drill", + "item.basesteam.steam_drill_bit.name": "Drill Bit", + "death.attack.steam_machine": "%1$s was ground between the gears of a machine", + "death.attack.steam_machine.player": "%1$s was fed into the gears of a machine by %2$s", + "tile.basesteam.steam_elevator.name": "Steam-Powered Elevator", + "tile.basesteam.platform.name": "Steam Elevator Platform", + "death.attack.musket": "%1$s got shot", + "death.attack.musket.player": "%2$s shot %1$s dead", + "item.basesteam.blackpowder_cartridge.name": "Black-Powder Cartridge", + "item.basesteam.musket.name": "Black-Powder Musket", + "tooltip.musket.damage": "Shot deals %x damage", + "tooltip.musket.ammo": "Requires %x to reload", + "tooltip.musket.loaded": "Loaded", + "tooltip.musket.unloaded": "Not loaded", + "enchantment.powderless": "Powderless", + "enchantment.rapid_reload": "Quick Reload", + "enchantment.high_explosive": "High-Explosive", + "enchantment.recoil": "Recoil", + "tile.basesteam.steam_track.name": "Steam Track", + "tile.basesteam.steam_boiler_electric.name": "Electric Steam Boiler", + "tile.basesteam.steam_boiler_geothermal.name": "Geothermal Steam Boiler", + "tile.basesteam.steam_switch.name": "Steam Switch Valve", + "tile.basesteam.steam_still.name": "Steam-Powered Still", + "tile.basesteam.steam_pump.name": "Steam-Powered Pump", + "tile.basesteam.steam_boiler_oil.name": "Oil-Burning Steam Boiler", + "tile.basesteam.pump_pipe_steam.name": "Pump Pipe", + "item.basesteam.steam_governor": "Steam Governor", + "block.basesteam.steam_pipe": "Brass Steam Pipe", + "block.basesteam.steam_boiler_coal": "Coal-Fired Steam Boiler", + "block.basesteam.steam_tank": "Steam Boiler Tank", + "block.basesteam.steam_furnace": "Steam-Powered Furnace", + "block.basesteam.steam_crusher": "Steam-Powered Rock Crusher", + "block.basesteam.drillbit": "Drill", + "block.basesteam.steam_drill": "Steam-Powered Drill", + "item.basesteam.steam_drill_bit": "Drill Bit", + "block.basesteam.steam_elevator": "Steam-Powered Elevator", + "block.basesteam.platform": "Steam Elevator Platform", + "item.basesteam.blackpowder_cartridge": "Black-Powder Cartridge", + "item.basesteam.musket": "Black-Powder Musket", + "block.basesteam.steam_track": "Steam Track", + "block.basesteam.steam_boiler_electric": "Electric Steam Boiler", + "block.basesteam.steam_boiler_geothermal": "Geothermal Steam Boiler", + "block.basesteam.steam_switch": "Steam Switch Valve", + "block.basesteam.steam_still": "Steam-Powered Still", + "block.basesteam.steam_pump": "Steam-Powered Pump", + "block.basesteam.steam_boiler_oil": "Oil-Burning Steam Boiler", + "block.basesteam.pump_pipe_steam": "Pump Pipe" +} diff --git a/src/main/resources/assets/basesteam/lang/es_es.json b/src/main/resources/assets/basesteam/lang/es_es.json new file mode 100644 index 0000000..55913cc --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/es_es.json @@ -0,0 +1,57 @@ +{ + "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", + "item.basesteam.steam_governor.name": "Controlar de Vapor", + "tile.basesteam.steam_pipe.name": "Latón Tubo de Vapor", + "tile.basesteam.steam_boiler_coal.name": "Caldera de Vapor con Carbón", + "tile.basesteam.steam_tank.name": "Tanque de Vapor", + "tile.basesteam.steam_furnace.name": "Vapor del Horno Accionado", + "tile.basesteam.steam_crusher.name": "Vapor Trituradora de Piedra Accionado", + "tile.basesteam.drillbit.name": "Broca", + "tile.basesteam.steam_drill.name": "Vapor Taladro Accionado", + "item.basesteam.steam_drill_bit.name": "Broca", + "death.attack.steam_machine": "%1$s se molió entre los engranajes de una máquina", + "death.attack.steam_machine.player": "%1$s se molió entre los engranajes de una máquina de %2$s", + "tile.basesteam.steam_elevator.name": "Ascensor a Vapor", + "tile.basesteam.platform.name": "Vapor Plataforma Ascensor", + "death.attack.musket": "%1$s recibió un disparo", + "death.attack.musket.player": "%2$s tiro %1$s muertos", + "item.basesteam.blackpowder_cartridge.name": "Cartucho de Pólvora", + "item.basesteam.musket.name": "Mosquete", + "tooltip.musket.damage": "Disparo trata %x daños", + "tooltip.musket.ammo": "Requiere %x para recargar", + "tooltip.musket.loaded": "Cargado", + "tooltip.musket.unloaded": "No cargado", + "enchantment.powderless": "Munición Infinita", + "enchantment.rapid_reload": "Rápidamente Actualizar", + "enchantment.high_explosive": "Bomba", + "enchantment.recoil": "Retroceso", + "tile.basesteam.steam_track.name": "Vía a Vapor", + "tile.basesteam.steam_boiler_electric.name": "Caldera de Vapor Eléctrica", + "tile.basesteam.steam_boiler_geothermal.name": "Caldera de Vapor Geotérmico", + "tile.basesteam.steam_switch.name": "Válvula de Vapor", + "tile.basesteam.steam_still.name": "Vapor Destilería", + "tile.basesteam.steam_pump.name": "Vapor de la Bomba Accionada", + "tile.basesteam.steam_boiler_oil.name": "Caldera de Vapor con Aceite", + "tile.basesteam.pump_pipe_steam.name": "Tubería de la Bomba", + "item.basesteam.steam_governor": "Controlar de Vapor", + "block.basesteam.steam_pipe": "Latón Tubo de Vapor", + "block.basesteam.steam_boiler_coal": "Caldera de Vapor con Carbón", + "block.basesteam.steam_tank": "Tanque de Vapor", + "block.basesteam.steam_furnace": "Vapor del Horno Accionado", + "block.basesteam.steam_crusher": "Vapor Trituradora de Piedra Accionado", + "block.basesteam.drillbit": "Broca", + "block.basesteam.steam_drill": "Vapor Taladro Accionado", + "item.basesteam.steam_drill_bit": "Broca", + "block.basesteam.steam_elevator": "Ascensor a Vapor", + "block.basesteam.platform": "Vapor Plataforma Ascensor", + "item.basesteam.blackpowder_cartridge": "Cartucho de Pólvora", + "item.basesteam.musket": "Mosquete", + "block.basesteam.steam_track": "Vía a Vapor", + "block.basesteam.steam_boiler_electric": "Caldera de Vapor Eléctrica", + "block.basesteam.steam_boiler_geothermal": "Caldera de Vapor Geotérmico", + "block.basesteam.steam_switch": "Válvula de Vapor", + "block.basesteam.steam_still": "Vapor Destilería", + "block.basesteam.steam_pump": "Vapor de la Bomba Accionada", + "block.basesteam.steam_boiler_oil": "Caldera de Vapor con Aceite", + "block.basesteam.pump_pipe_steam": "Tubería de la Bomba" +} diff --git a/src/main/resources/assets/basesteam/lang/es_mx.json b/src/main/resources/assets/basesteam/lang/es_mx.json new file mode 100644 index 0000000..55913cc --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/es_mx.json @@ -0,0 +1,57 @@ +{ + "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", + "item.basesteam.steam_governor.name": "Controlar de Vapor", + "tile.basesteam.steam_pipe.name": "Latón Tubo de Vapor", + "tile.basesteam.steam_boiler_coal.name": "Caldera de Vapor con Carbón", + "tile.basesteam.steam_tank.name": "Tanque de Vapor", + "tile.basesteam.steam_furnace.name": "Vapor del Horno Accionado", + "tile.basesteam.steam_crusher.name": "Vapor Trituradora de Piedra Accionado", + "tile.basesteam.drillbit.name": "Broca", + "tile.basesteam.steam_drill.name": "Vapor Taladro Accionado", + "item.basesteam.steam_drill_bit.name": "Broca", + "death.attack.steam_machine": "%1$s se molió entre los engranajes de una máquina", + "death.attack.steam_machine.player": "%1$s se molió entre los engranajes de una máquina de %2$s", + "tile.basesteam.steam_elevator.name": "Ascensor a Vapor", + "tile.basesteam.platform.name": "Vapor Plataforma Ascensor", + "death.attack.musket": "%1$s recibió un disparo", + "death.attack.musket.player": "%2$s tiro %1$s muertos", + "item.basesteam.blackpowder_cartridge.name": "Cartucho de Pólvora", + "item.basesteam.musket.name": "Mosquete", + "tooltip.musket.damage": "Disparo trata %x daños", + "tooltip.musket.ammo": "Requiere %x para recargar", + "tooltip.musket.loaded": "Cargado", + "tooltip.musket.unloaded": "No cargado", + "enchantment.powderless": "Munición Infinita", + "enchantment.rapid_reload": "Rápidamente Actualizar", + "enchantment.high_explosive": "Bomba", + "enchantment.recoil": "Retroceso", + "tile.basesteam.steam_track.name": "Vía a Vapor", + "tile.basesteam.steam_boiler_electric.name": "Caldera de Vapor Eléctrica", + "tile.basesteam.steam_boiler_geothermal.name": "Caldera de Vapor Geotérmico", + "tile.basesteam.steam_switch.name": "Válvula de Vapor", + "tile.basesteam.steam_still.name": "Vapor Destilería", + "tile.basesteam.steam_pump.name": "Vapor de la Bomba Accionada", + "tile.basesteam.steam_boiler_oil.name": "Caldera de Vapor con Aceite", + "tile.basesteam.pump_pipe_steam.name": "Tubería de la Bomba", + "item.basesteam.steam_governor": "Controlar de Vapor", + "block.basesteam.steam_pipe": "Latón Tubo de Vapor", + "block.basesteam.steam_boiler_coal": "Caldera de Vapor con Carbón", + "block.basesteam.steam_tank": "Tanque de Vapor", + "block.basesteam.steam_furnace": "Vapor del Horno Accionado", + "block.basesteam.steam_crusher": "Vapor Trituradora de Piedra Accionado", + "block.basesteam.drillbit": "Broca", + "block.basesteam.steam_drill": "Vapor Taladro Accionado", + "item.basesteam.steam_drill_bit": "Broca", + "block.basesteam.steam_elevator": "Ascensor a Vapor", + "block.basesteam.platform": "Vapor Plataforma Ascensor", + "item.basesteam.blackpowder_cartridge": "Cartucho de Pólvora", + "item.basesteam.musket": "Mosquete", + "block.basesteam.steam_track": "Vía a Vapor", + "block.basesteam.steam_boiler_electric": "Caldera de Vapor Eléctrica", + "block.basesteam.steam_boiler_geothermal": "Caldera de Vapor Geotérmico", + "block.basesteam.steam_switch": "Válvula de Vapor", + "block.basesteam.steam_still": "Vapor Destilería", + "block.basesteam.steam_pump": "Vapor de la Bomba Accionada", + "block.basesteam.steam_boiler_oil": "Caldera de Vapor con Aceite", + "block.basesteam.pump_pipe_steam": "Tubería de la Bomba" +} diff --git a/src/main/resources/assets/basesteam/lang/fr_ca.json b/src/main/resources/assets/basesteam/lang/fr_ca.json new file mode 100644 index 0000000..3d043db --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/fr_ca.json @@ -0,0 +1,57 @@ +{ + "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), french (fr_FR,fr_CA), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", + "item.basesteam.steam_governor.name": "Régulateur de vapeur", + "tile.basesteam.steam_pipe.name": "Tuyau de vapeur en laiton", + "tile.basesteam.steam_boiler_coal.name": "Chaudière à vapeur bois-charbon", + "tile.basesteam.steam_tank.name": "Réservoir de chaudière à vapeur", + "tile.basesteam.steam_furnace.name": "Four alimenté à la vapeur", + "tile.basesteam.steam_crusher.name": "Broyeur de roches alimenté à la vapeur", + "tile.basesteam.drillbit.name": "Foret", + "tile.basesteam.steam_drill.name": "Foret alimenté à la vapeur", + "item.basesteam.steam_drill_bit.name": "Morceau de foret", + "death.attack.steam_machine": "%1$s a été écrasé dans les engrenages d'une machine", + "death.attack.steam_machine.player": "%1$s a été poussé dans les engrenages d'une machine par %2$s", + "tile.basesteam.steam_elevator.name": "Ascenseur alimenté à la vapeur", + "tile.basesteam.platform.name": "Plate-forme ascenceur à vapeur", + "death.attack.musket": "%1$s got shot", + "death.attack.musket.player": "%2$s shot %1$s dead", + "item.basesteam.blackpowder_cartridge.name": "Cartouche de poudre noire", + "item.basesteam.musket.name": "Mousquet à poudre noire", + "tooltip.musket.damage": "Le tir provoque %x dégats", + "tooltip.musket.ammo": "Demande %x pour recharger", + "tooltip.musket.loaded": "Chargé", + "tooltip.musket.unloaded": "Non chargé", + "enchantment.powderless": "Sans poudre", + "enchantment.rapid_reload": "Rechargement rapide", + "enchantment.high_explosive": "High-Explosif", + "enchantment.recoil": "Recul", + "tile.basesteam.steam_track.name": "Trace de vapeur", + "tile.basesteam.steam_boiler_electric.name": "Chaudière à Vapeur Électrique", + "tile.basesteam.steam_boiler_geothermal.name": "Chaudière à Vapeur Géothermique", + "tile.basesteam.steam_switch.name": "Soupape de vapeur", + "tile.basesteam.steam_still.name": "Vapeur distillerie alimenté", + "tile.basesteam.steam_pump.name": "Vapeur pompe alimentée", + "tile.basesteam.steam_boiler_oil.name": "Chaudière à l'huile", + "tile.basesteam.pump_pipe_steam.name": "Tubería de la Bomba", + "item.basesteam.steam_governor": "Régulateur de vapeur", + "block.basesteam.steam_pipe": "Tuyau de vapeur en laiton", + "block.basesteam.steam_boiler_coal": "Chaudière à vapeur bois-charbon", + "block.basesteam.steam_tank": "Réservoir de chaudière à vapeur", + "block.basesteam.steam_furnace": "Four alimenté à la vapeur", + "block.basesteam.steam_crusher": "Broyeur de roches alimenté à la vapeur", + "block.basesteam.drillbit": "Foret", + "block.basesteam.steam_drill": "Foret alimenté à la vapeur", + "item.basesteam.steam_drill_bit": "Morceau de foret", + "block.basesteam.steam_elevator": "Ascenseur alimenté à la vapeur", + "block.basesteam.platform": "Plate-forme ascenceur à vapeur", + "item.basesteam.blackpowder_cartridge": "Cartouche de poudre noire", + "item.basesteam.musket": "Mousquet à poudre noire", + "block.basesteam.steam_track": "Trace de vapeur", + "block.basesteam.steam_boiler_electric": "Chaudière à Vapeur Électrique", + "block.basesteam.steam_boiler_geothermal": "Chaudière à Vapeur Géothermique", + "block.basesteam.steam_switch": "Soupape de vapeur", + "block.basesteam.steam_still": "Vapeur distillerie alimenté", + "block.basesteam.steam_pump": "Vapeur pompe alimentée", + "block.basesteam.steam_boiler_oil": "Chaudière à l'huile", + "block.basesteam.pump_pipe_steam": "Tubería de la Bomba" +} diff --git a/src/main/resources/assets/basesteam/lang/fr_fr.json b/src/main/resources/assets/basesteam/lang/fr_fr.json new file mode 100644 index 0000000..3d043db --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/fr_fr.json @@ -0,0 +1,57 @@ +{ + "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), french (fr_FR,fr_CA), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", + "item.basesteam.steam_governor.name": "Régulateur de vapeur", + "tile.basesteam.steam_pipe.name": "Tuyau de vapeur en laiton", + "tile.basesteam.steam_boiler_coal.name": "Chaudière à vapeur bois-charbon", + "tile.basesteam.steam_tank.name": "Réservoir de chaudière à vapeur", + "tile.basesteam.steam_furnace.name": "Four alimenté à la vapeur", + "tile.basesteam.steam_crusher.name": "Broyeur de roches alimenté à la vapeur", + "tile.basesteam.drillbit.name": "Foret", + "tile.basesteam.steam_drill.name": "Foret alimenté à la vapeur", + "item.basesteam.steam_drill_bit.name": "Morceau de foret", + "death.attack.steam_machine": "%1$s a été écrasé dans les engrenages d'une machine", + "death.attack.steam_machine.player": "%1$s a été poussé dans les engrenages d'une machine par %2$s", + "tile.basesteam.steam_elevator.name": "Ascenseur alimenté à la vapeur", + "tile.basesteam.platform.name": "Plate-forme ascenceur à vapeur", + "death.attack.musket": "%1$s got shot", + "death.attack.musket.player": "%2$s shot %1$s dead", + "item.basesteam.blackpowder_cartridge.name": "Cartouche de poudre noire", + "item.basesteam.musket.name": "Mousquet à poudre noire", + "tooltip.musket.damage": "Le tir provoque %x dégats", + "tooltip.musket.ammo": "Demande %x pour recharger", + "tooltip.musket.loaded": "Chargé", + "tooltip.musket.unloaded": "Non chargé", + "enchantment.powderless": "Sans poudre", + "enchantment.rapid_reload": "Rechargement rapide", + "enchantment.high_explosive": "High-Explosif", + "enchantment.recoil": "Recul", + "tile.basesteam.steam_track.name": "Trace de vapeur", + "tile.basesteam.steam_boiler_electric.name": "Chaudière à Vapeur Électrique", + "tile.basesteam.steam_boiler_geothermal.name": "Chaudière à Vapeur Géothermique", + "tile.basesteam.steam_switch.name": "Soupape de vapeur", + "tile.basesteam.steam_still.name": "Vapeur distillerie alimenté", + "tile.basesteam.steam_pump.name": "Vapeur pompe alimentée", + "tile.basesteam.steam_boiler_oil.name": "Chaudière à l'huile", + "tile.basesteam.pump_pipe_steam.name": "Tubería de la Bomba", + "item.basesteam.steam_governor": "Régulateur de vapeur", + "block.basesteam.steam_pipe": "Tuyau de vapeur en laiton", + "block.basesteam.steam_boiler_coal": "Chaudière à vapeur bois-charbon", + "block.basesteam.steam_tank": "Réservoir de chaudière à vapeur", + "block.basesteam.steam_furnace": "Four alimenté à la vapeur", + "block.basesteam.steam_crusher": "Broyeur de roches alimenté à la vapeur", + "block.basesteam.drillbit": "Foret", + "block.basesteam.steam_drill": "Foret alimenté à la vapeur", + "item.basesteam.steam_drill_bit": "Morceau de foret", + "block.basesteam.steam_elevator": "Ascenseur alimenté à la vapeur", + "block.basesteam.platform": "Plate-forme ascenceur à vapeur", + "item.basesteam.blackpowder_cartridge": "Cartouche de poudre noire", + "item.basesteam.musket": "Mousquet à poudre noire", + "block.basesteam.steam_track": "Trace de vapeur", + "block.basesteam.steam_boiler_electric": "Chaudière à Vapeur Électrique", + "block.basesteam.steam_boiler_geothermal": "Chaudière à Vapeur Géothermique", + "block.basesteam.steam_switch": "Soupape de vapeur", + "block.basesteam.steam_still": "Vapeur distillerie alimenté", + "block.basesteam.steam_pump": "Vapeur pompe alimentée", + "block.basesteam.steam_boiler_oil": "Chaudière à l'huile", + "block.basesteam.pump_pipe_steam": "Tubería de la Bomba" +} diff --git a/src/main/resources/assets/basesteam/lang/it_it.json b/src/main/resources/assets/basesteam/lang/it_it.json new file mode 100644 index 0000000..ddadd6a --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/it_it.json @@ -0,0 +1,56 @@ +{ + "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", + "item.basesteam.steam_governor.name": "Valvola di Controllo", + "tile.basesteam.steam_pipe.name": "Ottone Tubo di Vapore", + "tile.basesteam.steam_boiler_coal.name": "Caldaia di Vapore", + "tile.basesteam.steam_tank.name": "Carro a Vapore", + "tile.basesteam.steam_furnace.name": "Forno a Vapore Alimentata", + "tile.basesteam.steam_crusher.name": "Polverizzatore Masso a Vapore Alimentata", + "tile.basesteam.drillbit.name": "Trapano", + "tile.basesteam.steam_drill.name": "Trapano a Vapore", + "item.basesteam.steam_drill_bit.name": "Trapano", + "death.attack.steam_machine": "%1$s è stato macinato tra gli ingranaggi di una macchina", + "death.attack.steam_machine.player": "%1$s è stato macinato tra gli ingranaggi di una macchina di %2$s", + "tile.basesteam.steam_elevator.name": "Ascensore a Vapore", + "tile.basesteam.platform.name": "Ascensore a Vapore Piattaforma", + "death.attack.musket": "%1$s hanno sparato", + "death.attack.musket.player": "%2$s colpo %1$s morti", + "item.basesteam.blackpowder_cartridge.name": "Cartuccia Polvere da Sparo", + "item.basesteam.musket.name": "Moschetto", + "tooltip.musket.damage": "Girato occupa %x danni", + "tooltip.musket.ammo": "Richiede %x per ricaricare", + "tooltip.musket.loaded": "Caricato", + "tooltip.musket.unloaded": "Non caricato", + "enchantment.powderless": "Munizioni Infinite", + "enchantment.rapid_reload": "Rapidamente Reload", + "enchantment.high_explosive": "Bomba", + "enchantment.recoil": "Rinculo", + "tile.basesteam.steam_track.name": "Pista a Vapore", + "tile.basesteam.steam_boiler_electric.name": "Caldaia a Vapore Elettrica", + "tile.basesteam.steam_boiler_geothermal.name": "Caldaia a Vapore Geotermico", + "tile.basesteam.steam_switch.name": "Valvola del Vapore", + "tile.basesteam.steam_still.name": "A Vapore Alimentata Distilleria", + "tile.basesteam.steam_pump.name": "Pompa Alimentata a Vapore", + "tile.basesteam.steam_boiler_oil.name": "Caldaia ad Olio Combustibile", + "tile.baseelectric.pump_pipe_steam.name": "Tubo Pompa", + "item.basesteam.steam_governor": "Valvola di Controllo", + "block.basesteam.steam_pipe": "Ottone Tubo di Vapore", + "block.basesteam.steam_boiler_coal": "Caldaia di Vapore", + "block.basesteam.steam_tank": "Carro a Vapore", + "block.basesteam.steam_furnace": "Forno a Vapore Alimentata", + "block.basesteam.steam_crusher": "Polverizzatore Masso a Vapore Alimentata", + "block.basesteam.drillbit": "Trapano", + "block.basesteam.steam_drill": "Trapano a Vapore", + "item.basesteam.steam_drill_bit": "Trapano", + "block.basesteam.steam_elevator": "Ascensore a Vapore", + "block.basesteam.platform": "Ascensore a Vapore Piattaforma", + "item.basesteam.blackpowder_cartridge": "Cartuccia Polvere da Sparo", + "item.basesteam.musket": "Moschetto", + "block.basesteam.steam_track": "Pista a Vapore", + "block.basesteam.steam_boiler_electric": "Caldaia a Vapore Elettrica", + "block.basesteam.steam_boiler_geothermal": "Caldaia a Vapore Geotermico", + "block.basesteam.steam_switch": "Valvola del Vapore", + "block.basesteam.steam_still": "A Vapore Alimentata Distilleria", + "block.basesteam.steam_pump": "Pompa Alimentata a Vapore", + "block.basesteam.steam_boiler_oil": "Caldaia ad Olio Combustibile" +} diff --git a/src/main/resources/assets/basesteam/lang/ja_jp.json b/src/main/resources/assets/basesteam/lang/ja_jp.json new file mode 100644 index 0000000..ef3d8c1 --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/ja_jp.json @@ -0,0 +1,57 @@ +{ + "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", + "item.basesteam.steam_governor.name": "コントロールバルブスチーム", + "tile.basesteam.steam_pipe.name": "真鍮蒸気管", + "tile.basesteam.steam_boiler_coal.name": "蒸気ボイラ", + "tile.basesteam.steam_tank.name": "スチームタンク", + "tile.basesteam.steam_furnace.name": "蒸気動力炉", + "tile.basesteam.steam_crusher.name": "スチームパワードロッククラッシャー", + "tile.basesteam.drillbit.name": "ドリルビット", + "tile.basesteam.steam_drill.name": "蒸気ドリル", + "item.basesteam.steam_drill_bit.name": "ドリルビット", + "death.attack.steam_machine": "%1$s 機械の歯車の間に粉砕しました", + "death.attack.steam_machine.player": "%1$s %2$s による機械の歯車の間に粉砕し、", + "tile.basesteam.steam_elevator.name": "スチームパワードエレベーター", + "tile.basesteam.platform.name": "エレベータープラットフォームスチーム", + "death.attack.musket": "%1$sは撃たれました", + "death.attack.musket.player": "%2$sのショット%1$sの死", + "item.basesteam.blackpowder_cartridge.name": "火薬カートリッジ", + "item.basesteam.musket.name": "マスケット銃", + "tooltip.musket.damage": "ショットは、%x点のダメージを与えます", + "tooltip.musket.ammo": "リロードするには、%xを必要とし", + "tooltip.musket.loaded": "ロードされました", + "tooltip.musket.unloaded": "ロードされていません", + "enchantment.powderless": "無限の弾薬", + "enchantment.rapid_reload": "素早くリロード", + "enchantment.high_explosive": "爆弾", + "enchantment.recoil": "リコイル", + "tile.basesteam.steam_track.name": "蒸気トレース", + "tile.basesteam.steam_boiler_electric.name": "電気蒸気ボイラ", + "tile.basesteam.steam_boiler_geothermal.name": "地熱蒸気ボイラー", + "tile.basesteam.steam_switch.name": "蒸気弁", + "tile.basesteam.steam_still.name": "蒸気駆動の蒸留所", + "tile.basesteam.steam_pump.name": "蒸気駆動のポンプ", + "tile.basesteam.steam_boiler_oil.name": "石油燃焼ボイラー", + "tile.basesteam.pump_pipe_steam.name": "ポンプ配管", + "item.basesteam.steam_governor": "コントロールバルブスチーム", + "block.basesteam.steam_pipe": "真鍮蒸気管", + "block.basesteam.steam_boiler_coal": "蒸気ボイラ", + "block.basesteam.steam_tank": "スチームタンク", + "block.basesteam.steam_furnace": "蒸気動力炉", + "block.basesteam.steam_crusher": "スチームパワードロッククラッシャー", + "block.basesteam.drillbit": "ドリルビット", + "block.basesteam.steam_drill": "蒸気ドリル", + "item.basesteam.steam_drill_bit": "ドリルビット", + "block.basesteam.steam_elevator": "スチームパワードエレベーター", + "block.basesteam.platform": "エレベータープラットフォームスチーム", + "item.basesteam.blackpowder_cartridge": "火薬カートリッジ", + "item.basesteam.musket": "マスケット銃", + "block.basesteam.steam_track": "蒸気トレース", + "block.basesteam.steam_boiler_electric": "電気蒸気ボイラ", + "block.basesteam.steam_boiler_geothermal": "地熱蒸気ボイラー", + "block.basesteam.steam_switch": "蒸気弁", + "block.basesteam.steam_still": "蒸気駆動の蒸留所", + "block.basesteam.steam_pump": "蒸気駆動のポンプ", + "block.basesteam.steam_boiler_oil": "石油燃焼ボイラー", + "block.basesteam.pump_pipe_steam": "ポンプ配管" +} diff --git a/src/main/resources/assets/basesteam/lang/ko_kr.json b/src/main/resources/assets/basesteam/lang/ko_kr.json new file mode 100644 index 0000000..dfaec56 --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/ko_kr.json @@ -0,0 +1,57 @@ +{ + "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", + "item.basesteam.steam_governor.name": "제어 밸브 증기", + "tile.basesteam.steam_pipe.name": "황동 증기 파이프", + "tile.basesteam.steam_boiler_coal.name": "증기 보일러", + "tile.basesteam.steam_tank.name": "스팀 탱크", + "tile.basesteam.steam_furnace.name": "증기 구동 전기로", + "tile.basesteam.steam_crusher.name": "증기 구동 록 크러셔", + "tile.basesteam.drillbit.name": "드릴 비트", + "tile.basesteam.steam_drill.name": "증기 구동 드릴", + "item.basesteam.steam_drill_bit.name": "드릴 비트", + "death.attack.steam_machine": "%1$s 기계의 기어 사이 분쇄", + "death.attack.steam_machine.player": "%1$s %2$s 에 의해 기계의 기어 사이에 분쇄", + "tile.basesteam.steam_elevator.name": "증기 구동 엘리베이터", + "tile.basesteam.platform.name": "엘리베이터 플랫폼 스팀", + "death.attack.musket": "%1$s는 총에 맞았", + "death.attack.musket.player": "%2$s 샷% %1$s죽은", + "item.basesteam.blackpowder_cartridge.name": "화약 카트리지", + "item.basesteam.musket.name": "구식 보병 총", + "tooltip.musket.damage": "총 의 %x의 피해를", + "tooltip.musket.ammo": "다시로드 %x를 필요", + "tooltip.musket.loaded": "로드", + "tooltip.musket.unloaded": "로드되지", + "enchantment.powderless": "무한 탄약", + "enchantment.rapid_reload": "신속하게 다시로드", + "enchantment.high_explosive": "폭탄", + "enchantment.recoil": "뒷걸음질", + "tile.basesteam.steam_track.name": "증기 선로", + "tile.basesteam.steam_boiler_electric.name": "전기 스팀 보일러", + "tile.basesteam.steam_boiler_geothermal.name": "지열 증기 보일러", + "tile.basesteam.steam_switch.name": "스팀 밸브", + "tile.basesteam.steam_still.name": "증기 구동 증류소", + "tile.basesteam.steam_pump.name": "증기 구동 펌프", + "tile.basesteam.steam_boiler_oil.name": "기름 연소 보일러", + "tile.basesteam.pump_pipe_steam.name": "펌프 파이프", + "item.basesteam.steam_governor": "제어 밸브 증기", + "block.basesteam.steam_pipe": "황동 증기 파이프", + "block.basesteam.steam_boiler_coal": "증기 보일러", + "block.basesteam.steam_tank": "스팀 탱크", + "block.basesteam.steam_furnace": "증기 구동 전기로", + "block.basesteam.steam_crusher": "증기 구동 록 크러셔", + "block.basesteam.drillbit": "드릴 비트", + "block.basesteam.steam_drill": "증기 구동 드릴", + "item.basesteam.steam_drill_bit": "드릴 비트", + "block.basesteam.steam_elevator": "증기 구동 엘리베이터", + "block.basesteam.platform": "엘리베이터 플랫폼 스팀", + "item.basesteam.blackpowder_cartridge": "화약 카트리지", + "item.basesteam.musket": "구식 보병 총", + "block.basesteam.steam_track": "증기 선로", + "block.basesteam.steam_boiler_electric": "전기 스팀 보일러", + "block.basesteam.steam_boiler_geothermal": "지열 증기 보일러", + "block.basesteam.steam_switch": "스팀 밸브", + "block.basesteam.steam_still": "증기 구동 증류소", + "block.basesteam.steam_pump": "증기 구동 펌프", + "block.basesteam.steam_boiler_oil": "기름 연소 보일러", + "block.basesteam.pump_pipe_steam": "펌프 파이프" +} diff --git a/src/main/resources/assets/basesteam/lang/pt_br.json b/src/main/resources/assets/basesteam/lang/pt_br.json new file mode 100644 index 0000000..384f48b --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/pt_br.json @@ -0,0 +1,57 @@ +{ + "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", + "item.basesteam.steam_governor.name": "Válvula de Controle de Vapor", + "tile.basesteam.steam_pipe.name": "Latão Tubo de Vapor", + "tile.basesteam.steam_boiler_coal.name": "Caldeira a Vapor", + "tile.basesteam.steam_tank.name": "Tanque Vapor", + "tile.basesteam.steam_furnace.name": "Psto Vapor Forno", + "tile.basesteam.steam_crusher.name": "Psto Vapor Rocha Afiador", + "tile.basesteam.drillbit.name": "Broca", + "tile.basesteam.steam_drill.name": "Psto Vapor Broca", + "item.basesteam.steam_drill_bit.name": "Broca", + "death.attack.steam_machine": "%1$s was ground between the gears of a machine", + "death.attack.steam_machine.player": "%1$s was fed into the gears of a machine by %2$s", + "tile.basesteam.steam_elevator.name": "Vapor Elevador Alimentado", + "tile.basesteam.platform.name": "Vapor Elevador Plataforma", + "death.attack.musket": "%1$s foi baleado", + "death.attack.musket.player": "%2$s tiro %1$s mortos", + "item.basesteam.blackpowder_cartridge.name": "Pólvora Cartridge", + "item.basesteam.musket.name": "Mosquete", + "tooltip.musket.damage": "Plano lida %x danos", + "tooltip.musket.ammo": "Requer %x para recarregar", + "tooltip.musket.loaded": "Carregado", + "tooltip.musket.unloaded": "Não loaded", + "enchantment.powderless": "Infinito Munições", + "enchantment.rapid_reload": "Rapidamente Reload", + "enchantment.high_explosive": "Bomba", + "enchantment.recoil": "Recuo", + "tile.basesteam.steam_track.name": "Pista de Vapor", + "tile.basesteam.steam_boiler_electric.name": "Caldeira de Vapor Elétrica", + "tile.basesteam.steam_boiler_geothermal.name": "Caldeira a Vapor de Lava", + "tile.basesteam.steam_switch.name": "Válvula de Vapor", + "tile.basesteam.steam_still.name": "Destilaria vapor Alimentado", + "tile.basesteam.steam_pump.name": "Pomba de Vapor Alimentado", + "tile.basesteam.steam_boiler_oil.name": "Óleo de Caldeira Ardente", + "tile.basesteam.pump_pipe_steam.name": "Tubo de Bomba", + "item.basesteam.steam_governor": "Válvula de Controle de Vapor", + "block.basesteam.steam_pipe": "Latão Tubo de Vapor", + "block.basesteam.steam_boiler_coal": "Caldeira a Vapor", + "block.basesteam.steam_tank": "Tanque Vapor", + "block.basesteam.steam_furnace": "Psto Vapor Forno", + "block.basesteam.steam_crusher": "Psto Vapor Rocha Afiador", + "block.basesteam.drillbit": "Broca", + "block.basesteam.steam_drill": "Psto Vapor Broca", + "item.basesteam.steam_drill_bit": "Broca", + "block.basesteam.steam_elevator": "Vapor Elevador Alimentado", + "block.basesteam.platform": "Vapor Elevador Plataforma", + "item.basesteam.blackpowder_cartridge": "Pólvora Cartridge", + "item.basesteam.musket": "Mosquete", + "block.basesteam.steam_track": "Pista de Vapor", + "block.basesteam.steam_boiler_electric": "Caldeira de Vapor Elétrica", + "block.basesteam.steam_boiler_geothermal": "Caldeira a Vapor de Lava", + "block.basesteam.steam_switch": "Válvula de Vapor", + "block.basesteam.steam_still": "Destilaria vapor Alimentado", + "block.basesteam.steam_pump": "Pomba de Vapor Alimentado", + "block.basesteam.steam_boiler_oil": "Óleo de Caldeira Ardente", + "block.basesteam.pump_pipe_steam": "Tubo de Bomba" +} diff --git a/src/main/resources/assets/basesteam/lang/zh_cn.json b/src/main/resources/assets/basesteam/lang/zh_cn.json new file mode 100644 index 0000000..ddbedb5 --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/zh_cn.json @@ -0,0 +1,57 @@ +{ + "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", + "item.basesteam.steam_governor.name": "蒸汽調節閥", + "tile.basesteam.steam_pipe.name": "黃銅蒸汽管", + "tile.basesteam.steam_boiler_coal.name": "蒸汽鍋爐", + "tile.basesteam.steam_tank.name": "蒸汽坦克", + "tile.basesteam.steam_furnace.name": "蒸汽動力爐", + "tile.basesteam.steam_crusher.name": "蒸汽動力岩石破碎機", + "tile.basesteam.drillbit.name": "鑽頭", + "tile.basesteam.steam_drill.name": "蒸汽動鑽", + "item.basesteam.steam_drill_bit.name": "鑽頭", + "death.attack.steam_machine": "%1$s是一台機器的齒輪之間的地面", + "death.attack.steam_machine.player": "%1$s是一機多用%2$s齒輪之間的地面", + "tile.basesteam.steam_elevator.name": "蒸汽動力電梯", + "tile.basesteam.platform.name": "蒸汽電梯平台", + "death.attack.musket": "%1$s被射殺", + "death.attack.musket.player": "%2$s射門%1$s死了", + "item.basesteam.blackpowder_cartridge.name": "火藥盒", + "item.basesteam.musket.name": "滑膛槍", + "tooltip.musket.damage": "射擊涉及%x點傷害", + "tooltip.musket.ammo": "需要%x重裝", + "tooltip.musket.loaded": "加載", + "tooltip.musket.unloaded": "未加載", + "enchantment.powderless": "無限彈藥", + "enchantment.rapid_reload": "快速刷新", + "enchantment.high_explosive": "炸彈", + "enchantment.recoil": "後坐力", + "tile.basesteam.steam_track.name": "蒸汽路径", + "tile.basesteam.steam_boiler_electric.name": "電熱蒸汽鍋爐", + "tile.basesteam.steam_boiler_geothermal.name": "地熱蒸汽鍋爐", + "tile.basesteam.steam_switch.name": "蒸汽閥", + "tile.basesteam.steam_still.name": "蒸汽動力酒廠", + "tile.basesteam.steam_pump.name": "蒸汽動力泵", + "tile.basesteam.steam_boiler_oil.name": "燃油鍋爐", + "tile.basesteam.pump_pipe_steam.name": "泵管", + "item.basesteam.steam_governor": "蒸汽調節閥", + "block.basesteam.steam_pipe": "黃銅蒸汽管", + "block.basesteam.steam_boiler_coal": "蒸汽鍋爐", + "block.basesteam.steam_tank": "蒸汽坦克", + "block.basesteam.steam_furnace": "蒸汽動力爐", + "block.basesteam.steam_crusher": "蒸汽動力岩石破碎機", + "block.basesteam.drillbit": "鑽頭", + "block.basesteam.steam_drill": "蒸汽動鑽", + "item.basesteam.steam_drill_bit": "鑽頭", + "block.basesteam.steam_elevator": "蒸汽動力電梯", + "block.basesteam.platform": "蒸汽電梯平台", + "item.basesteam.blackpowder_cartridge": "火藥盒", + "item.basesteam.musket": "滑膛槍", + "block.basesteam.steam_track": "蒸汽路径", + "block.basesteam.steam_boiler_electric": "電熱蒸汽鍋爐", + "block.basesteam.steam_boiler_geothermal": "地熱蒸汽鍋爐", + "block.basesteam.steam_switch": "蒸汽閥", + "block.basesteam.steam_still": "蒸汽動力酒廠", + "block.basesteam.steam_pump": "蒸汽動力泵", + "block.basesteam.steam_boiler_oil": "燃油鍋爐", + "block.basesteam.pump_pipe_steam": "泵管" +} diff --git a/src/main/resources/assets/steamadvantage/models/block/drillbit.json b/src/main/resources/assets/basesteam/models/block/drillbit.json similarity index 82% rename from src/main/resources/assets/steamadvantage/models/block/drillbit.json rename to src/main/resources/assets/basesteam/models/block/drillbit.json index 436e452..0146395 100644 --- a/src/main/resources/assets/steamadvantage/models/block/drillbit.json +++ b/src/main/resources/assets/basesteam/models/block/drillbit.json @@ -1,8 +1,8 @@ { "parent": "block/block", "textures": { - "all": "poweradvantage:materials/steel", - "particle": "poweradvantage:materials/steel" + "all": "basepower:materials/steel", + "particle": "basepower:materials/steel" }, "elements": [ { "from": [ 7, 7, 7 ], diff --git a/src/main/resources/assets/steamadvantage/models/block/platform1.json b/src/main/resources/assets/basesteam/models/block/platform1.json similarity index 79% rename from src/main/resources/assets/steamadvantage/models/block/platform1.json rename to src/main/resources/assets/basesteam/models/block/platform1.json index 495365c..1acb7a7 100644 --- a/src/main/resources/assets/steamadvantage/models/block/platform1.json +++ b/src/main/resources/assets/basesteam/models/block/platform1.json @@ -1,9 +1,9 @@ { "parent": "block/block", "textures": { - "shaft": "poweradvantage:materials/steel", - "platform": "steamadvantage:blocks/platform_top", - "particle": "poweradvantage:materials/steel" + "shaft": "basepower:materials/steel", + "platform": "basesteam:blocks/platform_top", + "particle": "basepower:materials/steel" }, "elements": [ { "from": [ 0, 0, 0 ], diff --git a/src/main/resources/assets/steamadvantage/models/block/platform2.json b/src/main/resources/assets/basesteam/models/block/platform2.json similarity index 88% rename from src/main/resources/assets/steamadvantage/models/block/platform2.json rename to src/main/resources/assets/basesteam/models/block/platform2.json index a725ae5..3505d47 100644 --- a/src/main/resources/assets/steamadvantage/models/block/platform2.json +++ b/src/main/resources/assets/basesteam/models/block/platform2.json @@ -1,9 +1,9 @@ { "parent": "block/block", "textures": { - "shaft": "poweradvantage:materials/steel", - "platform": "steamadvantage:blocks/platform_top", - "particle": "poweradvantage:materials/steel" + "shaft": "basepower:materials/steel", + "platform": "basesteam:blocks/platform_top", + "particle": "basepower:materials/steel" }, "elements": [ { "from": [ 0, 4, 0 ], diff --git a/src/main/resources/assets/steamadvantage/models/block/platform3.json b/src/main/resources/assets/basesteam/models/block/platform3.json similarity index 88% rename from src/main/resources/assets/steamadvantage/models/block/platform3.json rename to src/main/resources/assets/basesteam/models/block/platform3.json index 10fde4c..205bc53 100644 --- a/src/main/resources/assets/steamadvantage/models/block/platform3.json +++ b/src/main/resources/assets/basesteam/models/block/platform3.json @@ -1,9 +1,9 @@ { "parent": "block/block", "textures": { - "shaft": "poweradvantage:materials/steel", - "platform": "steamadvantage:blocks/platform_top", - "particle": "poweradvantage:materials/steel" + "shaft": "basepower:materials/steel", + "platform": "basesteam:blocks/platform_top", + "particle": "basepower:materials/steel" }, "elements": [ { "from": [ 0, 8, 0 ], diff --git a/src/main/resources/assets/steamadvantage/models/block/platform4.json b/src/main/resources/assets/basesteam/models/block/platform4.json similarity index 88% rename from src/main/resources/assets/steamadvantage/models/block/platform4.json rename to src/main/resources/assets/basesteam/models/block/platform4.json index 4be9a3d..aa31f76 100644 --- a/src/main/resources/assets/steamadvantage/models/block/platform4.json +++ b/src/main/resources/assets/basesteam/models/block/platform4.json @@ -1,9 +1,9 @@ { "parent": "block/block", "textures": { - "shaft": "poweradvantage:materials/steel", - "platform": "steamadvantage:blocks/platform_top", - "particle": "poweradvantage:materials/steel" + "shaft": "basepower:materials/steel", + "platform": "basesteam:blocks/platform_top", + "particle": "basepower:materials/steel" }, "elements": [ { "from": [ 0, 12, 0 ], diff --git a/src/main/resources/assets/steamadvantage/models/block/platform_shaft.json b/src/main/resources/assets/basesteam/models/block/platform_shaft.json similarity index 79% rename from src/main/resources/assets/steamadvantage/models/block/platform_shaft.json rename to src/main/resources/assets/basesteam/models/block/platform_shaft.json index b38c2a9..4f6489e 100644 --- a/src/main/resources/assets/steamadvantage/models/block/platform_shaft.json +++ b/src/main/resources/assets/basesteam/models/block/platform_shaft.json @@ -1,9 +1,9 @@ { "parent": "block/block", "textures": { - "shaft": "poweradvantage:materials/steel", - "platform": "steamadvantage:blocks/platform_top", - "particle": "poweradvantage:materials/steel" + "shaft": "basepower:materials/steel", + "platform": "basesteam:blocks/platform_top", + "particle": "basepower:materials/steel" }, "elements": [ { "from": [ 4, 0, 4 ], diff --git a/src/main/resources/assets/basesteam/models/block/steam_boiler_coal.json b/src/main/resources/assets/basesteam/models/block/steam_boiler_coal.json new file mode 100644 index 0000000..5e8a389 --- /dev/null +++ b/src/main/resources/assets/basesteam/models/block/steam_boiler_coal.json @@ -0,0 +1,11 @@ +{ + "parent": "basesteam:block/steam_machine_base", + "textures": { + "front": "basesteam:blocks/coal_boiler_front", + "top": "basesteam:materials/bolted_iron", + "bottom": "basesteam:materials/bolted_iron", + "back": "basesteam:materials/bolted_iron", + "side": "basesteam:materials/bolted_iron", + "metal": "basesteam:materials/bolted_iron" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/basesteam/models/block/steam_boiler_electric.json b/src/main/resources/assets/basesteam/models/block/steam_boiler_electric.json new file mode 100644 index 0000000..0910f43 --- /dev/null +++ b/src/main/resources/assets/basesteam/models/block/steam_boiler_electric.json @@ -0,0 +1,11 @@ +{ + "parent": "basesteam:block/steam_machine_base", + "textures": { + "front": "basesteam:blocks/electric_boiler_front", + "top": "basesteam:materials/bolted_iron", + "bottom": "basesteam:materials/bolted_iron", + "back": "basesteam:blocks/electric_boiler_back", + "side": "basesteam:materials/bolted_iron", + "metal": "basesteam:materials/bolted_iron" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/basesteam/models/block/steam_boiler_geothermal.json b/src/main/resources/assets/basesteam/models/block/steam_boiler_geothermal.json new file mode 100644 index 0000000..b4d730c --- /dev/null +++ b/src/main/resources/assets/basesteam/models/block/steam_boiler_geothermal.json @@ -0,0 +1,11 @@ +{ + "parent": "basesteam:block/steam_machine_base", + "textures": { + "front": "basesteam:blocks/geothermal_boiler_side", + "top": "basesteam:blocks/geothermal_boiler_top", + "bottom": "basesteam:materials/bolted_iron", + "back": "basesteam:blocks/geothermal_boiler_side", + "side": "basesteam:blocks/geothermal_boiler_side", + "metal": "basesteam:materials/bolted_iron" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_boiler_oil.json b/src/main/resources/assets/basesteam/models/block/steam_boiler_oil.json similarity index 96% rename from src/main/resources/assets/steamadvantage/models/block/steam_boiler_oil.json rename to src/main/resources/assets/basesteam/models/block/steam_boiler_oil.json index 7cd98fd..7d4c77b 100644 --- a/src/main/resources/assets/steamadvantage/models/block/steam_boiler_oil.json +++ b/src/main/resources/assets/basesteam/models/block/steam_boiler_oil.json @@ -1,9 +1,9 @@ { "parent": "block/block", "textures": { - "side": "steamadvantage:materials/iron", - "end": "steamadvantage:blocks/oil_tank_end", - "particle": "steamadvantage:materials/bolted_iron" + "side": "basesteam:materials/iron", + "end": "basesteam:blocks/oil_tank_end", + "particle": "basesteam:materials/bolted_iron" }, "elements": [ { diff --git a/src/main/resources/assets/basesteam/models/block/steam_crusher.json b/src/main/resources/assets/basesteam/models/block/steam_crusher.json new file mode 100644 index 0000000..6157aed --- /dev/null +++ b/src/main/resources/assets/basesteam/models/block/steam_crusher.json @@ -0,0 +1,11 @@ +{ + "parent": "basesteam:block/steam_machine_base", + "textures": { + "front": "basesteam:blocks/rock_crusher_front", + "top": "basesteam:blocks/rock_crusher_top", + "bottom": "basesteam:materials/bolted_iron", + "back": "basesteam:materials/iron", + "side": "basesteam:materials/iron", + "metal": "basesteam:materials/iron" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_drill.json b/src/main/resources/assets/basesteam/models/block/steam_drill.json similarity index 93% rename from src/main/resources/assets/steamadvantage/models/block/steam_drill.json rename to src/main/resources/assets/basesteam/models/block/steam_drill.json index 9a5e035..d8b8c2e 100644 --- a/src/main/resources/assets/steamadvantage/models/block/steam_drill.json +++ b/src/main/resources/assets/basesteam/models/block/steam_drill.json @@ -1,12 +1,12 @@ { "parent": "block/block", "textures": { - "support": "poweradvantage:materials/steel", - "side": "steamadvantage:materials/bolted_iron", - "top": "steamadvantage:blocks/steam_drill_top", - "bottom": "steamadvantage:blocks/steam_drill_bottom", - "foot": "poweradvantage:materials/steel_dark", - "particle": "steamadvantage:materials/iron" + "support": "basepower:materials/steel", + "side": "basesteam:materials/bolted_iron", + "top": "basesteam:blocks/steam_drill_top", + "bottom": "basesteam:blocks/steam_drill_bottom", + "foot": "basepower:materials/steel_dark", + "particle": "basesteam:materials/iron" }, "elements": [ { diff --git a/src/main/resources/assets/basesteam/models/block/steam_elevator.json b/src/main/resources/assets/basesteam/models/block/steam_elevator.json new file mode 100644 index 0000000..7f61734 --- /dev/null +++ b/src/main/resources/assets/basesteam/models/block/steam_elevator.json @@ -0,0 +1,11 @@ +{ + "parent": "basesteam:block/steam_machine_base", + "textures": { + "front": "basesteam:blocks/steam_elevator_side", + "top": "basesteam:blocks/platform_top", + "bottom": "basesteam:materials/bolted_iron", + "back": "basesteam:blocks/steam_elevator_side", + "side": "basesteam:blocks/steam_elevator_side", + "metal": "basesteam:materials/iron" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/basesteam/models/block/steam_furnace.json b/src/main/resources/assets/basesteam/models/block/steam_furnace.json new file mode 100644 index 0000000..43a6c30 --- /dev/null +++ b/src/main/resources/assets/basesteam/models/block/steam_furnace.json @@ -0,0 +1,11 @@ +{ + "parent": "basesteam:block/steam_machine_base", + "textures": { + "front": "basesteam:blocks/steam_furnace_front", + "top": "basesteam:blocks/steam_furnace_top", + "bottom": "basesteam:materials/bolted_iron", + "back": "basesteam:materials/iron", + "side": "basesteam:materials/iron", + "metal": "basesteam:materials/iron" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_machine_base.json b/src/main/resources/assets/basesteam/models/block/steam_machine_base.json similarity index 100% rename from src/main/resources/assets/steamadvantage/models/block/steam_machine_base.json rename to src/main/resources/assets/basesteam/models/block/steam_machine_base.json diff --git a/src/main/resources/assets/basesteam/models/block/steam_pipe_0.json b/src/main/resources/assets/basesteam/models/block/steam_pipe_0.json new file mode 100644 index 0000000..644738a --- /dev/null +++ b/src/main/resources/assets/basesteam/models/block/steam_pipe_0.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_0", + "textures": { + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass" + } +} diff --git a/src/main/resources/assets/basesteam/models/block/steam_pipe_densuw.json b/src/main/resources/assets/basesteam/models/block/steam_pipe_densuw.json new file mode 100644 index 0000000..711e09e --- /dev/null +++ b/src/main/resources/assets/basesteam/models/block/steam_pipe_densuw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_densuw", + "textures": { + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass" + } +} diff --git a/src/main/resources/assets/basesteam/models/block/steam_pipe_desuw.json b/src/main/resources/assets/basesteam/models/block/steam_pipe_desuw.json new file mode 100644 index 0000000..0a556bb --- /dev/null +++ b/src/main/resources/assets/basesteam/models/block/steam_pipe_desuw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_desuw", + "textures": { + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass" + } +} diff --git a/src/main/resources/assets/basesteam/models/block/steam_pipe_dnu.json b/src/main/resources/assets/basesteam/models/block/steam_pipe_dnu.json new file mode 100644 index 0000000..508840a --- /dev/null +++ b/src/main/resources/assets/basesteam/models/block/steam_pipe_dnu.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_dnu", + "textures": { + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass" + } +} diff --git a/src/main/resources/assets/basesteam/models/block/steam_pipe_ensw.json b/src/main/resources/assets/basesteam/models/block/steam_pipe_ensw.json new file mode 100644 index 0000000..688103a --- /dev/null +++ b/src/main/resources/assets/basesteam/models/block/steam_pipe_ensw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_ensw", + "textures": { + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass" + } +} diff --git a/src/main/resources/assets/basesteam/models/block/steam_pipe_n.json b/src/main/resources/assets/basesteam/models/block/steam_pipe_n.json new file mode 100644 index 0000000..08113de --- /dev/null +++ b/src/main/resources/assets/basesteam/models/block/steam_pipe_n.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_n", + "textures": { + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass" + } +} diff --git a/src/main/resources/assets/basesteam/models/block/steam_pipe_ns.json b/src/main/resources/assets/basesteam/models/block/steam_pipe_ns.json new file mode 100644 index 0000000..655e81d --- /dev/null +++ b/src/main/resources/assets/basesteam/models/block/steam_pipe_ns.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_ns", + "textures": { + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass" + } +} diff --git a/src/main/resources/assets/basesteam/models/block/steam_pipe_nsuw.json b/src/main/resources/assets/basesteam/models/block/steam_pipe_nsuw.json new file mode 100644 index 0000000..37e306e --- /dev/null +++ b/src/main/resources/assets/basesteam/models/block/steam_pipe_nsuw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_nsuw", + "textures": { + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass" + } +} diff --git a/src/main/resources/assets/basesteam/models/block/steam_pipe_nsw.json b/src/main/resources/assets/basesteam/models/block/steam_pipe_nsw.json new file mode 100644 index 0000000..5716ac7 --- /dev/null +++ b/src/main/resources/assets/basesteam/models/block/steam_pipe_nsw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_nsw", + "textures": { + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass" + } +} diff --git a/src/main/resources/assets/basesteam/models/block/steam_pipe_nuw.json b/src/main/resources/assets/basesteam/models/block/steam_pipe_nuw.json new file mode 100644 index 0000000..77d81ad --- /dev/null +++ b/src/main/resources/assets/basesteam/models/block/steam_pipe_nuw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_nuw", + "textures": { + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass" + } +} diff --git a/src/main/resources/assets/basesteam/models/block/steam_pipe_nw.json b/src/main/resources/assets/basesteam/models/block/steam_pipe_nw.json new file mode 100644 index 0000000..d3d5e91 --- /dev/null +++ b/src/main/resources/assets/basesteam/models/block/steam_pipe_nw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_nw", + "textures": { + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass" + } +} diff --git a/src/main/resources/assets/basesteam/models/block/steam_pump.json b/src/main/resources/assets/basesteam/models/block/steam_pump.json new file mode 100644 index 0000000..769837b --- /dev/null +++ b/src/main/resources/assets/basesteam/models/block/steam_pump.json @@ -0,0 +1,11 @@ +{ + "parent": "basesteam:block/steam_machine_base", + "textures": { + "front": "basesteam:blocks/steam_pump_front", + "top": "basesteam:materials/bolted_iron", + "bottom": "basesteam:materials/bolted_iron", + "back": "basesteam:blocks/steam_pump_side", + "side": "basesteam:blocks/steam_pump_side", + "metal": "basesteam:materials/bolted_iron" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_still.json b/src/main/resources/assets/basesteam/models/block/steam_still.json similarity index 96% rename from src/main/resources/assets/steamadvantage/models/block/steam_still.json rename to src/main/resources/assets/basesteam/models/block/steam_still.json index 66d79f9..4b77bf1 100644 --- a/src/main/resources/assets/steamadvantage/models/block/steam_still.json +++ b/src/main/resources/assets/basesteam/models/block/steam_still.json @@ -1,9 +1,9 @@ { "parent": "block/block", "textures": { - "tank": "steamadvantage:materials/bolted_copper", - "base": "steamadvantage:materials/bolted_iron", - "particle": "steamadvantage:materials/bolted_iron" + "tank": "basesteam:materials/bolted_copper", + "base": "basesteam:materials/bolted_iron", + "particle": "basesteam:materials/bolted_iron" }, "elements": [ { diff --git a/src/main/resources/assets/basesteam/models/block/steam_switch_off.json b/src/main/resources/assets/basesteam/models/block/steam_switch_off.json new file mode 100644 index 0000000..2b072b0 --- /dev/null +++ b/src/main/resources/assets/basesteam/models/block/steam_switch_off.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "basesteam:blocks/steam_switch_off", + "particle": "basesteam:materials/bolted_iron" + } +} diff --git a/src/main/resources/assets/basesteam/models/block/steam_switch_on.json b/src/main/resources/assets/basesteam/models/block/steam_switch_on.json new file mode 100644 index 0000000..f5181f0 --- /dev/null +++ b/src/main/resources/assets/basesteam/models/block/steam_switch_on.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "basesteam:blocks/steam_switch_on", + "particle": "basesteam:materials/bolted_iron" + } +} diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_tank.json b/src/main/resources/assets/basesteam/models/block/steam_tank.json similarity index 94% rename from src/main/resources/assets/steamadvantage/models/block/steam_tank.json rename to src/main/resources/assets/basesteam/models/block/steam_tank.json index b0f8acc..f69ce7b 100644 --- a/src/main/resources/assets/steamadvantage/models/block/steam_tank.json +++ b/src/main/resources/assets/basesteam/models/block/steam_tank.json @@ -1,10 +1,10 @@ { "parent": "block/block", "textures": { - "top": "steamadvantage:materials/bolted_copper", - "bottom": "steamadvantage:materials/bolted_copper", - "side": "steamadvantage:materials/bolted_copper", - "particle": "steamadvantage:materials/bolted_copper" + "top": "basesteam:materials/bolted_copper", + "bottom": "basesteam:materials/bolted_copper", + "side": "basesteam:materials/bolted_copper", + "particle": "basesteam:materials/bolted_copper" }, "elements": [ { diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_track_0.json b/src/main/resources/assets/basesteam/models/block/steam_track_0.json similarity index 90% rename from src/main/resources/assets/steamadvantage/models/block/steam_track_0.json rename to src/main/resources/assets/basesteam/models/block/steam_track_0.json index 7707620..0750c36 100644 --- a/src/main/resources/assets/steamadvantage/models/block/steam_track_0.json +++ b/src/main/resources/assets/basesteam/models/block/steam_track_0.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass", - "face": "poweradvantage:blocks/steel_frame" + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_track_densuw.json b/src/main/resources/assets/basesteam/models/block/steam_track_densuw.json similarity index 95% rename from src/main/resources/assets/steamadvantage/models/block/steam_track_densuw.json rename to src/main/resources/assets/basesteam/models/block/steam_track_densuw.json index 2447eb0..7430fd1 100644 --- a/src/main/resources/assets/steamadvantage/models/block/steam_track_densuw.json +++ b/src/main/resources/assets/basesteam/models/block/steam_track_densuw.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass", - "face": "poweradvantage:blocks/steel_frame" + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "__comment": "down", diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_track_desuw.json b/src/main/resources/assets/basesteam/models/block/steam_track_desuw.json similarity index 95% rename from src/main/resources/assets/steamadvantage/models/block/steam_track_desuw.json rename to src/main/resources/assets/basesteam/models/block/steam_track_desuw.json index 5cd2bfd..04263e2 100644 --- a/src/main/resources/assets/steamadvantage/models/block/steam_track_desuw.json +++ b/src/main/resources/assets/basesteam/models/block/steam_track_desuw.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass", - "face": "poweradvantage:blocks/steel_frame" + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_track_dnu.json b/src/main/resources/assets/basesteam/models/block/steam_track_dnu.json similarity index 94% rename from src/main/resources/assets/steamadvantage/models/block/steam_track_dnu.json rename to src/main/resources/assets/basesteam/models/block/steam_track_dnu.json index bfa5a5d..81635ae 100644 --- a/src/main/resources/assets/steamadvantage/models/block/steam_track_dnu.json +++ b/src/main/resources/assets/basesteam/models/block/steam_track_dnu.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass", - "face": "poweradvantage:blocks/steel_frame" + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_track_ensw.json b/src/main/resources/assets/basesteam/models/block/steam_track_ensw.json similarity index 94% rename from src/main/resources/assets/steamadvantage/models/block/steam_track_ensw.json rename to src/main/resources/assets/basesteam/models/block/steam_track_ensw.json index 42d4358..9195ff2 100644 --- a/src/main/resources/assets/steamadvantage/models/block/steam_track_ensw.json +++ b/src/main/resources/assets/basesteam/models/block/steam_track_ensw.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass", - "face": "poweradvantage:blocks/steel_frame" + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_track_n.json b/src/main/resources/assets/basesteam/models/block/steam_track_n.json similarity index 93% rename from src/main/resources/assets/steamadvantage/models/block/steam_track_n.json rename to src/main/resources/assets/basesteam/models/block/steam_track_n.json index b65f00d..7bcdce2 100644 --- a/src/main/resources/assets/steamadvantage/models/block/steam_track_n.json +++ b/src/main/resources/assets/basesteam/models/block/steam_track_n.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass", - "face": "poweradvantage:blocks/steel_frame" + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "__comment": "north-south", diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_track_ns.json b/src/main/resources/assets/basesteam/models/block/steam_track_ns.json similarity index 94% rename from src/main/resources/assets/steamadvantage/models/block/steam_track_ns.json rename to src/main/resources/assets/basesteam/models/block/steam_track_ns.json index 9bd1b74..81e41f2 100644 --- a/src/main/resources/assets/steamadvantage/models/block/steam_track_ns.json +++ b/src/main/resources/assets/basesteam/models/block/steam_track_ns.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass", - "face": "poweradvantage:blocks/steel_frame" + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "__comment": "north-south", diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_track_nsuw.json b/src/main/resources/assets/basesteam/models/block/steam_track_nsuw.json similarity index 95% rename from src/main/resources/assets/steamadvantage/models/block/steam_track_nsuw.json rename to src/main/resources/assets/basesteam/models/block/steam_track_nsuw.json index f1375c6..ff91233 100644 --- a/src/main/resources/assets/steamadvantage/models/block/steam_track_nsuw.json +++ b/src/main/resources/assets/basesteam/models/block/steam_track_nsuw.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass", - "face": "poweradvantage:blocks/steel_frame" + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_track_nsw.json b/src/main/resources/assets/basesteam/models/block/steam_track_nsw.json similarity index 94% rename from src/main/resources/assets/steamadvantage/models/block/steam_track_nsw.json rename to src/main/resources/assets/basesteam/models/block/steam_track_nsw.json index 82a4f0e..775a307 100644 --- a/src/main/resources/assets/steamadvantage/models/block/steam_track_nsw.json +++ b/src/main/resources/assets/basesteam/models/block/steam_track_nsw.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass", - "face": "poweradvantage:blocks/steel_frame" + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_track_nuw.json b/src/main/resources/assets/basesteam/models/block/steam_track_nuw.json similarity index 94% rename from src/main/resources/assets/steamadvantage/models/block/steam_track_nuw.json rename to src/main/resources/assets/basesteam/models/block/steam_track_nuw.json index 8b35e3a..c37df03 100644 --- a/src/main/resources/assets/steamadvantage/models/block/steam_track_nuw.json +++ b/src/main/resources/assets/basesteam/models/block/steam_track_nuw.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass", - "face": "poweradvantage:blocks/steel_frame" + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_track_nw.json b/src/main/resources/assets/basesteam/models/block/steam_track_nw.json similarity index 93% rename from src/main/resources/assets/steamadvantage/models/block/steam_track_nw.json rename to src/main/resources/assets/basesteam/models/block/steam_track_nw.json index 2e9221f..e9f0d90 100644 --- a/src/main/resources/assets/steamadvantage/models/block/steam_track_nw.json +++ b/src/main/resources/assets/basesteam/models/block/steam_track_nw.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass", - "face": "poweradvantage:blocks/steel_frame" + "texture": "basesteam:blocks/steam_pipe", + "particle": "basepower:materials/brass", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/basesteam/models/item/blackpowder_cartridge.json b/src/main/resources/assets/basesteam/models/item/blackpowder_cartridge.json new file mode 100644 index 0000000..5dc7979 --- /dev/null +++ b/src/main/resources/assets/basesteam/models/item/blackpowder_cartridge.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "basesteam:items/blackpowder_cartridge" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/item/drillbit.json b/src/main/resources/assets/basesteam/models/item/drillbit.json similarity index 88% rename from src/main/resources/assets/steamadvantage/models/item/drillbit.json rename to src/main/resources/assets/basesteam/models/item/drillbit.json index 6f73058..3a95734 100644 --- a/src/main/resources/assets/steamadvantage/models/item/drillbit.json +++ b/src/main/resources/assets/basesteam/models/item/drillbit.json @@ -1,7 +1,7 @@ { "textures": { - "drill": "steamadvantage:entity/drill_bit", - "particle": "poweradvantage:materials/steel" + "drill": "basesteam:entity/drill_bit", + "particle": "basepower:materials/steel" }, "elements": [ diff --git a/src/main/resources/assets/steamadvantage/models/item/musket.json b/src/main/resources/assets/basesteam/models/item/musket.json similarity index 64% rename from src/main/resources/assets/steamadvantage/models/item/musket.json rename to src/main/resources/assets/basesteam/models/item/musket.json index e7970e6..ca93dee 100644 --- a/src/main/resources/assets/steamadvantage/models/item/musket.json +++ b/src/main/resources/assets/basesteam/models/item/musket.json @@ -6,20 +6,20 @@ "loaded": 0, "loading": 0 }, - "model": "steamadvantage:item/musket_unloaded" + "model": "basesteam:item/musket_unloaded" }, { "predicate": { "loaded": 0, "loading": 1 }, - "model": "steamadvantage:item/musket_loading" + "model": "basesteam:item/musket_loading" }, { "predicate": { "loaded": 1 }, - "model": "steamadvantage:item/musket_loaded" + "model": "basesteam:item/musket_loaded" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/item/musket_loaded.json b/src/main/resources/assets/basesteam/models/item/musket_loaded.json similarity index 91% rename from src/main/resources/assets/steamadvantage/models/item/musket_loaded.json rename to src/main/resources/assets/basesteam/models/item/musket_loaded.json index 51d11c3..c19f6fc 100644 --- a/src/main/resources/assets/steamadvantage/models/item/musket_loaded.json +++ b/src/main/resources/assets/basesteam/models/item/musket_loaded.json @@ -1,9 +1,9 @@ { "textures": { - "stock": "poweradvantage:materials/wood", - "barrel": "poweradvantage:materials/steel_dark", - "tip": "steamadvantage:materials/steel_dark_hole", - "particle": "poweradvantage:materials/steel_dark" + "stock": "basepower:materials/wood", + "barrel": "basepower:materials/steel_dark", + "tip": "basesteam:materials/steel_dark_hole", + "particle": "basepower:materials/steel_dark" }, "elements": [ { diff --git a/src/main/resources/assets/steamadvantage/models/item/musket_loading.json b/src/main/resources/assets/basesteam/models/item/musket_loading.json similarity index 91% rename from src/main/resources/assets/steamadvantage/models/item/musket_loading.json rename to src/main/resources/assets/basesteam/models/item/musket_loading.json index ab81f79..798e273 100644 --- a/src/main/resources/assets/steamadvantage/models/item/musket_loading.json +++ b/src/main/resources/assets/basesteam/models/item/musket_loading.json @@ -1,9 +1,9 @@ { "textures": { - "stock": "poweradvantage:materials/wood", - "barrel": "poweradvantage:materials/steel_dark", - "tip": "steamadvantage:materials/steel_dark_hole", - "particle": "poweradvantage:materials/steel_dark" + "stock": "basepower:materials/wood", + "barrel": "basepower:materials/steel_dark", + "tip": "basesteam:materials/steel_dark_hole", + "particle": "basepower:materials/steel_dark" }, "elements": [ { diff --git a/src/main/resources/assets/steamadvantage/models/item/musket_unloaded.json b/src/main/resources/assets/basesteam/models/item/musket_unloaded.json similarity index 91% rename from src/main/resources/assets/steamadvantage/models/item/musket_unloaded.json rename to src/main/resources/assets/basesteam/models/item/musket_unloaded.json index 21fd9e6..eb9c1f9 100644 --- a/src/main/resources/assets/steamadvantage/models/item/musket_unloaded.json +++ b/src/main/resources/assets/basesteam/models/item/musket_unloaded.json @@ -1,9 +1,9 @@ { "textures": { - "stock": "poweradvantage:materials/wood", - "barrel": "poweradvantage:materials/steel_dark", - "tip": "steamadvantage:materials/steel_dark_hole", - "particle": "poweradvantage:materials/steel_dark" + "stock": "basepower:materials/wood", + "barrel": "basepower:materials/steel_dark", + "tip": "basesteam:materials/steel_dark_hole", + "particle": "basepower:materials/steel_dark" }, "elements": [ { diff --git a/src/main/resources/assets/basesteam/models/item/platform.json b/src/main/resources/assets/basesteam/models/item/platform.json new file mode 100644 index 0000000..9be581b --- /dev/null +++ b/src/main/resources/assets/basesteam/models/item/platform.json @@ -0,0 +1,4 @@ +{ + "parent": "basesteam:block/platform3", + "ambientocclusion": false +} \ No newline at end of file diff --git a/src/main/resources/assets/basesteam/models/item/pump_pipe_steam.json b/src/main/resources/assets/basesteam/models/item/pump_pipe_steam.json new file mode 100644 index 0000000..2cfca62 --- /dev/null +++ b/src/main/resources/assets/basesteam/models/item/pump_pipe_steam.json @@ -0,0 +1,4 @@ +{ + "parent": "basepower:block/fluid_pipe_ns", + "ambientocclusion": false +} \ No newline at end of file diff --git a/src/main/resources/assets/basesteam/models/item/steam_boiler_coal.json b/src/main/resources/assets/basesteam/models/item/steam_boiler_coal.json new file mode 100644 index 0000000..45187b0 --- /dev/null +++ b/src/main/resources/assets/basesteam/models/item/steam_boiler_coal.json @@ -0,0 +1,4 @@ +{ + "parent": "basesteam:block/steam_boiler_coal", + "ambientocclusion": false +} \ No newline at end of file diff --git a/src/main/resources/assets/basesteam/models/item/steam_boiler_electric.json b/src/main/resources/assets/basesteam/models/item/steam_boiler_electric.json new file mode 100644 index 0000000..d9811da --- /dev/null +++ b/src/main/resources/assets/basesteam/models/item/steam_boiler_electric.json @@ -0,0 +1,4 @@ +{ + "parent": "basesteam:block/steam_boiler_electric", + "ambientocclusion": false +} \ No newline at end of file diff --git a/src/main/resources/assets/basesteam/models/item/steam_boiler_geothermal.json b/src/main/resources/assets/basesteam/models/item/steam_boiler_geothermal.json new file mode 100644 index 0000000..f6a29ea --- /dev/null +++ b/src/main/resources/assets/basesteam/models/item/steam_boiler_geothermal.json @@ -0,0 +1,4 @@ +{ + "parent": "basesteam:block/steam_boiler_geothermal", + "ambientocclusion": false +} \ No newline at end of file diff --git a/src/main/resources/assets/basesteam/models/item/steam_boiler_oil.json b/src/main/resources/assets/basesteam/models/item/steam_boiler_oil.json new file mode 100644 index 0000000..cb6bfeb --- /dev/null +++ b/src/main/resources/assets/basesteam/models/item/steam_boiler_oil.json @@ -0,0 +1,4 @@ +{ + "parent": "basesteam:block/steam_boiler_oil", + "ambientocclusion": false +} \ No newline at end of file diff --git a/src/main/resources/assets/basesteam/models/item/steam_crusher.json b/src/main/resources/assets/basesteam/models/item/steam_crusher.json new file mode 100644 index 0000000..f4f6fbd --- /dev/null +++ b/src/main/resources/assets/basesteam/models/item/steam_crusher.json @@ -0,0 +1,4 @@ +{ + "parent": "basesteam:block/steam_crusher", + "ambientocclusion": false +} \ No newline at end of file diff --git a/src/main/resources/assets/basesteam/models/item/steam_drill.json b/src/main/resources/assets/basesteam/models/item/steam_drill.json new file mode 100644 index 0000000..e9f232e --- /dev/null +++ b/src/main/resources/assets/basesteam/models/item/steam_drill.json @@ -0,0 +1,4 @@ +{ + "parent": "basesteam:block/steam_drill", + "ambientocclusion": false +} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/item/steam_drill_bit.json b/src/main/resources/assets/basesteam/models/item/steam_drill_bit.json similarity index 50% rename from src/main/resources/assets/steamadvantage/models/item/steam_drill_bit.json rename to src/main/resources/assets/basesteam/models/item/steam_drill_bit.json index 1690dee..059ce30 100644 --- a/src/main/resources/assets/steamadvantage/models/item/steam_drill_bit.json +++ b/src/main/resources/assets/basesteam/models/item/steam_drill_bit.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "steamadvantage:items/steam_drill_bit" + "layer0": "basesteam:items/steam_drill_bit" } } \ No newline at end of file diff --git a/src/main/resources/assets/basesteam/models/item/steam_elevator.json b/src/main/resources/assets/basesteam/models/item/steam_elevator.json new file mode 100644 index 0000000..093ee3c --- /dev/null +++ b/src/main/resources/assets/basesteam/models/item/steam_elevator.json @@ -0,0 +1,4 @@ +{ + "parent": "basesteam:block/steam_elevator", + "ambientocclusion": false +} \ No newline at end of file diff --git a/src/main/resources/assets/basesteam/models/item/steam_furnace.json b/src/main/resources/assets/basesteam/models/item/steam_furnace.json new file mode 100644 index 0000000..1adc5f0 --- /dev/null +++ b/src/main/resources/assets/basesteam/models/item/steam_furnace.json @@ -0,0 +1,4 @@ +{ + "parent": "basesteam:block/steam_furnace", + "ambientocclusion": false +} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/item/steam_governor.json b/src/main/resources/assets/basesteam/models/item/steam_governor.json similarity index 50% rename from src/main/resources/assets/steamadvantage/models/item/steam_governor.json rename to src/main/resources/assets/basesteam/models/item/steam_governor.json index 0cf3778..6f5fe39 100644 --- a/src/main/resources/assets/steamadvantage/models/item/steam_governor.json +++ b/src/main/resources/assets/basesteam/models/item/steam_governor.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "steamadvantage:items/steam_governor" + "layer0": "basesteam:items/steam_governor" } } \ No newline at end of file diff --git a/src/main/resources/assets/basesteam/models/item/steam_pipe.json b/src/main/resources/assets/basesteam/models/item/steam_pipe.json new file mode 100644 index 0000000..40f679a --- /dev/null +++ b/src/main/resources/assets/basesteam/models/item/steam_pipe.json @@ -0,0 +1,4 @@ +{ + "parent": "basesteam:block/steam_pipe_ns", + "ambientocclusion": false +} \ No newline at end of file diff --git a/src/main/resources/assets/basesteam/models/item/steam_pump.json b/src/main/resources/assets/basesteam/models/item/steam_pump.json new file mode 100644 index 0000000..c3dffe3 --- /dev/null +++ b/src/main/resources/assets/basesteam/models/item/steam_pump.json @@ -0,0 +1,4 @@ +{ + "parent": "basesteam:block/steam_pump", + "ambientocclusion": false +} \ No newline at end of file diff --git a/src/main/resources/assets/basesteam/models/item/steam_still.json b/src/main/resources/assets/basesteam/models/item/steam_still.json new file mode 100644 index 0000000..e608376 --- /dev/null +++ b/src/main/resources/assets/basesteam/models/item/steam_still.json @@ -0,0 +1,4 @@ +{ + "parent": "basesteam:block/steam_still", + "ambientocclusion": false +} \ No newline at end of file diff --git a/src/main/resources/assets/basesteam/models/item/steam_switch.json b/src/main/resources/assets/basesteam/models/item/steam_switch.json new file mode 100644 index 0000000..55520aa --- /dev/null +++ b/src/main/resources/assets/basesteam/models/item/steam_switch.json @@ -0,0 +1,3 @@ +{ + "parent": "basesteam:block/steam_switch_on" +} \ No newline at end of file diff --git a/src/main/resources/assets/basesteam/models/item/steam_tank.json b/src/main/resources/assets/basesteam/models/item/steam_tank.json new file mode 100644 index 0000000..29cce2c --- /dev/null +++ b/src/main/resources/assets/basesteam/models/item/steam_tank.json @@ -0,0 +1,3 @@ +{ + "parent": "basesteam:block/steam_tank" +} \ No newline at end of file diff --git a/src/main/resources/assets/basesteam/models/item/steam_track.json b/src/main/resources/assets/basesteam/models/item/steam_track.json new file mode 100644 index 0000000..094e2f2 --- /dev/null +++ b/src/main/resources/assets/basesteam/models/item/steam_track.json @@ -0,0 +1,3 @@ +{ + "parent": "basesteam:block/steam_track_ns" +} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/textures/blocks/coal_boiler_front.png b/src/main/resources/assets/basesteam/textures/blocks/coal_boiler_front.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/blocks/coal_boiler_front.png rename to src/main/resources/assets/basesteam/textures/blocks/coal_boiler_front.png diff --git a/src/main/resources/assets/steamadvantage/textures/blocks/electric_boiler_back.png b/src/main/resources/assets/basesteam/textures/blocks/electric_boiler_back.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/blocks/electric_boiler_back.png rename to src/main/resources/assets/basesteam/textures/blocks/electric_boiler_back.png diff --git a/src/main/resources/assets/steamadvantage/textures/blocks/electric_boiler_front.png b/src/main/resources/assets/basesteam/textures/blocks/electric_boiler_front.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/blocks/electric_boiler_front.png rename to src/main/resources/assets/basesteam/textures/blocks/electric_boiler_front.png diff --git a/src/main/resources/assets/steamadvantage/textures/blocks/geothermal_boiler_side.png b/src/main/resources/assets/basesteam/textures/blocks/geothermal_boiler_side.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/blocks/geothermal_boiler_side.png rename to src/main/resources/assets/basesteam/textures/blocks/geothermal_boiler_side.png diff --git a/src/main/resources/assets/steamadvantage/textures/blocks/geothermal_boiler_top.png b/src/main/resources/assets/basesteam/textures/blocks/geothermal_boiler_top.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/blocks/geothermal_boiler_top.png rename to src/main/resources/assets/basesteam/textures/blocks/geothermal_boiler_top.png diff --git a/src/main/resources/assets/steamadvantage/textures/blocks/oil_tank_end.png b/src/main/resources/assets/basesteam/textures/blocks/oil_tank_end.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/blocks/oil_tank_end.png rename to src/main/resources/assets/basesteam/textures/blocks/oil_tank_end.png diff --git a/src/main/resources/assets/steamadvantage/textures/blocks/platform_top.png b/src/main/resources/assets/basesteam/textures/blocks/platform_top.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/blocks/platform_top.png rename to src/main/resources/assets/basesteam/textures/blocks/platform_top.png diff --git a/src/main/resources/assets/steamadvantage/textures/blocks/rock_crusher_front.png b/src/main/resources/assets/basesteam/textures/blocks/rock_crusher_front.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/blocks/rock_crusher_front.png rename to src/main/resources/assets/basesteam/textures/blocks/rock_crusher_front.png diff --git a/src/main/resources/assets/steamadvantage/textures/blocks/rock_crusher_top.png b/src/main/resources/assets/basesteam/textures/blocks/rock_crusher_top.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/blocks/rock_crusher_top.png rename to src/main/resources/assets/basesteam/textures/blocks/rock_crusher_top.png diff --git a/src/main/resources/assets/steamadvantage/textures/blocks/steam_drill_bottom.png b/src/main/resources/assets/basesteam/textures/blocks/steam_drill_bottom.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/blocks/steam_drill_bottom.png rename to src/main/resources/assets/basesteam/textures/blocks/steam_drill_bottom.png diff --git a/src/main/resources/assets/steamadvantage/textures/blocks/steam_drill_top.png b/src/main/resources/assets/basesteam/textures/blocks/steam_drill_top.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/blocks/steam_drill_top.png rename to src/main/resources/assets/basesteam/textures/blocks/steam_drill_top.png diff --git a/src/main/resources/assets/steamadvantage/textures/blocks/steam_elevator_side.png b/src/main/resources/assets/basesteam/textures/blocks/steam_elevator_side.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/blocks/steam_elevator_side.png rename to src/main/resources/assets/basesteam/textures/blocks/steam_elevator_side.png diff --git a/src/main/resources/assets/steamadvantage/textures/blocks/steam_furnace_front.png b/src/main/resources/assets/basesteam/textures/blocks/steam_furnace_front.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/blocks/steam_furnace_front.png rename to src/main/resources/assets/basesteam/textures/blocks/steam_furnace_front.png diff --git a/src/main/resources/assets/steamadvantage/textures/blocks/steam_furnace_top.png b/src/main/resources/assets/basesteam/textures/blocks/steam_furnace_top.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/blocks/steam_furnace_top.png rename to src/main/resources/assets/basesteam/textures/blocks/steam_furnace_top.png diff --git a/src/main/resources/assets/steamadvantage/textures/blocks/steam_pipe.png b/src/main/resources/assets/basesteam/textures/blocks/steam_pipe.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/blocks/steam_pipe.png rename to src/main/resources/assets/basesteam/textures/blocks/steam_pipe.png diff --git a/src/main/resources/assets/steamadvantage/textures/blocks/steam_pump_front.png b/src/main/resources/assets/basesteam/textures/blocks/steam_pump_front.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/blocks/steam_pump_front.png rename to src/main/resources/assets/basesteam/textures/blocks/steam_pump_front.png diff --git a/src/main/resources/assets/steamadvantage/textures/blocks/steam_pump_side.png b/src/main/resources/assets/basesteam/textures/blocks/steam_pump_side.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/blocks/steam_pump_side.png rename to src/main/resources/assets/basesteam/textures/blocks/steam_pump_side.png diff --git a/src/main/resources/assets/steamadvantage/textures/blocks/steam_switch_off.png b/src/main/resources/assets/basesteam/textures/blocks/steam_switch_off.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/blocks/steam_switch_off.png rename to src/main/resources/assets/basesteam/textures/blocks/steam_switch_off.png diff --git a/src/main/resources/assets/steamadvantage/textures/blocks/steam_switch_on.png b/src/main/resources/assets/basesteam/textures/blocks/steam_switch_on.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/blocks/steam_switch_on.png rename to src/main/resources/assets/basesteam/textures/blocks/steam_switch_on.png diff --git a/src/main/resources/assets/steamadvantage/textures/entity/drill_bit.png b/src/main/resources/assets/basesteam/textures/entity/drill_bit.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/entity/drill_bit.png rename to src/main/resources/assets/basesteam/textures/entity/drill_bit.png diff --git a/src/main/resources/assets/steamadvantage/textures/gui/container/coal_boiler.png b/src/main/resources/assets/basesteam/textures/gui/container/coal_boiler.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/gui/container/coal_boiler.png rename to src/main/resources/assets/basesteam/textures/gui/container/coal_boiler.png diff --git a/src/main/resources/assets/steamadvantage/textures/gui/container/electric_boiler.png b/src/main/resources/assets/basesteam/textures/gui/container/electric_boiler.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/gui/container/electric_boiler.png rename to src/main/resources/assets/basesteam/textures/gui/container/electric_boiler.png diff --git a/src/main/resources/assets/steamadvantage/textures/gui/container/geothermal_boiler.png b/src/main/resources/assets/basesteam/textures/gui/container/geothermal_boiler.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/gui/container/geothermal_boiler.png rename to src/main/resources/assets/basesteam/textures/gui/container/geothermal_boiler.png diff --git a/src/main/resources/assets/steamadvantage/textures/gui/container/oil_boiler.png b/src/main/resources/assets/basesteam/textures/gui/container/oil_boiler.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/gui/container/oil_boiler.png rename to src/main/resources/assets/basesteam/textures/gui/container/oil_boiler.png diff --git a/src/main/resources/assets/steamadvantage/textures/gui/container/rock_crusher.png b/src/main/resources/assets/basesteam/textures/gui/container/rock_crusher.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/gui/container/rock_crusher.png rename to src/main/resources/assets/basesteam/textures/gui/container/rock_crusher.png diff --git a/src/main/resources/assets/steamadvantage/textures/gui/container/steam_drill.png b/src/main/resources/assets/basesteam/textures/gui/container/steam_drill.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/gui/container/steam_drill.png rename to src/main/resources/assets/basesteam/textures/gui/container/steam_drill.png diff --git a/src/main/resources/assets/steamadvantage/textures/gui/container/steam_furnace.png b/src/main/resources/assets/basesteam/textures/gui/container/steam_furnace.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/gui/container/steam_furnace.png rename to src/main/resources/assets/basesteam/textures/gui/container/steam_furnace.png diff --git a/src/main/resources/assets/steamadvantage/textures/gui/container/steam_pump.png b/src/main/resources/assets/basesteam/textures/gui/container/steam_pump.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/gui/container/steam_pump.png rename to src/main/resources/assets/basesteam/textures/gui/container/steam_pump.png diff --git a/src/main/resources/assets/steamadvantage/textures/gui/container/steam_still.png b/src/main/resources/assets/basesteam/textures/gui/container/steam_still.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/gui/container/steam_still.png rename to src/main/resources/assets/basesteam/textures/gui/container/steam_still.png diff --git a/src/main/resources/assets/steamadvantage/textures/gui/container/steam_tank.png b/src/main/resources/assets/basesteam/textures/gui/container/steam_tank.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/gui/container/steam_tank.png rename to src/main/resources/assets/basesteam/textures/gui/container/steam_tank.png diff --git a/src/main/resources/assets/steamadvantage/textures/items/blackpowder_cartridge.png b/src/main/resources/assets/basesteam/textures/items/blackpowder_cartridge.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/items/blackpowder_cartridge.png rename to src/main/resources/assets/basesteam/textures/items/blackpowder_cartridge.png diff --git a/src/main/resources/assets/steamadvantage/textures/items/steam_drill_bit.png b/src/main/resources/assets/basesteam/textures/items/steam_drill_bit.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/items/steam_drill_bit.png rename to src/main/resources/assets/basesteam/textures/items/steam_drill_bit.png diff --git a/src/main/resources/assets/steamadvantage/textures/items/steam_governor.png b/src/main/resources/assets/basesteam/textures/items/steam_governor.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/items/steam_governor.png rename to src/main/resources/assets/basesteam/textures/items/steam_governor.png diff --git a/src/main/resources/assets/steamadvantage/textures/materials/bolted_brass.png b/src/main/resources/assets/basesteam/textures/materials/bolted_brass.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/materials/bolted_brass.png rename to src/main/resources/assets/basesteam/textures/materials/bolted_brass.png diff --git a/src/main/resources/assets/steamadvantage/textures/materials/bolted_copper.png b/src/main/resources/assets/basesteam/textures/materials/bolted_copper.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/materials/bolted_copper.png rename to src/main/resources/assets/basesteam/textures/materials/bolted_copper.png diff --git a/src/main/resources/assets/steamadvantage/textures/materials/bolted_iron.png b/src/main/resources/assets/basesteam/textures/materials/bolted_iron.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/materials/bolted_iron.png rename to src/main/resources/assets/basesteam/textures/materials/bolted_iron.png diff --git a/src/main/resources/assets/steamadvantage/textures/materials/iron.png b/src/main/resources/assets/basesteam/textures/materials/iron.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/materials/iron.png rename to src/main/resources/assets/basesteam/textures/materials/iron.png diff --git a/src/main/resources/assets/steamadvantage/textures/materials/steel_dark_hole.png b/src/main/resources/assets/basesteam/textures/materials/steel_dark_hole.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/materials/steel_dark_hole.png rename to src/main/resources/assets/basesteam/textures/materials/steel_dark_hole.png diff --git a/src/main/resources/assets/steamadvantage/textures/materials/wood_panel.png b/src/main/resources/assets/basesteam/textures/materials/wood_panel.png similarity index 100% rename from src/main/resources/assets/steamadvantage/textures/materials/wood_panel.png rename to src/main/resources/assets/basesteam/textures/materials/wood_panel.png diff --git a/src/main/resources/assets/steamadvantage/blockstates/drillbit.json b/src/main/resources/assets/steamadvantage/blockstates/drillbit.json deleted file mode 100644 index 11193f9..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/drillbit.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "steamadvantage:block/drillbit" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/blockstates/platform.json b/src/main/resources/assets/steamadvantage/blockstates/platform.json deleted file mode 100644 index 1164d69..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/platform.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "variants": { - "height=0": { "model": "steamadvantage:block/platform_shaft" }, - "height=1": { "model": "steamadvantage:block/platform1" }, - "height=2": { "model": "steamadvantage:block/platform2" }, - "height=3": { "model": "steamadvantage:block/platform3" }, - "height=4": { "model": "steamadvantage:block/platform4" } - } -} diff --git a/src/main/resources/assets/steamadvantage/blockstates/pump_pipe_steam.json b/src/main/resources/assets/steamadvantage/blockstates/pump_pipe_steam.json deleted file mode 100644 index a25407b..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/pump_pipe_steam.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": {"model": "poweradvantage:block/fluid_pipe_ns", "x": 90, "y": 0, "uvlock": false } - } -} diff --git a/src/main/resources/assets/steamadvantage/blockstates/steam_boiler_coal.json b/src/main/resources/assets/steamadvantage/blockstates/steam_boiler_coal.json deleted file mode 100644 index fec399a..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_boiler_coal.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "steamadvantage:block/steam_boiler_coal", "y": 90 }, - "facing=north": { "model": "steamadvantage:block/steam_boiler_coal" }, - "facing=south": { "model": "steamadvantage:block/steam_boiler_coal", "y": 180 }, - "facing=west": { "model": "steamadvantage:block/steam_boiler_coal", "y": 270 } - } -} diff --git a/src/main/resources/assets/steamadvantage/blockstates/steam_boiler_electric.json b/src/main/resources/assets/steamadvantage/blockstates/steam_boiler_electric.json deleted file mode 100644 index 0425ce6..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_boiler_electric.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "steamadvantage:block/steam_boiler_electric", "y": 90 }, - "facing=north": { "model": "steamadvantage:block/steam_boiler_electric" }, - "facing=south": { "model": "steamadvantage:block/steam_boiler_electric", "y": 180 }, - "facing=west": { "model": "steamadvantage:block/steam_boiler_electric", "y": 270 } - } -} diff --git a/src/main/resources/assets/steamadvantage/blockstates/steam_boiler_geothermal.json b/src/main/resources/assets/steamadvantage/blockstates/steam_boiler_geothermal.json deleted file mode 100644 index 5ee6510..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_boiler_geothermal.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "steamadvantage:block/steam_boiler_geothermal", "y": 90 }, - "facing=north": { "model": "steamadvantage:block/steam_boiler_geothermal" }, - "facing=south": { "model": "steamadvantage:block/steam_boiler_geothermal", "y": 180 }, - "facing=west": { "model": "steamadvantage:block/steam_boiler_geothermal", "y": 270 } - } -} diff --git a/src/main/resources/assets/steamadvantage/blockstates/steam_boiler_oil.json b/src/main/resources/assets/steamadvantage/blockstates/steam_boiler_oil.json deleted file mode 100644 index 047758d..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_boiler_oil.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "steamadvantage:block/steam_boiler_oil", "x":270, "y": 90 }, - "facing=north": { "model": "steamadvantage:block/steam_boiler_oil", "x":270 }, - "facing=south": { "model": "steamadvantage:block/steam_boiler_oil", "x":270, "y": 180 }, - "facing=west": { "model": "steamadvantage:block/steam_boiler_oil", "x":270, "y": 270 } - } -} diff --git a/src/main/resources/assets/steamadvantage/blockstates/steam_crusher.json b/src/main/resources/assets/steamadvantage/blockstates/steam_crusher.json deleted file mode 100644 index f59a3de..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_crusher.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "steamadvantage:block/steam_crusher", "y": 90 }, - "facing=north": { "model": "steamadvantage:block/steam_crusher" }, - "facing=south": { "model": "steamadvantage:block/steam_crusher", "y": 180 }, - "facing=west": { "model": "steamadvantage:block/steam_crusher", "y": 270 } - } -} diff --git a/src/main/resources/assets/steamadvantage/blockstates/steam_drill.json b/src/main/resources/assets/steamadvantage/blockstates/steam_drill.json deleted file mode 100644 index 7dcd03a..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_drill.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=down": { "model": "steamadvantage:block/steam_drill", "x": 90 }, - "facing=up": { "model": "steamadvantage:block/steam_drill", "x": 270 }, - "facing=east": { "model": "steamadvantage:block/steam_drill", "y": 90 }, - "facing=north": { "model": "steamadvantage:block/steam_drill" }, - "facing=south": { "model": "steamadvantage:block/steam_drill", "y": 180 }, - "facing=west": { "model": "steamadvantage:block/steam_drill", "y": 270 } - } -} diff --git a/src/main/resources/assets/steamadvantage/blockstates/steam_elevator.json b/src/main/resources/assets/steamadvantage/blockstates/steam_elevator.json deleted file mode 100644 index 43d6a7d..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_elevator.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "steamadvantage:block/steam_elevator", "y": 90}, - "facing=north": { "model": "steamadvantage:block/steam_elevator" }, - "facing=south": { "model": "steamadvantage:block/steam_elevator", "y": 180}, - "facing=west": { "model": "steamadvantage:block/steam_elevator", "y": 270} - } -} diff --git a/src/main/resources/assets/steamadvantage/blockstates/steam_furnace.json b/src/main/resources/assets/steamadvantage/blockstates/steam_furnace.json deleted file mode 100644 index 74a07fa..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_furnace.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "steamadvantage:block/steam_furnace", "y": 90 }, - "facing=north": { "model": "steamadvantage:block/steam_furnace" }, - "facing=south": { "model": "steamadvantage:block/steam_furnace", "y": 180 }, - "facing=west": { "model": "steamadvantage:block/steam_furnace", "y": 270 } - } -} diff --git a/src/main/resources/assets/steamadvantage/blockstates/steam_pipe.json b/src/main/resources/assets/steamadvantage/blockstates/steam_pipe.json deleted file mode 100644 index 26d2eee..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_pipe.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "__comment": "blockstate parameters MUST be in alphabetical order!", - "variants": { - "down=false,east=false,north=false,south=false,up=false,west=false": { "model": "steamadvantage:block/steam_pipe_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=false,west=false": { "model": "steamadvantage:block/steam_pipe_n", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=false,west=false": { "model": "steamadvantage:block/steam_pipe_n", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=false,west=false": { "model": "steamadvantage:block/steam_pipe_n", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=false,west=false": { "model": "steamadvantage:block/steam_pipe_n", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=true,west=false": { "model": "steamadvantage:block/steam_pipe_n", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=false,west=true": { "model": "steamadvantage:block/steam_pipe_n", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=false,west=false": { "model": "steamadvantage:block/steam_pipe_nw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=false,west=false": { "model": "steamadvantage:block/steam_pipe_nw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=false,west=false": { "model": "steamadvantage:block/steam_pipe_nw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=true,west=false": { "model": "steamadvantage:block/steam_pipe_ns", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=false,west=true": { "model": "steamadvantage:block/steam_pipe_nw", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=false,west=false": { "model": "steamadvantage:block/steam_pipe_nw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=false,west=false": { "model": "steamadvantage:block/steam_pipe_nw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=true,west=false": { "model": "steamadvantage:block/steam_pipe_nw", "x": 270, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=false,west=true": { "model": "steamadvantage:block/steam_pipe_ns", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=false,west=false": { "model": "steamadvantage:block/steam_pipe_ns", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=true,west=false": { "model": "steamadvantage:block/steam_pipe_nw", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=false,west=true": { "model": "steamadvantage:block/steam_pipe_nw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=true,west=false": { "model": "steamadvantage:block/steam_pipe_nw", "x": 270, "y": 270, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=false,west=true": { "model": "steamadvantage:block/steam_pipe_nw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=true,west=true": { "model": "steamadvantage:block/steam_pipe_nw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=false,west=false": { "model": "steamadvantage:block/steam_pipe_nuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=false,west=false": { "model": "steamadvantage:block/steam_pipe_nuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=true,west=false": { "model": "steamadvantage:block/steam_pipe_dnu", "x": 0, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=false,west=true": { "model": "steamadvantage:block/steam_pipe_dnu", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=false,west=false": { "model": "steamadvantage:block/steam_pipe_dnu", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=true,west=false": { "model": "steamadvantage:block/steam_pipe_dnu", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=false,west=true": { "model": "steamadvantage:block/steam_pipe_nuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=true,west=false": { "model": "steamadvantage:block/steam_pipe_dnu", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=false,west=true": { "model": "steamadvantage:block/steam_pipe_nuw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=true,west=true": { "model": "steamadvantage:block/steam_pipe_dnu", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=false,west=false": { "model": "steamadvantage:block/steam_pipe_nsw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=true,west=false": { "model": "steamadvantage:block/steam_pipe_nuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=false,west=true": { "model": "steamadvantage:block/steam_pipe_nsw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=true,west=false": { "model": "steamadvantage:block/steam_pipe_nuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=false,west=true": { "model": "steamadvantage:block/steam_pipe_nsw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=true,west=true": { "model": "steamadvantage:block/steam_pipe_dnu", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=true,west=false": { "model": "steamadvantage:block/steam_pipe_dnu", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=false,west=true": { "model": "steamadvantage:block/steam_pipe_nsw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=true,west=true": { "model": "steamadvantage:block/steam_pipe_nuw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=true,west=true": { "model": "steamadvantage:block/steam_pipe_nuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=false,west=false": { "model": "steamadvantage:block/steam_pipe_nsuw", "x": 180, "y": 180, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=true,west=false": { "model": "steamadvantage:block/steam_pipe_nsuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=false,west=true": { "model": "steamadvantage:block/steam_pipe_nsuw", "x": 180, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=true,west=false": { "model": "steamadvantage:block/steam_pipe_nsuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=false,west=true": { "model": "steamadvantage:block/steam_pipe_nsuw", "x": 180, "y": 270, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=true,west=true": { "model": "steamadvantage:block/steam_pipe_ensw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=true,west=false": { "model": "steamadvantage:block/steam_pipe_ensw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=false,west=true": { "model": "steamadvantage:block/steam_pipe_nsuw", "x": 180, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=true,west=true": { "model": "steamadvantage:block/steam_pipe_nsuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=true,west=true": { "model": "steamadvantage:block/steam_pipe_nsuw", "x": 90, "y": 270, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=true,west=false": { "model": "steamadvantage:block/steam_pipe_nsuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=false,west=true": { "model": "steamadvantage:block/steam_pipe_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=true,west=true": { "model": "steamadvantage:block/steam_pipe_nsuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=true,west=true": { "model": "steamadvantage:block/steam_pipe_nsuw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=true,west=true": { "model": "steamadvantage:block/steam_pipe_nsuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=true,west=false": { "model": "steamadvantage:block/steam_pipe_desuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=false,west=true": { "model": "steamadvantage:block/steam_pipe_desuw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=true,west=true": { "model": "steamadvantage:block/steam_pipe_desuw", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=true,west=true": { "model": "steamadvantage:block/steam_pipe_desuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=true,west=true": { "model": "steamadvantage:block/steam_pipe_desuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=true,west=true": { "model": "steamadvantage:block/steam_pipe_desuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=true,west=true": { "model": "steamadvantage:block/steam_pipe_densuw", "x": 0, "y": 0, "uvlock": false } - - } -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/blockstates/steam_pump.json b/src/main/resources/assets/steamadvantage/blockstates/steam_pump.json deleted file mode 100644 index de4ee6c..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_pump.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "steamadvantage:block/steam_pump", "y": 90 }, - "facing=north": { "model": "steamadvantage:block/steam_pump" }, - "facing=south": { "model": "steamadvantage:block/steam_pump", "y": 180 }, - "facing=west": { "model": "steamadvantage:block/steam_pump", "y": 270 } - } -} diff --git a/src/main/resources/assets/steamadvantage/blockstates/steam_still.json b/src/main/resources/assets/steamadvantage/blockstates/steam_still.json deleted file mode 100644 index dacd7c7..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_still.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "steamadvantage:block/steam_still", "y": 90 }, - "facing=north": { "model": "steamadvantage:block/steam_still" }, - "facing=south": { "model": "steamadvantage:block/steam_still", "y": 180 }, - "facing=west": { "model": "steamadvantage:block/steam_still", "y": 270 } - } -} diff --git a/src/main/resources/assets/steamadvantage/blockstates/steam_switch.json b/src/main/resources/assets/steamadvantage/blockstates/steam_switch.json deleted file mode 100644 index 8e68320..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_switch.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "active=false": { "model": "steamadvantage:block/steam_switch_off"}, - "active=true": { "model": "steamadvantage:block/steam_switch_on"} - } -} diff --git a/src/main/resources/assets/steamadvantage/blockstates/steam_tank.json b/src/main/resources/assets/steamadvantage/blockstates/steam_tank.json deleted file mode 100644 index ac7be61..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_tank.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "steamadvantage:block/steam_tank", "y": 90, "uvlock": true }, - "facing=north": { "model": "steamadvantage:block/steam_tank", "uvlock": true }, - "facing=south": { "model": "steamadvantage:block/steam_tank", "y": 180, "uvlock": true }, - "facing=west": { "model": "steamadvantage:block/steam_tank", "y": 270, "uvlock": true } - } -} diff --git a/src/main/resources/assets/steamadvantage/blockstates/steam_track.json b/src/main/resources/assets/steamadvantage/blockstates/steam_track.json deleted file mode 100644 index a536b3e..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_track.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "__comment": "blockstate parameters MUST be in alphabetical order!", - "variants": { - "down=false,east=false,north=false,south=false,up=false,west=false": { "model": "steamadvantage:block/steam_track_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=false,west=false": { "model": "steamadvantage:block/steam_track_n", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=false,west=false": { "model": "steamadvantage:block/steam_track_n", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=false,west=false": { "model": "steamadvantage:block/steam_track_n", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=false,west=false": { "model": "steamadvantage:block/steam_track_n", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=true,west=false": { "model": "steamadvantage:block/steam_track_n", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=false,west=true": { "model": "steamadvantage:block/steam_track_n", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=false,west=false": { "model": "steamadvantage:block/steam_track_nw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=false,west=false": { "model": "steamadvantage:block/steam_track_nw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=false,west=false": { "model": "steamadvantage:block/steam_track_nw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=true,west=false": { "model": "steamadvantage:block/steam_track_ns", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=false,west=true": { "model": "steamadvantage:block/steam_track_nw", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=false,west=false": { "model": "steamadvantage:block/steam_track_nw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=false,west=false": { "model": "steamadvantage:block/steam_track_nw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=true,west=false": { "model": "steamadvantage:block/steam_track_nw", "x": 270, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=false,west=true": { "model": "steamadvantage:block/steam_track_ns", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=false,west=false": { "model": "steamadvantage:block/steam_track_ns", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=true,west=false": { "model": "steamadvantage:block/steam_track_nw", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=false,west=true": { "model": "steamadvantage:block/steam_track_nw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=true,west=false": { "model": "steamadvantage:block/steam_track_nw", "x": 270, "y": 270, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=false,west=true": { "model": "steamadvantage:block/steam_track_nw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=true,west=true": { "model": "steamadvantage:block/steam_track_nw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=false,west=false": { "model": "steamadvantage:block/steam_track_nuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=false,west=false": { "model": "steamadvantage:block/steam_track_nuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=true,west=false": { "model": "steamadvantage:block/steam_track_dnu", "x": 0, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=false,west=true": { "model": "steamadvantage:block/steam_track_dnu", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=false,west=false": { "model": "steamadvantage:block/steam_track_dnu", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=true,west=false": { "model": "steamadvantage:block/steam_track_dnu", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=false,west=true": { "model": "steamadvantage:block/steam_track_nuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=true,west=false": { "model": "steamadvantage:block/steam_track_dnu", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=false,west=true": { "model": "steamadvantage:block/steam_track_nuw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=true,west=true": { "model": "steamadvantage:block/steam_track_dnu", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=false,west=false": { "model": "steamadvantage:block/steam_track_nsw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=true,west=false": { "model": "steamadvantage:block/steam_track_nuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=false,west=true": { "model": "steamadvantage:block/steam_track_nsw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=true,west=false": { "model": "steamadvantage:block/steam_track_nuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=false,west=true": { "model": "steamadvantage:block/steam_track_nsw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=true,west=true": { "model": "steamadvantage:block/steam_track_dnu", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=true,west=false": { "model": "steamadvantage:block/steam_track_dnu", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=false,west=true": { "model": "steamadvantage:block/steam_track_nsw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=true,west=true": { "model": "steamadvantage:block/steam_track_nuw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=true,west=true": { "model": "steamadvantage:block/steam_track_nuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=false,west=false": { "model": "steamadvantage:block/steam_track_nsuw", "x": 180, "y": 180, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=true,west=false": { "model": "steamadvantage:block/steam_track_nsuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=false,west=true": { "model": "steamadvantage:block/steam_track_nsuw", "x": 180, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=true,west=false": { "model": "steamadvantage:block/steam_track_nsuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=false,west=true": { "model": "steamadvantage:block/steam_track_nsuw", "x": 180, "y": 270, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=true,west=true": { "model": "steamadvantage:block/steam_track_ensw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=true,west=false": { "model": "steamadvantage:block/steam_track_ensw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=false,west=true": { "model": "steamadvantage:block/steam_track_nsuw", "x": 180, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=true,west=true": { "model": "steamadvantage:block/steam_track_nsuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=true,west=true": { "model": "steamadvantage:block/steam_track_nsuw", "x": 90, "y": 270, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=true,west=false": { "model": "steamadvantage:block/steam_track_nsuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=false,west=true": { "model": "steamadvantage:block/steam_track_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=true,west=true": { "model": "steamadvantage:block/steam_track_nsuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=true,west=true": { "model": "steamadvantage:block/steam_track_nsuw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=true,west=true": { "model": "steamadvantage:block/steam_track_nsuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=true,west=false": { "model": "steamadvantage:block/steam_track_desuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=false,west=true": { "model": "steamadvantage:block/steam_track_desuw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=true,west=true": { "model": "steamadvantage:block/steam_track_desuw", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=true,west=true": { "model": "steamadvantage:block/steam_track_desuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=true,west=true": { "model": "steamadvantage:block/steam_track_desuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=true,west=true": { "model": "steamadvantage:block/steam_track_desuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=true,west=true": { "model": "steamadvantage:block/steam_track_densuw", "x": 0, "y": 0, "uvlock": false } - - } -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/lang/de_de.json b/src/main/resources/assets/steamadvantage/lang/de_de.json deleted file mode 100644 index e32d5ae..0000000 --- a/src/main/resources/assets/steamadvantage/lang/de_de.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", - "item.steamadvantage.steam_governor.name": "Dampfkraft Steuerventil", - "tile.steamadvantage.steam_pipe.name": "Dampfrohr", - "tile.steamadvantage.steam_boiler_coal.name": "Dampfkraft Kessel", - "tile.steamadvantage.steam_tank.name": "Dampftank", - "tile.steamadvantage.steam_furnace.name": "Dampfkraft Ofen", - "tile.steamadvantage.steam_crusher.name": "Dampfkraft Steinbrecher", - "tile.steamadvantage.drillbit.name": "Bohrer", - "tile.steamadvantage.steam_drill.name": "Dampfkraft Bohrmaschine", - "item.steamadvantage.steam_drill_bit.name": "Bohrer", - "death.attack.steam_machine": "%1$s wurde zwischen die Zahnräder einer Maschine geschliffen", - "death.attack.steam_machine.player": "%1$s wurde zwischen die Zahnräder einer Maschine von %2$s geschliffen", - "tile.steamadvantage.steam_elevator.name": "Dampfkraft Aufzug", - "tile.steamadvantage.platform.name": "Dampfkraft Aufzugplattform", - "death.attack.musket": "%1$s wurde angeschossen", - "death.attack.musket.player": "%1$s schuss %2$s tot", - "item.steamadvantage.blackpowder_cartridge.name": "Schießpulver Patrone", - "item.steamadvantage.musket.name": "Schießpulver Muskete", - "tooltip.musket.damage": "Shot befasst %x Schäden", - "tooltip.musket.ammo": "Erfordert %x zu laden", - "tooltip.musket.loaded": "Geladen", - "tooltip.musket.unloaded": "Nicht geladen", - "enchantment.powderless": "Unendlich Munition", - "enchantment.rapid_reload": "Schnell neu laden", - "enchantment.high_explosive": "Bombe", - "enchantment.recoil": "Rückstoß", - "tile.steamadvantage.steam_track.name": "Dampfkraftzug", - "tile.steamadvantage.steam_boiler_electric.name": "Elektro-Dampfkessel", - "tile.steamadvantage.steam_boiler_geothermal.name": "Geothermische Dampfkessel", - "tile.steamadvantage.steam_switch.name": "Dampfventil", - "tile.steamadvantage.steam_still.name": "Dampfkraft Brennerei", - "tile.steamadvantage.steam_pump.name": "Dampfkraft Pumpe", - "tile.steamadvantage.steam_boiler_oil.name": "Ölfeuerung Dampfkraft Kessel", - "tile.steamadvantage.pump_pipe_steam.name": "Pumpenrohr", - "item.steamadvantage.steam_governor": "Dampfkraft Steuerventil", - "block.steamadvantage.steam_pipe": "Dampfrohr", - "block.steamadvantage.steam_boiler_coal": "Dampfkraft Kessel", - "block.steamadvantage.steam_tank": "Dampftank", - "block.steamadvantage.steam_furnace": "Dampfkraft Ofen", - "block.steamadvantage.steam_crusher": "Dampfkraft Steinbrecher", - "block.steamadvantage.drillbit": "Bohrer", - "block.steamadvantage.steam_drill": "Dampfkraft Bohrmaschine", - "item.steamadvantage.steam_drill_bit": "Bohrer", - "block.steamadvantage.steam_elevator": "Dampfkraft Aufzug", - "block.steamadvantage.platform": "Dampfkraft Aufzugplattform", - "item.steamadvantage.blackpowder_cartridge": "Schießpulver Patrone", - "item.steamadvantage.musket": "Schießpulver Muskete", - "block.steamadvantage.steam_track": "Dampfkraftzug", - "block.steamadvantage.steam_boiler_electric": "Elektro-Dampfkessel", - "block.steamadvantage.steam_boiler_geothermal": "Geothermische Dampfkessel", - "block.steamadvantage.steam_switch": "Dampfventil", - "block.steamadvantage.steam_still": "Dampfkraft Brennerei", - "block.steamadvantage.steam_pump": "Dampfkraft Pumpe", - "block.steamadvantage.steam_boiler_oil": "Ölfeuerung Dampfkraft Kessel", - "block.steamadvantage.pump_pipe_steam": "Pumpenrohr" -} diff --git a/src/main/resources/assets/steamadvantage/lang/en_au.json b/src/main/resources/assets/steamadvantage/lang/en_au.json deleted file mode 100644 index 1b47053..0000000 --- a/src/main/resources/assets/steamadvantage/lang/en_au.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", - "item.steamadvantage.steam_governor.name": "Steam Governor", - "tile.steamadvantage.steam_pipe.name": "Brass Steam Pipe", - "tile.steamadvantage.steam_boiler_coal.name": "Coal-Fired Steam Boiler", - "tile.steamadvantage.steam_tank.name": "Steam Boiler Tank", - "tile.steamadvantage.steam_furnace.name": "Steam-Powered Furnace", - "tile.steamadvantage.steam_crusher.name": "Steam-Powered Rock Crusher", - "tile.steamadvantage.drillbit.name": "Drill", - "tile.steamadvantage.steam_drill.name": "Steam-Powered Drill", - "item.steamadvantage.steam_drill_bit.name": "Drill Bit", - "death.attack.steam_machine": "%1$s was ground between the gears of a machine", - "death.attack.steam_machine.player": "%1$s was fed into the gears of a machine by %2$s", - "tile.steamadvantage.steam_elevator.name": "Steam-Powered Elevator", - "tile.steamadvantage.platform.name": "Steam Elevator Platform", - "death.attack.musket": "%1$s got shot", - "death.attack.musket.player": "%2$s shot %1$s dead", - "item.steamadvantage.blackpowder_cartridge.name": "Black-Powder Cartridge", - "item.steamadvantage.musket.name": "Black-Powder Musket", - "tooltip.musket.damage": "Shot deals %x damage", - "tooltip.musket.ammo": "Requires %x to reload", - "tooltip.musket.loaded": "Loaded", - "tooltip.musket.unloaded": "Not loaded", - "enchantment.powderless": "Powderless", - "enchantment.rapid_reload": "Quick Reload", - "enchantment.high_explosive": "High-Explosive", - "enchantment.recoil": "Recoil", - "tile.steamadvantage.steam_track.name": "Steam Track", - "tile.steamadvantage.steam_boiler_electric.name": "Electric Steam Boiler", - "tile.steamadvantage.steam_boiler_geothermal.name": "Geothermal Steam Boiler", - "tile.steamadvantage.steam_switch.name": "Steam Switch Valve", - "tile.steamadvantage.steam_still.name": "Steam-Powered Still", - "tile.steamadvantage.steam_pump.name": "Steam-Powered Pump", - "tile.steamadvantage.steam_boiler_oil.name": "Oil-Burning Steam Boiler", - "tile.steamadvantage.pump_pipe_steam.name": "Pump Pipe", - "item.steamadvantage.steam_governor": "Steam Governor", - "block.steamadvantage.steam_pipe": "Brass Steam Pipe", - "block.steamadvantage.steam_boiler_coal": "Coal-Fired Steam Boiler", - "block.steamadvantage.steam_tank": "Steam Boiler Tank", - "block.steamadvantage.steam_furnace": "Steam-Powered Furnace", - "block.steamadvantage.steam_crusher": "Steam-Powered Rock Crusher", - "block.steamadvantage.drillbit": "Drill", - "block.steamadvantage.steam_drill": "Steam-Powered Drill", - "item.steamadvantage.steam_drill_bit": "Drill Bit", - "block.steamadvantage.steam_elevator": "Steam-Powered Elevator", - "block.steamadvantage.platform": "Steam Elevator Platform", - "item.steamadvantage.blackpowder_cartridge": "Black-Powder Cartridge", - "item.steamadvantage.musket": "Black-Powder Musket", - "block.steamadvantage.steam_track": "Steam Track", - "block.steamadvantage.steam_boiler_electric": "Electric Steam Boiler", - "block.steamadvantage.steam_boiler_geothermal": "Geothermal Steam Boiler", - "block.steamadvantage.steam_switch": "Steam Switch Valve", - "block.steamadvantage.steam_still": "Steam-Powered Still", - "block.steamadvantage.steam_pump": "Steam-Powered Pump", - "block.steamadvantage.steam_boiler_oil": "Oil-Burning Steam Boiler", - "block.steamadvantage.pump_pipe_steam": "Pump Pipe" -} diff --git a/src/main/resources/assets/steamadvantage/lang/en_ca.json b/src/main/resources/assets/steamadvantage/lang/en_ca.json deleted file mode 100644 index 5c66bc3..0000000 --- a/src/main/resources/assets/steamadvantage/lang/en_ca.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "item.steamadvantage.steam_governor.name": "Steam Governor", - "tile.steamadvantage.steam_pipe.name": "Brass Steam Pipe", - "tile.steamadvantage.steam_boiler_coal.name": "Coal-Fired Steam Boiler", - "tile.steamadvantage.steam_tank.name": "Steam Boiler Tank", - "tile.steamadvantage.steam_furnace.name": "Steam-Powered Furnace", - "tile.steamadvantage.steam_crusher.name": "Steam-Powered Rock Crusher", - "tile.steamadvantage.drillbit.name": "Drill", - "tile.steamadvantage.steam_drill.name": "Steam-Powered Drill", - "item.steamadvantage.steam_drill_bit.name": "Drill Bit", - "death.attack.steam_machine": "%1$s was ground between the gears of a machine", - "death.attack.steam_machine.player": "%1$s was fed into the gears of a machine by %2$s", - "tile.steamadvantage.steam_elevator.name": "Steam-Powered Elevator", - "tile.steamadvantage.platform.name": "Steam Elevator Platform", - "death.attack.musket": "%1$s got shot", - "death.attack.musket.player": "%2$s shot %1$s dead", - "item.steamadvantage.blackpowder_cartridge.name": "Black-Powder Cartridge", - "item.steamadvantage.musket.name": "Black-Powder Musket", - "tooltip.musket.damage": "Shot deals %x damage", - "tooltip.musket.ammo": "Requires %x to reload", - "tooltip.musket.loaded": "Loaded", - "tooltip.musket.unloaded": "Not loaded", - "enchantment.powderless": "Powderless", - "enchantment.rapid_reload": "Quick Reload", - "enchantment.high_explosive": "High-Explosive", - "enchantment.recoil": "Recoil", - "tile.steamadvantage.steam_track.name": "Steam Track", - "tile.steamadvantage.steam_boiler_electric.name": "Electric Steam Boiler", - "tile.steamadvantage.steam_boiler_geothermal.name": "Geothermal Steam Boiler", - "tile.steamadvantage.steam_switch.name": "Steam Switch Valve", - "tile.steamadvantage.steam_still.name": "Steam-Powered Still", - "tile.steamadvantage.steam_pump.name": "Steam-Powered Pump", - "tile.steamadvantage.steam_boiler_oil.name": "Oil-Burning Steam Boiler", - "tile.steamadvantage.pump_pipe_steam.name": "Pump Pipe", - "item.steamadvantage.steam_governor": "Steam Governor", - "block.steamadvantage.steam_pipe": "Brass Steam Pipe", - "block.steamadvantage.steam_boiler_coal": "Coal-Fired Steam Boiler", - "block.steamadvantage.steam_tank": "Steam Boiler Tank", - "block.steamadvantage.steam_furnace": "Steam-Powered Furnace", - "block.steamadvantage.steam_crusher": "Steam-Powered Rock Crusher", - "block.steamadvantage.drillbit": "Drill", - "block.steamadvantage.steam_drill": "Steam-Powered Drill", - "item.steamadvantage.steam_drill_bit": "Drill Bit", - "block.steamadvantage.steam_elevator": "Steam-Powered Elevator", - "block.steamadvantage.platform": "Steam Elevator Platform", - "item.steamadvantage.blackpowder_cartridge": "Black-Powder Cartridge", - "item.steamadvantage.musket": "Black-Powder Musket", - "block.steamadvantage.steam_track": "Steam Track", - "block.steamadvantage.steam_boiler_electric": "Electric Steam Boiler", - "block.steamadvantage.steam_boiler_geothermal": "Geothermal Steam Boiler", - "block.steamadvantage.steam_switch": "Steam Switch Valve", - "block.steamadvantage.steam_still": "Steam-Powered Still", - "block.steamadvantage.steam_pump": "Steam-Powered Pump", - "block.steamadvantage.steam_boiler_oil": "Oil-Burning Steam Boiler", - "block.steamadvantage.pump_pipe_steam": "Pump Pipe" -} diff --git a/src/main/resources/assets/steamadvantage/lang/en_en.json b/src/main/resources/assets/steamadvantage/lang/en_en.json deleted file mode 100644 index 5c66bc3..0000000 --- a/src/main/resources/assets/steamadvantage/lang/en_en.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "item.steamadvantage.steam_governor.name": "Steam Governor", - "tile.steamadvantage.steam_pipe.name": "Brass Steam Pipe", - "tile.steamadvantage.steam_boiler_coal.name": "Coal-Fired Steam Boiler", - "tile.steamadvantage.steam_tank.name": "Steam Boiler Tank", - "tile.steamadvantage.steam_furnace.name": "Steam-Powered Furnace", - "tile.steamadvantage.steam_crusher.name": "Steam-Powered Rock Crusher", - "tile.steamadvantage.drillbit.name": "Drill", - "tile.steamadvantage.steam_drill.name": "Steam-Powered Drill", - "item.steamadvantage.steam_drill_bit.name": "Drill Bit", - "death.attack.steam_machine": "%1$s was ground between the gears of a machine", - "death.attack.steam_machine.player": "%1$s was fed into the gears of a machine by %2$s", - "tile.steamadvantage.steam_elevator.name": "Steam-Powered Elevator", - "tile.steamadvantage.platform.name": "Steam Elevator Platform", - "death.attack.musket": "%1$s got shot", - "death.attack.musket.player": "%2$s shot %1$s dead", - "item.steamadvantage.blackpowder_cartridge.name": "Black-Powder Cartridge", - "item.steamadvantage.musket.name": "Black-Powder Musket", - "tooltip.musket.damage": "Shot deals %x damage", - "tooltip.musket.ammo": "Requires %x to reload", - "tooltip.musket.loaded": "Loaded", - "tooltip.musket.unloaded": "Not loaded", - "enchantment.powderless": "Powderless", - "enchantment.rapid_reload": "Quick Reload", - "enchantment.high_explosive": "High-Explosive", - "enchantment.recoil": "Recoil", - "tile.steamadvantage.steam_track.name": "Steam Track", - "tile.steamadvantage.steam_boiler_electric.name": "Electric Steam Boiler", - "tile.steamadvantage.steam_boiler_geothermal.name": "Geothermal Steam Boiler", - "tile.steamadvantage.steam_switch.name": "Steam Switch Valve", - "tile.steamadvantage.steam_still.name": "Steam-Powered Still", - "tile.steamadvantage.steam_pump.name": "Steam-Powered Pump", - "tile.steamadvantage.steam_boiler_oil.name": "Oil-Burning Steam Boiler", - "tile.steamadvantage.pump_pipe_steam.name": "Pump Pipe", - "item.steamadvantage.steam_governor": "Steam Governor", - "block.steamadvantage.steam_pipe": "Brass Steam Pipe", - "block.steamadvantage.steam_boiler_coal": "Coal-Fired Steam Boiler", - "block.steamadvantage.steam_tank": "Steam Boiler Tank", - "block.steamadvantage.steam_furnace": "Steam-Powered Furnace", - "block.steamadvantage.steam_crusher": "Steam-Powered Rock Crusher", - "block.steamadvantage.drillbit": "Drill", - "block.steamadvantage.steam_drill": "Steam-Powered Drill", - "item.steamadvantage.steam_drill_bit": "Drill Bit", - "block.steamadvantage.steam_elevator": "Steam-Powered Elevator", - "block.steamadvantage.platform": "Steam Elevator Platform", - "item.steamadvantage.blackpowder_cartridge": "Black-Powder Cartridge", - "item.steamadvantage.musket": "Black-Powder Musket", - "block.steamadvantage.steam_track": "Steam Track", - "block.steamadvantage.steam_boiler_electric": "Electric Steam Boiler", - "block.steamadvantage.steam_boiler_geothermal": "Geothermal Steam Boiler", - "block.steamadvantage.steam_switch": "Steam Switch Valve", - "block.steamadvantage.steam_still": "Steam-Powered Still", - "block.steamadvantage.steam_pump": "Steam-Powered Pump", - "block.steamadvantage.steam_boiler_oil": "Oil-Burning Steam Boiler", - "block.steamadvantage.pump_pipe_steam": "Pump Pipe" -} diff --git a/src/main/resources/assets/steamadvantage/lang/en_gb.json b/src/main/resources/assets/steamadvantage/lang/en_gb.json deleted file mode 100644 index 5c66bc3..0000000 --- a/src/main/resources/assets/steamadvantage/lang/en_gb.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "item.steamadvantage.steam_governor.name": "Steam Governor", - "tile.steamadvantage.steam_pipe.name": "Brass Steam Pipe", - "tile.steamadvantage.steam_boiler_coal.name": "Coal-Fired Steam Boiler", - "tile.steamadvantage.steam_tank.name": "Steam Boiler Tank", - "tile.steamadvantage.steam_furnace.name": "Steam-Powered Furnace", - "tile.steamadvantage.steam_crusher.name": "Steam-Powered Rock Crusher", - "tile.steamadvantage.drillbit.name": "Drill", - "tile.steamadvantage.steam_drill.name": "Steam-Powered Drill", - "item.steamadvantage.steam_drill_bit.name": "Drill Bit", - "death.attack.steam_machine": "%1$s was ground between the gears of a machine", - "death.attack.steam_machine.player": "%1$s was fed into the gears of a machine by %2$s", - "tile.steamadvantage.steam_elevator.name": "Steam-Powered Elevator", - "tile.steamadvantage.platform.name": "Steam Elevator Platform", - "death.attack.musket": "%1$s got shot", - "death.attack.musket.player": "%2$s shot %1$s dead", - "item.steamadvantage.blackpowder_cartridge.name": "Black-Powder Cartridge", - "item.steamadvantage.musket.name": "Black-Powder Musket", - "tooltip.musket.damage": "Shot deals %x damage", - "tooltip.musket.ammo": "Requires %x to reload", - "tooltip.musket.loaded": "Loaded", - "tooltip.musket.unloaded": "Not loaded", - "enchantment.powderless": "Powderless", - "enchantment.rapid_reload": "Quick Reload", - "enchantment.high_explosive": "High-Explosive", - "enchantment.recoil": "Recoil", - "tile.steamadvantage.steam_track.name": "Steam Track", - "tile.steamadvantage.steam_boiler_electric.name": "Electric Steam Boiler", - "tile.steamadvantage.steam_boiler_geothermal.name": "Geothermal Steam Boiler", - "tile.steamadvantage.steam_switch.name": "Steam Switch Valve", - "tile.steamadvantage.steam_still.name": "Steam-Powered Still", - "tile.steamadvantage.steam_pump.name": "Steam-Powered Pump", - "tile.steamadvantage.steam_boiler_oil.name": "Oil-Burning Steam Boiler", - "tile.steamadvantage.pump_pipe_steam.name": "Pump Pipe", - "item.steamadvantage.steam_governor": "Steam Governor", - "block.steamadvantage.steam_pipe": "Brass Steam Pipe", - "block.steamadvantage.steam_boiler_coal": "Coal-Fired Steam Boiler", - "block.steamadvantage.steam_tank": "Steam Boiler Tank", - "block.steamadvantage.steam_furnace": "Steam-Powered Furnace", - "block.steamadvantage.steam_crusher": "Steam-Powered Rock Crusher", - "block.steamadvantage.drillbit": "Drill", - "block.steamadvantage.steam_drill": "Steam-Powered Drill", - "item.steamadvantage.steam_drill_bit": "Drill Bit", - "block.steamadvantage.steam_elevator": "Steam-Powered Elevator", - "block.steamadvantage.platform": "Steam Elevator Platform", - "item.steamadvantage.blackpowder_cartridge": "Black-Powder Cartridge", - "item.steamadvantage.musket": "Black-Powder Musket", - "block.steamadvantage.steam_track": "Steam Track", - "block.steamadvantage.steam_boiler_electric": "Electric Steam Boiler", - "block.steamadvantage.steam_boiler_geothermal": "Geothermal Steam Boiler", - "block.steamadvantage.steam_switch": "Steam Switch Valve", - "block.steamadvantage.steam_still": "Steam-Powered Still", - "block.steamadvantage.steam_pump": "Steam-Powered Pump", - "block.steamadvantage.steam_boiler_oil": "Oil-Burning Steam Boiler", - "block.steamadvantage.pump_pipe_steam": "Pump Pipe" -} diff --git a/src/main/resources/assets/steamadvantage/lang/en_pt.json b/src/main/resources/assets/steamadvantage/lang/en_pt.json deleted file mode 100644 index d3723f4..0000000 --- a/src/main/resources/assets/steamadvantage/lang/en_pt.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", - "item.steamadvantage.steam_governor.name": "Steam Gov'ner", - "tile.steamadvantage.steam_pipe.name": "Brass Pipe", - "tile.steamadvantage.steam_boiler_coal.name": "Boiler", - "tile.steamadvantage.steam_tank.name": "Clockwerk Boiler Tank", - "tile.steamadvantage.steam_furnace.name": "Clockwerk Furnace", - "tile.steamadvantage.steam_crusher.name": "Clockwerk Stone-Chewer", - "tile.steamadvantage.drillbit.name": "Drill", - "tile.steamadvantage.steam_drill.name": "Clockwerk Drill", - "item.steamadvantage.steam_drill_bit.name": "Drill Bit", - "death.attack.steam_machine": "%1$s kissed the iron maiden", - "death.attack.steam_machine.player": "%1$s convinced %2$s to kiss the iron maiden", - "tile.steamadvantage.steam_elevator.name": "Clockwerk Plank-Raiser", - "tile.steamadvantage.platform.name": "Mecha-Plank", - "death.attack.musket": "%1$s got shot", - "death.attack.musket.player": "%2$s filled %1$s full of daylight", - "item.steamadvantage.blackpowder_cartridge.name": "Death Ball", - "item.steamadvantage.musket.name": "Blunderbuss", - "tooltip.musket.damage": "Shot deals %x damage", - "tooltip.musket.ammo": "Requires %x to reload", - "tooltip.musket.loaded": "Loaded", - "tooltip.musket.unloaded": "Not loaded", - "enchantment.powderless": "Unending Glory", - "enchantment.rapid_reload": "Faster Blaster", - "enchantment.high_explosive": "Big Boom", - "enchantment.recoil": "Kickback", - "tile.steamadvantage.steam_track.name": "Steam Path", - "tile.steamadvantage.steam_boiler_electric.name": "Lightnin' Boiler", - "tile.steamadvantage.steam_boiler_geothermal.name": "Lava Boiler", - "tile.steamadvantage.steam_switch.name": "Steam Valve", - "tile.steamadvantage.steam_still.name": "Clockwerk 'Stillery", - "tile.steamadvantage.steam_pump.name": "Clockwerk Bilge Pump", - "tile.steamadvantage.steam_boiler_oil.name": "Oil Boiler", - "tile.steamadvantage.pump_pipe_steam.name": "Pump Pipe", - "item.steamadvantage.steam_governor": "Steam Gov'ner", - "block.steamadvantage.steam_pipe": "Brass Pipe", - "block.steamadvantage.steam_boiler_coal": "Boiler", - "block.steamadvantage.steam_tank": "Clockwerk Boiler Tank", - "block.steamadvantage.steam_furnace": "Clockwerk Furnace", - "block.steamadvantage.steam_crusher": "Clockwerk Stone-Chewer", - "block.steamadvantage.drillbit": "Drill", - "block.steamadvantage.steam_drill": "Clockwerk Drill", - "item.steamadvantage.steam_drill_bit": "Drill Bit", - "block.steamadvantage.steam_elevator": "Clockwerk Plank-Raiser", - "block.steamadvantage.platform": "Mecha-Plank", - "item.steamadvantage.blackpowder_cartridge": "Death Ball", - "item.steamadvantage.musket": "Blunderbuss", - "block.steamadvantage.steam_track": "Steam Path", - "block.steamadvantage.steam_boiler_electric": "Lightnin' Boiler", - "block.steamadvantage.steam_boiler_geothermal": "Lava Boiler", - "block.steamadvantage.steam_switch": "Steam Valve", - "block.steamadvantage.steam_still": "Clockwerk 'Stillery", - "block.steamadvantage.steam_pump": "Clockwerk Bilge Pump", - "block.steamadvantage.steam_boiler_oil": "Oil Boiler", - "block.steamadvantage.pump_pipe_steam": "Pump Pipe" -} diff --git a/src/main/resources/assets/steamadvantage/lang/en_us.json b/src/main/resources/assets/steamadvantage/lang/en_us.json deleted file mode 100644 index 1b47053..0000000 --- a/src/main/resources/assets/steamadvantage/lang/en_us.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", - "item.steamadvantage.steam_governor.name": "Steam Governor", - "tile.steamadvantage.steam_pipe.name": "Brass Steam Pipe", - "tile.steamadvantage.steam_boiler_coal.name": "Coal-Fired Steam Boiler", - "tile.steamadvantage.steam_tank.name": "Steam Boiler Tank", - "tile.steamadvantage.steam_furnace.name": "Steam-Powered Furnace", - "tile.steamadvantage.steam_crusher.name": "Steam-Powered Rock Crusher", - "tile.steamadvantage.drillbit.name": "Drill", - "tile.steamadvantage.steam_drill.name": "Steam-Powered Drill", - "item.steamadvantage.steam_drill_bit.name": "Drill Bit", - "death.attack.steam_machine": "%1$s was ground between the gears of a machine", - "death.attack.steam_machine.player": "%1$s was fed into the gears of a machine by %2$s", - "tile.steamadvantage.steam_elevator.name": "Steam-Powered Elevator", - "tile.steamadvantage.platform.name": "Steam Elevator Platform", - "death.attack.musket": "%1$s got shot", - "death.attack.musket.player": "%2$s shot %1$s dead", - "item.steamadvantage.blackpowder_cartridge.name": "Black-Powder Cartridge", - "item.steamadvantage.musket.name": "Black-Powder Musket", - "tooltip.musket.damage": "Shot deals %x damage", - "tooltip.musket.ammo": "Requires %x to reload", - "tooltip.musket.loaded": "Loaded", - "tooltip.musket.unloaded": "Not loaded", - "enchantment.powderless": "Powderless", - "enchantment.rapid_reload": "Quick Reload", - "enchantment.high_explosive": "High-Explosive", - "enchantment.recoil": "Recoil", - "tile.steamadvantage.steam_track.name": "Steam Track", - "tile.steamadvantage.steam_boiler_electric.name": "Electric Steam Boiler", - "tile.steamadvantage.steam_boiler_geothermal.name": "Geothermal Steam Boiler", - "tile.steamadvantage.steam_switch.name": "Steam Switch Valve", - "tile.steamadvantage.steam_still.name": "Steam-Powered Still", - "tile.steamadvantage.steam_pump.name": "Steam-Powered Pump", - "tile.steamadvantage.steam_boiler_oil.name": "Oil-Burning Steam Boiler", - "tile.steamadvantage.pump_pipe_steam.name": "Pump Pipe", - "item.steamadvantage.steam_governor": "Steam Governor", - "block.steamadvantage.steam_pipe": "Brass Steam Pipe", - "block.steamadvantage.steam_boiler_coal": "Coal-Fired Steam Boiler", - "block.steamadvantage.steam_tank": "Steam Boiler Tank", - "block.steamadvantage.steam_furnace": "Steam-Powered Furnace", - "block.steamadvantage.steam_crusher": "Steam-Powered Rock Crusher", - "block.steamadvantage.drillbit": "Drill", - "block.steamadvantage.steam_drill": "Steam-Powered Drill", - "item.steamadvantage.steam_drill_bit": "Drill Bit", - "block.steamadvantage.steam_elevator": "Steam-Powered Elevator", - "block.steamadvantage.platform": "Steam Elevator Platform", - "item.steamadvantage.blackpowder_cartridge": "Black-Powder Cartridge", - "item.steamadvantage.musket": "Black-Powder Musket", - "block.steamadvantage.steam_track": "Steam Track", - "block.steamadvantage.steam_boiler_electric": "Electric Steam Boiler", - "block.steamadvantage.steam_boiler_geothermal": "Geothermal Steam Boiler", - "block.steamadvantage.steam_switch": "Steam Switch Valve", - "block.steamadvantage.steam_still": "Steam-Powered Still", - "block.steamadvantage.steam_pump": "Steam-Powered Pump", - "block.steamadvantage.steam_boiler_oil": "Oil-Burning Steam Boiler", - "block.steamadvantage.pump_pipe_steam": "Pump Pipe" -} diff --git a/src/main/resources/assets/steamadvantage/lang/es_es.json b/src/main/resources/assets/steamadvantage/lang/es_es.json deleted file mode 100644 index 76dbcb9..0000000 --- a/src/main/resources/assets/steamadvantage/lang/es_es.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", - "item.steamadvantage.steam_governor.name": "Controlar de Vapor", - "tile.steamadvantage.steam_pipe.name": "Latón Tubo de Vapor", - "tile.steamadvantage.steam_boiler_coal.name": "Caldera de Vapor con Carbón", - "tile.steamadvantage.steam_tank.name": "Tanque de Vapor", - "tile.steamadvantage.steam_furnace.name": "Vapor del Horno Accionado", - "tile.steamadvantage.steam_crusher.name": "Vapor Trituradora de Piedra Accionado", - "tile.steamadvantage.drillbit.name": "Broca", - "tile.steamadvantage.steam_drill.name": "Vapor Taladro Accionado", - "item.steamadvantage.steam_drill_bit.name": "Broca", - "death.attack.steam_machine": "%1$s se molió entre los engranajes de una máquina", - "death.attack.steam_machine.player": "%1$s se molió entre los engranajes de una máquina de %2$s", - "tile.steamadvantage.steam_elevator.name": "Ascensor a Vapor", - "tile.steamadvantage.platform.name": "Vapor Plataforma Ascensor", - "death.attack.musket": "%1$s recibió un disparo", - "death.attack.musket.player": "%2$s tiro %1$s muertos", - "item.steamadvantage.blackpowder_cartridge.name": "Cartucho de Pólvora", - "item.steamadvantage.musket.name": "Mosquete", - "tooltip.musket.damage": "Disparo trata %x daños", - "tooltip.musket.ammo": "Requiere %x para recargar", - "tooltip.musket.loaded": "Cargado", - "tooltip.musket.unloaded": "No cargado", - "enchantment.powderless": "Munición Infinita", - "enchantment.rapid_reload": "Rápidamente Actualizar", - "enchantment.high_explosive": "Bomba", - "enchantment.recoil": "Retroceso", - "tile.steamadvantage.steam_track.name": "Vía a Vapor", - "tile.steamadvantage.steam_boiler_electric.name": "Caldera de Vapor Eléctrica", - "tile.steamadvantage.steam_boiler_geothermal.name": "Caldera de Vapor Geotérmico", - "tile.steamadvantage.steam_switch.name": "Válvula de Vapor", - "tile.steamadvantage.steam_still.name": "Vapor Destilería", - "tile.steamadvantage.steam_pump.name": "Vapor de la Bomba Accionada", - "tile.steamadvantage.steam_boiler_oil.name": "Caldera de Vapor con Aceite", - "tile.steamadvantage.pump_pipe_steam.name": "Tubería de la Bomba", - "item.steamadvantage.steam_governor": "Controlar de Vapor", - "block.steamadvantage.steam_pipe": "Latón Tubo de Vapor", - "block.steamadvantage.steam_boiler_coal": "Caldera de Vapor con Carbón", - "block.steamadvantage.steam_tank": "Tanque de Vapor", - "block.steamadvantage.steam_furnace": "Vapor del Horno Accionado", - "block.steamadvantage.steam_crusher": "Vapor Trituradora de Piedra Accionado", - "block.steamadvantage.drillbit": "Broca", - "block.steamadvantage.steam_drill": "Vapor Taladro Accionado", - "item.steamadvantage.steam_drill_bit": "Broca", - "block.steamadvantage.steam_elevator": "Ascensor a Vapor", - "block.steamadvantage.platform": "Vapor Plataforma Ascensor", - "item.steamadvantage.blackpowder_cartridge": "Cartucho de Pólvora", - "item.steamadvantage.musket": "Mosquete", - "block.steamadvantage.steam_track": "Vía a Vapor", - "block.steamadvantage.steam_boiler_electric": "Caldera de Vapor Eléctrica", - "block.steamadvantage.steam_boiler_geothermal": "Caldera de Vapor Geotérmico", - "block.steamadvantage.steam_switch": "Válvula de Vapor", - "block.steamadvantage.steam_still": "Vapor Destilería", - "block.steamadvantage.steam_pump": "Vapor de la Bomba Accionada", - "block.steamadvantage.steam_boiler_oil": "Caldera de Vapor con Aceite", - "block.steamadvantage.pump_pipe_steam": "Tubería de la Bomba" -} diff --git a/src/main/resources/assets/steamadvantage/lang/es_mx.json b/src/main/resources/assets/steamadvantage/lang/es_mx.json deleted file mode 100644 index 76dbcb9..0000000 --- a/src/main/resources/assets/steamadvantage/lang/es_mx.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", - "item.steamadvantage.steam_governor.name": "Controlar de Vapor", - "tile.steamadvantage.steam_pipe.name": "Latón Tubo de Vapor", - "tile.steamadvantage.steam_boiler_coal.name": "Caldera de Vapor con Carbón", - "tile.steamadvantage.steam_tank.name": "Tanque de Vapor", - "tile.steamadvantage.steam_furnace.name": "Vapor del Horno Accionado", - "tile.steamadvantage.steam_crusher.name": "Vapor Trituradora de Piedra Accionado", - "tile.steamadvantage.drillbit.name": "Broca", - "tile.steamadvantage.steam_drill.name": "Vapor Taladro Accionado", - "item.steamadvantage.steam_drill_bit.name": "Broca", - "death.attack.steam_machine": "%1$s se molió entre los engranajes de una máquina", - "death.attack.steam_machine.player": "%1$s se molió entre los engranajes de una máquina de %2$s", - "tile.steamadvantage.steam_elevator.name": "Ascensor a Vapor", - "tile.steamadvantage.platform.name": "Vapor Plataforma Ascensor", - "death.attack.musket": "%1$s recibió un disparo", - "death.attack.musket.player": "%2$s tiro %1$s muertos", - "item.steamadvantage.blackpowder_cartridge.name": "Cartucho de Pólvora", - "item.steamadvantage.musket.name": "Mosquete", - "tooltip.musket.damage": "Disparo trata %x daños", - "tooltip.musket.ammo": "Requiere %x para recargar", - "tooltip.musket.loaded": "Cargado", - "tooltip.musket.unloaded": "No cargado", - "enchantment.powderless": "Munición Infinita", - "enchantment.rapid_reload": "Rápidamente Actualizar", - "enchantment.high_explosive": "Bomba", - "enchantment.recoil": "Retroceso", - "tile.steamadvantage.steam_track.name": "Vía a Vapor", - "tile.steamadvantage.steam_boiler_electric.name": "Caldera de Vapor Eléctrica", - "tile.steamadvantage.steam_boiler_geothermal.name": "Caldera de Vapor Geotérmico", - "tile.steamadvantage.steam_switch.name": "Válvula de Vapor", - "tile.steamadvantage.steam_still.name": "Vapor Destilería", - "tile.steamadvantage.steam_pump.name": "Vapor de la Bomba Accionada", - "tile.steamadvantage.steam_boiler_oil.name": "Caldera de Vapor con Aceite", - "tile.steamadvantage.pump_pipe_steam.name": "Tubería de la Bomba", - "item.steamadvantage.steam_governor": "Controlar de Vapor", - "block.steamadvantage.steam_pipe": "Latón Tubo de Vapor", - "block.steamadvantage.steam_boiler_coal": "Caldera de Vapor con Carbón", - "block.steamadvantage.steam_tank": "Tanque de Vapor", - "block.steamadvantage.steam_furnace": "Vapor del Horno Accionado", - "block.steamadvantage.steam_crusher": "Vapor Trituradora de Piedra Accionado", - "block.steamadvantage.drillbit": "Broca", - "block.steamadvantage.steam_drill": "Vapor Taladro Accionado", - "item.steamadvantage.steam_drill_bit": "Broca", - "block.steamadvantage.steam_elevator": "Ascensor a Vapor", - "block.steamadvantage.platform": "Vapor Plataforma Ascensor", - "item.steamadvantage.blackpowder_cartridge": "Cartucho de Pólvora", - "item.steamadvantage.musket": "Mosquete", - "block.steamadvantage.steam_track": "Vía a Vapor", - "block.steamadvantage.steam_boiler_electric": "Caldera de Vapor Eléctrica", - "block.steamadvantage.steam_boiler_geothermal": "Caldera de Vapor Geotérmico", - "block.steamadvantage.steam_switch": "Válvula de Vapor", - "block.steamadvantage.steam_still": "Vapor Destilería", - "block.steamadvantage.steam_pump": "Vapor de la Bomba Accionada", - "block.steamadvantage.steam_boiler_oil": "Caldera de Vapor con Aceite", - "block.steamadvantage.pump_pipe_steam": "Tubería de la Bomba" -} diff --git a/src/main/resources/assets/steamadvantage/lang/fr_ca.json b/src/main/resources/assets/steamadvantage/lang/fr_ca.json deleted file mode 100644 index 35a5f1a..0000000 --- a/src/main/resources/assets/steamadvantage/lang/fr_ca.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), french (fr_FR,fr_CA), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", - "item.steamadvantage.steam_governor.name": "Régulateur de vapeur", - "tile.steamadvantage.steam_pipe.name": "Tuyau de vapeur en laiton", - "tile.steamadvantage.steam_boiler_coal.name": "Chaudière à vapeur bois-charbon", - "tile.steamadvantage.steam_tank.name": "Réservoir de chaudière à vapeur", - "tile.steamadvantage.steam_furnace.name": "Four alimenté à la vapeur", - "tile.steamadvantage.steam_crusher.name": "Broyeur de roches alimenté à la vapeur", - "tile.steamadvantage.drillbit.name": "Foret", - "tile.steamadvantage.steam_drill.name": "Foret alimenté à la vapeur", - "item.steamadvantage.steam_drill_bit.name": "Morceau de foret", - "death.attack.steam_machine": "%1$s a été écrasé dans les engrenages d'une machine", - "death.attack.steam_machine.player": "%1$s a été poussé dans les engrenages d'une machine par %2$s", - "tile.steamadvantage.steam_elevator.name": "Ascenseur alimenté à la vapeur", - "tile.steamadvantage.platform.name": "Plate-forme ascenceur à vapeur", - "death.attack.musket": "%1$s got shot", - "death.attack.musket.player": "%2$s shot %1$s dead", - "item.steamadvantage.blackpowder_cartridge.name": "Cartouche de poudre noire", - "item.steamadvantage.musket.name": "Mousquet à poudre noire", - "tooltip.musket.damage": "Le tir provoque %x dégats", - "tooltip.musket.ammo": "Demande %x pour recharger", - "tooltip.musket.loaded": "Chargé", - "tooltip.musket.unloaded": "Non chargé", - "enchantment.powderless": "Sans poudre", - "enchantment.rapid_reload": "Rechargement rapide", - "enchantment.high_explosive": "High-Explosif", - "enchantment.recoil": "Recul", - "tile.steamadvantage.steam_track.name": "Trace de vapeur", - "tile.steamadvantage.steam_boiler_electric.name": "Chaudière à Vapeur Électrique", - "tile.steamadvantage.steam_boiler_geothermal.name": "Chaudière à Vapeur Géothermique", - "tile.steamadvantage.steam_switch.name": "Soupape de vapeur", - "tile.steamadvantage.steam_still.name": "Vapeur distillerie alimenté", - "tile.steamadvantage.steam_pump.name": "Vapeur pompe alimentée", - "tile.steamadvantage.steam_boiler_oil.name": "Chaudière à l'huile", - "tile.steamadvantage.pump_pipe_steam.name": "Tubería de la Bomba", - "item.steamadvantage.steam_governor": "Régulateur de vapeur", - "block.steamadvantage.steam_pipe": "Tuyau de vapeur en laiton", - "block.steamadvantage.steam_boiler_coal": "Chaudière à vapeur bois-charbon", - "block.steamadvantage.steam_tank": "Réservoir de chaudière à vapeur", - "block.steamadvantage.steam_furnace": "Four alimenté à la vapeur", - "block.steamadvantage.steam_crusher": "Broyeur de roches alimenté à la vapeur", - "block.steamadvantage.drillbit": "Foret", - "block.steamadvantage.steam_drill": "Foret alimenté à la vapeur", - "item.steamadvantage.steam_drill_bit": "Morceau de foret", - "block.steamadvantage.steam_elevator": "Ascenseur alimenté à la vapeur", - "block.steamadvantage.platform": "Plate-forme ascenceur à vapeur", - "item.steamadvantage.blackpowder_cartridge": "Cartouche de poudre noire", - "item.steamadvantage.musket": "Mousquet à poudre noire", - "block.steamadvantage.steam_track": "Trace de vapeur", - "block.steamadvantage.steam_boiler_electric": "Chaudière à Vapeur Électrique", - "block.steamadvantage.steam_boiler_geothermal": "Chaudière à Vapeur Géothermique", - "block.steamadvantage.steam_switch": "Soupape de vapeur", - "block.steamadvantage.steam_still": "Vapeur distillerie alimenté", - "block.steamadvantage.steam_pump": "Vapeur pompe alimentée", - "block.steamadvantage.steam_boiler_oil": "Chaudière à l'huile", - "block.steamadvantage.pump_pipe_steam": "Tubería de la Bomba" -} diff --git a/src/main/resources/assets/steamadvantage/lang/fr_fr.json b/src/main/resources/assets/steamadvantage/lang/fr_fr.json deleted file mode 100644 index 35a5f1a..0000000 --- a/src/main/resources/assets/steamadvantage/lang/fr_fr.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), french (fr_FR,fr_CA), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", - "item.steamadvantage.steam_governor.name": "Régulateur de vapeur", - "tile.steamadvantage.steam_pipe.name": "Tuyau de vapeur en laiton", - "tile.steamadvantage.steam_boiler_coal.name": "Chaudière à vapeur bois-charbon", - "tile.steamadvantage.steam_tank.name": "Réservoir de chaudière à vapeur", - "tile.steamadvantage.steam_furnace.name": "Four alimenté à la vapeur", - "tile.steamadvantage.steam_crusher.name": "Broyeur de roches alimenté à la vapeur", - "tile.steamadvantage.drillbit.name": "Foret", - "tile.steamadvantage.steam_drill.name": "Foret alimenté à la vapeur", - "item.steamadvantage.steam_drill_bit.name": "Morceau de foret", - "death.attack.steam_machine": "%1$s a été écrasé dans les engrenages d'une machine", - "death.attack.steam_machine.player": "%1$s a été poussé dans les engrenages d'une machine par %2$s", - "tile.steamadvantage.steam_elevator.name": "Ascenseur alimenté à la vapeur", - "tile.steamadvantage.platform.name": "Plate-forme ascenceur à vapeur", - "death.attack.musket": "%1$s got shot", - "death.attack.musket.player": "%2$s shot %1$s dead", - "item.steamadvantage.blackpowder_cartridge.name": "Cartouche de poudre noire", - "item.steamadvantage.musket.name": "Mousquet à poudre noire", - "tooltip.musket.damage": "Le tir provoque %x dégats", - "tooltip.musket.ammo": "Demande %x pour recharger", - "tooltip.musket.loaded": "Chargé", - "tooltip.musket.unloaded": "Non chargé", - "enchantment.powderless": "Sans poudre", - "enchantment.rapid_reload": "Rechargement rapide", - "enchantment.high_explosive": "High-Explosif", - "enchantment.recoil": "Recul", - "tile.steamadvantage.steam_track.name": "Trace de vapeur", - "tile.steamadvantage.steam_boiler_electric.name": "Chaudière à Vapeur Électrique", - "tile.steamadvantage.steam_boiler_geothermal.name": "Chaudière à Vapeur Géothermique", - "tile.steamadvantage.steam_switch.name": "Soupape de vapeur", - "tile.steamadvantage.steam_still.name": "Vapeur distillerie alimenté", - "tile.steamadvantage.steam_pump.name": "Vapeur pompe alimentée", - "tile.steamadvantage.steam_boiler_oil.name": "Chaudière à l'huile", - "tile.steamadvantage.pump_pipe_steam.name": "Tubería de la Bomba", - "item.steamadvantage.steam_governor": "Régulateur de vapeur", - "block.steamadvantage.steam_pipe": "Tuyau de vapeur en laiton", - "block.steamadvantage.steam_boiler_coal": "Chaudière à vapeur bois-charbon", - "block.steamadvantage.steam_tank": "Réservoir de chaudière à vapeur", - "block.steamadvantage.steam_furnace": "Four alimenté à la vapeur", - "block.steamadvantage.steam_crusher": "Broyeur de roches alimenté à la vapeur", - "block.steamadvantage.drillbit": "Foret", - "block.steamadvantage.steam_drill": "Foret alimenté à la vapeur", - "item.steamadvantage.steam_drill_bit": "Morceau de foret", - "block.steamadvantage.steam_elevator": "Ascenseur alimenté à la vapeur", - "block.steamadvantage.platform": "Plate-forme ascenceur à vapeur", - "item.steamadvantage.blackpowder_cartridge": "Cartouche de poudre noire", - "item.steamadvantage.musket": "Mousquet à poudre noire", - "block.steamadvantage.steam_track": "Trace de vapeur", - "block.steamadvantage.steam_boiler_electric": "Chaudière à Vapeur Électrique", - "block.steamadvantage.steam_boiler_geothermal": "Chaudière à Vapeur Géothermique", - "block.steamadvantage.steam_switch": "Soupape de vapeur", - "block.steamadvantage.steam_still": "Vapeur distillerie alimenté", - "block.steamadvantage.steam_pump": "Vapeur pompe alimentée", - "block.steamadvantage.steam_boiler_oil": "Chaudière à l'huile", - "block.steamadvantage.pump_pipe_steam": "Tubería de la Bomba" -} diff --git a/src/main/resources/assets/steamadvantage/lang/it_it.json b/src/main/resources/assets/steamadvantage/lang/it_it.json deleted file mode 100644 index e5a9066..0000000 --- a/src/main/resources/assets/steamadvantage/lang/it_it.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", - "item.steamadvantage.steam_governor.name": "Valvola di Controllo", - "tile.steamadvantage.steam_pipe.name": "Ottone Tubo di Vapore", - "tile.steamadvantage.steam_boiler_coal.name": "Caldaia di Vapore", - "tile.steamadvantage.steam_tank.name": "Carro a Vapore", - "tile.steamadvantage.steam_furnace.name": "Forno a Vapore Alimentata", - "tile.steamadvantage.steam_crusher.name": "Polverizzatore Masso a Vapore Alimentata", - "tile.steamadvantage.drillbit.name": "Trapano", - "tile.steamadvantage.steam_drill.name": "Trapano a Vapore", - "item.steamadvantage.steam_drill_bit.name": "Trapano", - "death.attack.steam_machine": "%1$s è stato macinato tra gli ingranaggi di una macchina", - "death.attack.steam_machine.player": "%1$s è stato macinato tra gli ingranaggi di una macchina di %2$s", - "tile.steamadvantage.steam_elevator.name": "Ascensore a Vapore", - "tile.steamadvantage.platform.name": "Ascensore a Vapore Piattaforma", - "death.attack.musket": "%1$s hanno sparato", - "death.attack.musket.player": "%2$s colpo %1$s morti", - "item.steamadvantage.blackpowder_cartridge.name": "Cartuccia Polvere da Sparo", - "item.steamadvantage.musket.name": "Moschetto", - "tooltip.musket.damage": "Girato occupa %x danni", - "tooltip.musket.ammo": "Richiede %x per ricaricare", - "tooltip.musket.loaded": "Caricato", - "tooltip.musket.unloaded": "Non caricato", - "enchantment.powderless": "Munizioni Infinite", - "enchantment.rapid_reload": "Rapidamente Reload", - "enchantment.high_explosive": "Bomba", - "enchantment.recoil": "Rinculo", - "tile.steamadvantage.steam_track.name": "Pista a Vapore", - "tile.steamadvantage.steam_boiler_electric.name": "Caldaia a Vapore Elettrica", - "tile.steamadvantage.steam_boiler_geothermal.name": "Caldaia a Vapore Geotermico", - "tile.steamadvantage.steam_switch.name": "Valvola del Vapore", - "tile.steamadvantage.steam_still.name": "A Vapore Alimentata Distilleria", - "tile.steamadvantage.steam_pump.name": "Pompa Alimentata a Vapore", - "tile.steamadvantage.steam_boiler_oil.name": "Caldaia ad Olio Combustibile", - "tile.electricadvantage.pump_pipe_steam.name": "Tubo Pompa", - "item.steamadvantage.steam_governor": "Valvola di Controllo", - "block.steamadvantage.steam_pipe": "Ottone Tubo di Vapore", - "block.steamadvantage.steam_boiler_coal": "Caldaia di Vapore", - "block.steamadvantage.steam_tank": "Carro a Vapore", - "block.steamadvantage.steam_furnace": "Forno a Vapore Alimentata", - "block.steamadvantage.steam_crusher": "Polverizzatore Masso a Vapore Alimentata", - "block.steamadvantage.drillbit": "Trapano", - "block.steamadvantage.steam_drill": "Trapano a Vapore", - "item.steamadvantage.steam_drill_bit": "Trapano", - "block.steamadvantage.steam_elevator": "Ascensore a Vapore", - "block.steamadvantage.platform": "Ascensore a Vapore Piattaforma", - "item.steamadvantage.blackpowder_cartridge": "Cartuccia Polvere da Sparo", - "item.steamadvantage.musket": "Moschetto", - "block.steamadvantage.steam_track": "Pista a Vapore", - "block.steamadvantage.steam_boiler_electric": "Caldaia a Vapore Elettrica", - "block.steamadvantage.steam_boiler_geothermal": "Caldaia a Vapore Geotermico", - "block.steamadvantage.steam_switch": "Valvola del Vapore", - "block.steamadvantage.steam_still": "A Vapore Alimentata Distilleria", - "block.steamadvantage.steam_pump": "Pompa Alimentata a Vapore", - "block.steamadvantage.steam_boiler_oil": "Caldaia ad Olio Combustibile" -} diff --git a/src/main/resources/assets/steamadvantage/lang/ja_jp.json b/src/main/resources/assets/steamadvantage/lang/ja_jp.json deleted file mode 100644 index 17f11dd..0000000 --- a/src/main/resources/assets/steamadvantage/lang/ja_jp.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", - "item.steamadvantage.steam_governor.name": "コントロールバルブスチーム", - "tile.steamadvantage.steam_pipe.name": "真鍮蒸気管", - "tile.steamadvantage.steam_boiler_coal.name": "蒸気ボイラ", - "tile.steamadvantage.steam_tank.name": "スチームタンク", - "tile.steamadvantage.steam_furnace.name": "蒸気動力炉", - "tile.steamadvantage.steam_crusher.name": "スチームパワードロッククラッシャー", - "tile.steamadvantage.drillbit.name": "ドリルビット", - "tile.steamadvantage.steam_drill.name": "蒸気ドリル", - "item.steamadvantage.steam_drill_bit.name": "ドリルビット", - "death.attack.steam_machine": "%1$s 機械の歯車の間に粉砕しました", - "death.attack.steam_machine.player": "%1$s %2$s による機械の歯車の間に粉砕し、", - "tile.steamadvantage.steam_elevator.name": "スチームパワードエレベーター", - "tile.steamadvantage.platform.name": "エレベータープラットフォームスチーム", - "death.attack.musket": "%1$sは撃たれました", - "death.attack.musket.player": "%2$sのショット%1$sの死", - "item.steamadvantage.blackpowder_cartridge.name": "火薬カートリッジ", - "item.steamadvantage.musket.name": "マスケット銃", - "tooltip.musket.damage": "ショットは、%x点のダメージを与えます", - "tooltip.musket.ammo": "リロードするには、%xを必要とし", - "tooltip.musket.loaded": "ロードされました", - "tooltip.musket.unloaded": "ロードされていません", - "enchantment.powderless": "無限の弾薬", - "enchantment.rapid_reload": "素早くリロード", - "enchantment.high_explosive": "爆弾", - "enchantment.recoil": "リコイル", - "tile.steamadvantage.steam_track.name": "蒸気トレース", - "tile.steamadvantage.steam_boiler_electric.name": "電気蒸気ボイラ", - "tile.steamadvantage.steam_boiler_geothermal.name": "地熱蒸気ボイラー", - "tile.steamadvantage.steam_switch.name": "蒸気弁", - "tile.steamadvantage.steam_still.name": "蒸気駆動の蒸留所", - "tile.steamadvantage.steam_pump.name": "蒸気駆動のポンプ", - "tile.steamadvantage.steam_boiler_oil.name": "石油燃焼ボイラー", - "tile.steamadvantage.pump_pipe_steam.name": "ポンプ配管", - "item.steamadvantage.steam_governor": "コントロールバルブスチーム", - "block.steamadvantage.steam_pipe": "真鍮蒸気管", - "block.steamadvantage.steam_boiler_coal": "蒸気ボイラ", - "block.steamadvantage.steam_tank": "スチームタンク", - "block.steamadvantage.steam_furnace": "蒸気動力炉", - "block.steamadvantage.steam_crusher": "スチームパワードロッククラッシャー", - "block.steamadvantage.drillbit": "ドリルビット", - "block.steamadvantage.steam_drill": "蒸気ドリル", - "item.steamadvantage.steam_drill_bit": "ドリルビット", - "block.steamadvantage.steam_elevator": "スチームパワードエレベーター", - "block.steamadvantage.platform": "エレベータープラットフォームスチーム", - "item.steamadvantage.blackpowder_cartridge": "火薬カートリッジ", - "item.steamadvantage.musket": "マスケット銃", - "block.steamadvantage.steam_track": "蒸気トレース", - "block.steamadvantage.steam_boiler_electric": "電気蒸気ボイラ", - "block.steamadvantage.steam_boiler_geothermal": "地熱蒸気ボイラー", - "block.steamadvantage.steam_switch": "蒸気弁", - "block.steamadvantage.steam_still": "蒸気駆動の蒸留所", - "block.steamadvantage.steam_pump": "蒸気駆動のポンプ", - "block.steamadvantage.steam_boiler_oil": "石油燃焼ボイラー", - "block.steamadvantage.pump_pipe_steam": "ポンプ配管" -} diff --git a/src/main/resources/assets/steamadvantage/lang/ko_kr.json b/src/main/resources/assets/steamadvantage/lang/ko_kr.json deleted file mode 100644 index 5572ab0..0000000 --- a/src/main/resources/assets/steamadvantage/lang/ko_kr.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", - "item.steamadvantage.steam_governor.name": "제어 밸브 증기", - "tile.steamadvantage.steam_pipe.name": "황동 증기 파이프", - "tile.steamadvantage.steam_boiler_coal.name": "증기 보일러", - "tile.steamadvantage.steam_tank.name": "스팀 탱크", - "tile.steamadvantage.steam_furnace.name": "증기 구동 전기로", - "tile.steamadvantage.steam_crusher.name": "증기 구동 록 크러셔", - "tile.steamadvantage.drillbit.name": "드릴 비트", - "tile.steamadvantage.steam_drill.name": "증기 구동 드릴", - "item.steamadvantage.steam_drill_bit.name": "드릴 비트", - "death.attack.steam_machine": "%1$s 기계의 기어 사이 분쇄", - "death.attack.steam_machine.player": "%1$s %2$s 에 의해 기계의 기어 사이에 분쇄", - "tile.steamadvantage.steam_elevator.name": "증기 구동 엘리베이터", - "tile.steamadvantage.platform.name": "엘리베이터 플랫폼 스팀", - "death.attack.musket": "%1$s는 총에 맞았", - "death.attack.musket.player": "%2$s 샷% %1$s죽은", - "item.steamadvantage.blackpowder_cartridge.name": "화약 카트리지", - "item.steamadvantage.musket.name": "구식 보병 총", - "tooltip.musket.damage": "총 의 %x의 피해를", - "tooltip.musket.ammo": "다시로드 %x를 필요", - "tooltip.musket.loaded": "로드", - "tooltip.musket.unloaded": "로드되지", - "enchantment.powderless": "무한 탄약", - "enchantment.rapid_reload": "신속하게 다시로드", - "enchantment.high_explosive": "폭탄", - "enchantment.recoil": "뒷걸음질", - "tile.steamadvantage.steam_track.name": "증기 선로", - "tile.steamadvantage.steam_boiler_electric.name": "전기 스팀 보일러", - "tile.steamadvantage.steam_boiler_geothermal.name": "지열 증기 보일러", - "tile.steamadvantage.steam_switch.name": "스팀 밸브", - "tile.steamadvantage.steam_still.name": "증기 구동 증류소", - "tile.steamadvantage.steam_pump.name": "증기 구동 펌프", - "tile.steamadvantage.steam_boiler_oil.name": "기름 연소 보일러", - "tile.steamadvantage.pump_pipe_steam.name": "펌프 파이프", - "item.steamadvantage.steam_governor": "제어 밸브 증기", - "block.steamadvantage.steam_pipe": "황동 증기 파이프", - "block.steamadvantage.steam_boiler_coal": "증기 보일러", - "block.steamadvantage.steam_tank": "스팀 탱크", - "block.steamadvantage.steam_furnace": "증기 구동 전기로", - "block.steamadvantage.steam_crusher": "증기 구동 록 크러셔", - "block.steamadvantage.drillbit": "드릴 비트", - "block.steamadvantage.steam_drill": "증기 구동 드릴", - "item.steamadvantage.steam_drill_bit": "드릴 비트", - "block.steamadvantage.steam_elevator": "증기 구동 엘리베이터", - "block.steamadvantage.platform": "엘리베이터 플랫폼 스팀", - "item.steamadvantage.blackpowder_cartridge": "화약 카트리지", - "item.steamadvantage.musket": "구식 보병 총", - "block.steamadvantage.steam_track": "증기 선로", - "block.steamadvantage.steam_boiler_electric": "전기 스팀 보일러", - "block.steamadvantage.steam_boiler_geothermal": "지열 증기 보일러", - "block.steamadvantage.steam_switch": "스팀 밸브", - "block.steamadvantage.steam_still": "증기 구동 증류소", - "block.steamadvantage.steam_pump": "증기 구동 펌프", - "block.steamadvantage.steam_boiler_oil": "기름 연소 보일러", - "block.steamadvantage.pump_pipe_steam": "펌프 파이프" -} diff --git a/src/main/resources/assets/steamadvantage/lang/pt_br.json b/src/main/resources/assets/steamadvantage/lang/pt_br.json deleted file mode 100644 index 5f8396c..0000000 --- a/src/main/resources/assets/steamadvantage/lang/pt_br.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", - "item.steamadvantage.steam_governor.name": "Válvula de Controle de Vapor", - "tile.steamadvantage.steam_pipe.name": "Latão Tubo de Vapor", - "tile.steamadvantage.steam_boiler_coal.name": "Caldeira a Vapor", - "tile.steamadvantage.steam_tank.name": "Tanque Vapor", - "tile.steamadvantage.steam_furnace.name": "Psto Vapor Forno", - "tile.steamadvantage.steam_crusher.name": "Psto Vapor Rocha Afiador", - "tile.steamadvantage.drillbit.name": "Broca", - "tile.steamadvantage.steam_drill.name": "Psto Vapor Broca", - "item.steamadvantage.steam_drill_bit.name": "Broca", - "death.attack.steam_machine": "%1$s was ground between the gears of a machine", - "death.attack.steam_machine.player": "%1$s was fed into the gears of a machine by %2$s", - "tile.steamadvantage.steam_elevator.name": "Vapor Elevador Alimentado", - "tile.steamadvantage.platform.name": "Vapor Elevador Plataforma", - "death.attack.musket": "%1$s foi baleado", - "death.attack.musket.player": "%2$s tiro %1$s mortos", - "item.steamadvantage.blackpowder_cartridge.name": "Pólvora Cartridge", - "item.steamadvantage.musket.name": "Mosquete", - "tooltip.musket.damage": "Plano lida %x danos", - "tooltip.musket.ammo": "Requer %x para recarregar", - "tooltip.musket.loaded": "Carregado", - "tooltip.musket.unloaded": "Não loaded", - "enchantment.powderless": "Infinito Munições", - "enchantment.rapid_reload": "Rapidamente Reload", - "enchantment.high_explosive": "Bomba", - "enchantment.recoil": "Recuo", - "tile.steamadvantage.steam_track.name": "Pista de Vapor", - "tile.steamadvantage.steam_boiler_electric.name": "Caldeira de Vapor Elétrica", - "tile.steamadvantage.steam_boiler_geothermal.name": "Caldeira a Vapor de Lava", - "tile.steamadvantage.steam_switch.name": "Válvula de Vapor", - "tile.steamadvantage.steam_still.name": "Destilaria vapor Alimentado", - "tile.steamadvantage.steam_pump.name": "Pomba de Vapor Alimentado", - "tile.steamadvantage.steam_boiler_oil.name": "Óleo de Caldeira Ardente", - "tile.steamadvantage.pump_pipe_steam.name": "Tubo de Bomba", - "item.steamadvantage.steam_governor": "Válvula de Controle de Vapor", - "block.steamadvantage.steam_pipe": "Latão Tubo de Vapor", - "block.steamadvantage.steam_boiler_coal": "Caldeira a Vapor", - "block.steamadvantage.steam_tank": "Tanque Vapor", - "block.steamadvantage.steam_furnace": "Psto Vapor Forno", - "block.steamadvantage.steam_crusher": "Psto Vapor Rocha Afiador", - "block.steamadvantage.drillbit": "Broca", - "block.steamadvantage.steam_drill": "Psto Vapor Broca", - "item.steamadvantage.steam_drill_bit": "Broca", - "block.steamadvantage.steam_elevator": "Vapor Elevador Alimentado", - "block.steamadvantage.platform": "Vapor Elevador Plataforma", - "item.steamadvantage.blackpowder_cartridge": "Pólvora Cartridge", - "item.steamadvantage.musket": "Mosquete", - "block.steamadvantage.steam_track": "Pista de Vapor", - "block.steamadvantage.steam_boiler_electric": "Caldeira de Vapor Elétrica", - "block.steamadvantage.steam_boiler_geothermal": "Caldeira a Vapor de Lava", - "block.steamadvantage.steam_switch": "Válvula de Vapor", - "block.steamadvantage.steam_still": "Destilaria vapor Alimentado", - "block.steamadvantage.steam_pump": "Pomba de Vapor Alimentado", - "block.steamadvantage.steam_boiler_oil": "Óleo de Caldeira Ardente", - "block.steamadvantage.pump_pipe_steam": "Tubo de Bomba" -} diff --git a/src/main/resources/assets/steamadvantage/lang/zh_cn.json b/src/main/resources/assets/steamadvantage/lang/zh_cn.json deleted file mode 100644 index cec439c..0000000 --- a/src/main/resources/assets/steamadvantage/lang/zh_cn.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "language_support_goals": "english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR)", - "item.steamadvantage.steam_governor.name": "蒸汽調節閥", - "tile.steamadvantage.steam_pipe.name": "黃銅蒸汽管", - "tile.steamadvantage.steam_boiler_coal.name": "蒸汽鍋爐", - "tile.steamadvantage.steam_tank.name": "蒸汽坦克", - "tile.steamadvantage.steam_furnace.name": "蒸汽動力爐", - "tile.steamadvantage.steam_crusher.name": "蒸汽動力岩石破碎機", - "tile.steamadvantage.drillbit.name": "鑽頭", - "tile.steamadvantage.steam_drill.name": "蒸汽動鑽", - "item.steamadvantage.steam_drill_bit.name": "鑽頭", - "death.attack.steam_machine": "%1$s是一台機器的齒輪之間的地面", - "death.attack.steam_machine.player": "%1$s是一機多用%2$s齒輪之間的地面", - "tile.steamadvantage.steam_elevator.name": "蒸汽動力電梯", - "tile.steamadvantage.platform.name": "蒸汽電梯平台", - "death.attack.musket": "%1$s被射殺", - "death.attack.musket.player": "%2$s射門%1$s死了", - "item.steamadvantage.blackpowder_cartridge.name": "火藥盒", - "item.steamadvantage.musket.name": "滑膛槍", - "tooltip.musket.damage": "射擊涉及%x點傷害", - "tooltip.musket.ammo": "需要%x重裝", - "tooltip.musket.loaded": "加載", - "tooltip.musket.unloaded": "未加載", - "enchantment.powderless": "無限彈藥", - "enchantment.rapid_reload": "快速刷新", - "enchantment.high_explosive": "炸彈", - "enchantment.recoil": "後坐力", - "tile.steamadvantage.steam_track.name": "蒸汽路径", - "tile.steamadvantage.steam_boiler_electric.name": "電熱蒸汽鍋爐", - "tile.steamadvantage.steam_boiler_geothermal.name": "地熱蒸汽鍋爐", - "tile.steamadvantage.steam_switch.name": "蒸汽閥", - "tile.steamadvantage.steam_still.name": "蒸汽動力酒廠", - "tile.steamadvantage.steam_pump.name": "蒸汽動力泵", - "tile.steamadvantage.steam_boiler_oil.name": "燃油鍋爐", - "tile.steamadvantage.pump_pipe_steam.name": "泵管", - "item.steamadvantage.steam_governor": "蒸汽調節閥", - "block.steamadvantage.steam_pipe": "黃銅蒸汽管", - "block.steamadvantage.steam_boiler_coal": "蒸汽鍋爐", - "block.steamadvantage.steam_tank": "蒸汽坦克", - "block.steamadvantage.steam_furnace": "蒸汽動力爐", - "block.steamadvantage.steam_crusher": "蒸汽動力岩石破碎機", - "block.steamadvantage.drillbit": "鑽頭", - "block.steamadvantage.steam_drill": "蒸汽動鑽", - "item.steamadvantage.steam_drill_bit": "鑽頭", - "block.steamadvantage.steam_elevator": "蒸汽動力電梯", - "block.steamadvantage.platform": "蒸汽電梯平台", - "item.steamadvantage.blackpowder_cartridge": "火藥盒", - "item.steamadvantage.musket": "滑膛槍", - "block.steamadvantage.steam_track": "蒸汽路径", - "block.steamadvantage.steam_boiler_electric": "電熱蒸汽鍋爐", - "block.steamadvantage.steam_boiler_geothermal": "地熱蒸汽鍋爐", - "block.steamadvantage.steam_switch": "蒸汽閥", - "block.steamadvantage.steam_still": "蒸汽動力酒廠", - "block.steamadvantage.steam_pump": "蒸汽動力泵", - "block.steamadvantage.steam_boiler_oil": "燃油鍋爐", - "block.steamadvantage.pump_pipe_steam": "泵管" -} diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_boiler_coal.json b/src/main/resources/assets/steamadvantage/models/block/steam_boiler_coal.json deleted file mode 100644 index 91b0804..0000000 --- a/src/main/resources/assets/steamadvantage/models/block/steam_boiler_coal.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "steamadvantage:block/steam_machine_base", - "textures": { - "front": "steamadvantage:blocks/coal_boiler_front", - "top": "steamadvantage:materials/bolted_iron", - "bottom": "steamadvantage:materials/bolted_iron", - "back": "steamadvantage:materials/bolted_iron", - "side": "steamadvantage:materials/bolted_iron", - "metal": "steamadvantage:materials/bolted_iron" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_boiler_electric.json b/src/main/resources/assets/steamadvantage/models/block/steam_boiler_electric.json deleted file mode 100644 index 7aa5073..0000000 --- a/src/main/resources/assets/steamadvantage/models/block/steam_boiler_electric.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "steamadvantage:block/steam_machine_base", - "textures": { - "front": "steamadvantage:blocks/electric_boiler_front", - "top": "steamadvantage:materials/bolted_iron", - "bottom": "steamadvantage:materials/bolted_iron", - "back": "steamadvantage:blocks/electric_boiler_back", - "side": "steamadvantage:materials/bolted_iron", - "metal": "steamadvantage:materials/bolted_iron" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_boiler_geothermal.json b/src/main/resources/assets/steamadvantage/models/block/steam_boiler_geothermal.json deleted file mode 100644 index 62f5f42..0000000 --- a/src/main/resources/assets/steamadvantage/models/block/steam_boiler_geothermal.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "steamadvantage:block/steam_machine_base", - "textures": { - "front": "steamadvantage:blocks/geothermal_boiler_side", - "top": "steamadvantage:blocks/geothermal_boiler_top", - "bottom": "steamadvantage:materials/bolted_iron", - "back": "steamadvantage:blocks/geothermal_boiler_side", - "side": "steamadvantage:blocks/geothermal_boiler_side", - "metal": "steamadvantage:materials/bolted_iron" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_crusher.json b/src/main/resources/assets/steamadvantage/models/block/steam_crusher.json deleted file mode 100644 index fe96116..0000000 --- a/src/main/resources/assets/steamadvantage/models/block/steam_crusher.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "steamadvantage:block/steam_machine_base", - "textures": { - "front": "steamadvantage:blocks/rock_crusher_front", - "top": "steamadvantage:blocks/rock_crusher_top", - "bottom": "steamadvantage:materials/bolted_iron", - "back": "steamadvantage:materials/iron", - "side": "steamadvantage:materials/iron", - "metal": "steamadvantage:materials/iron" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_elevator.json b/src/main/resources/assets/steamadvantage/models/block/steam_elevator.json deleted file mode 100644 index 0cee437..0000000 --- a/src/main/resources/assets/steamadvantage/models/block/steam_elevator.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "steamadvantage:block/steam_machine_base", - "textures": { - "front": "steamadvantage:blocks/steam_elevator_side", - "top": "steamadvantage:blocks/platform_top", - "bottom": "steamadvantage:materials/bolted_iron", - "back": "steamadvantage:blocks/steam_elevator_side", - "side": "steamadvantage:blocks/steam_elevator_side", - "metal": "steamadvantage:materials/iron" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_furnace.json b/src/main/resources/assets/steamadvantage/models/block/steam_furnace.json deleted file mode 100644 index bbcb428..0000000 --- a/src/main/resources/assets/steamadvantage/models/block/steam_furnace.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "steamadvantage:block/steam_machine_base", - "textures": { - "front": "steamadvantage:blocks/steam_furnace_front", - "top": "steamadvantage:blocks/steam_furnace_top", - "bottom": "steamadvantage:materials/bolted_iron", - "back": "steamadvantage:materials/iron", - "side": "steamadvantage:materials/iron", - "metal": "steamadvantage:materials/iron" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_0.json b/src/main/resources/assets/steamadvantage/models/block/steam_pipe_0.json deleted file mode 100644 index a35d584..0000000 --- a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_0.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_0", - "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass" - } -} diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_densuw.json b/src/main/resources/assets/steamadvantage/models/block/steam_pipe_densuw.json deleted file mode 100644 index 93ab08d..0000000 --- a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_densuw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_densuw", - "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass" - } -} diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_desuw.json b/src/main/resources/assets/steamadvantage/models/block/steam_pipe_desuw.json deleted file mode 100644 index 4993e67..0000000 --- a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_desuw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_desuw", - "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass" - } -} diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_dnu.json b/src/main/resources/assets/steamadvantage/models/block/steam_pipe_dnu.json deleted file mode 100644 index 4cae90e..0000000 --- a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_dnu.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_dnu", - "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass" - } -} diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_ensw.json b/src/main/resources/assets/steamadvantage/models/block/steam_pipe_ensw.json deleted file mode 100644 index 8ed57c6..0000000 --- a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_ensw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_ensw", - "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass" - } -} diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_n.json b/src/main/resources/assets/steamadvantage/models/block/steam_pipe_n.json deleted file mode 100644 index c1d38d8..0000000 --- a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_n.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_n", - "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass" - } -} diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_ns.json b/src/main/resources/assets/steamadvantage/models/block/steam_pipe_ns.json deleted file mode 100644 index 944b4a0..0000000 --- a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_ns.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_ns", - "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass" - } -} diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_nsuw.json b/src/main/resources/assets/steamadvantage/models/block/steam_pipe_nsuw.json deleted file mode 100644 index 5be9ee5..0000000 --- a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_nsuw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_nsuw", - "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass" - } -} diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_nsw.json b/src/main/resources/assets/steamadvantage/models/block/steam_pipe_nsw.json deleted file mode 100644 index 8c4f15e..0000000 --- a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_nsw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_nsw", - "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass" - } -} diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_nuw.json b/src/main/resources/assets/steamadvantage/models/block/steam_pipe_nuw.json deleted file mode 100644 index 7ee493e..0000000 --- a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_nuw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_nuw", - "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass" - } -} diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_nw.json b/src/main/resources/assets/steamadvantage/models/block/steam_pipe_nw.json deleted file mode 100644 index 0c47c13..0000000 --- a/src/main/resources/assets/steamadvantage/models/block/steam_pipe_nw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_nw", - "textures": { - "texture": "steamadvantage:blocks/steam_pipe", - "particle": "poweradvantage:materials/brass" - } -} diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_pump.json b/src/main/resources/assets/steamadvantage/models/block/steam_pump.json deleted file mode 100644 index 6fd1359..0000000 --- a/src/main/resources/assets/steamadvantage/models/block/steam_pump.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "steamadvantage:block/steam_machine_base", - "textures": { - "front": "steamadvantage:blocks/steam_pump_front", - "top": "steamadvantage:materials/bolted_iron", - "bottom": "steamadvantage:materials/bolted_iron", - "back": "steamadvantage:blocks/steam_pump_side", - "side": "steamadvantage:blocks/steam_pump_side", - "metal": "steamadvantage:materials/bolted_iron" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_switch_off.json b/src/main/resources/assets/steamadvantage/models/block/steam_switch_off.json deleted file mode 100644 index 0240d9c..0000000 --- a/src/main/resources/assets/steamadvantage/models/block/steam_switch_off.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "steamadvantage:blocks/steam_switch_off", - "particle": "steamadvantage:materials/bolted_iron" - } -} diff --git a/src/main/resources/assets/steamadvantage/models/block/steam_switch_on.json b/src/main/resources/assets/steamadvantage/models/block/steam_switch_on.json deleted file mode 100644 index f4b45e8..0000000 --- a/src/main/resources/assets/steamadvantage/models/block/steam_switch_on.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "steamadvantage:blocks/steam_switch_on", - "particle": "steamadvantage:materials/bolted_iron" - } -} diff --git a/src/main/resources/assets/steamadvantage/models/item/blackpowder_cartridge.json b/src/main/resources/assets/steamadvantage/models/item/blackpowder_cartridge.json deleted file mode 100644 index 730d96f..0000000 --- a/src/main/resources/assets/steamadvantage/models/item/blackpowder_cartridge.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "steamadvantage:items/blackpowder_cartridge" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/item/platform.json b/src/main/resources/assets/steamadvantage/models/item/platform.json deleted file mode 100644 index 2008393..0000000 --- a/src/main/resources/assets/steamadvantage/models/item/platform.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "steamadvantage:block/platform3", - "ambientocclusion": false -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/item/pump_pipe_steam.json b/src/main/resources/assets/steamadvantage/models/item/pump_pipe_steam.json deleted file mode 100644 index 097b735..0000000 --- a/src/main/resources/assets/steamadvantage/models/item/pump_pipe_steam.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "poweradvantage:block/fluid_pipe_ns", - "ambientocclusion": false -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/item/steam_boiler_coal.json b/src/main/resources/assets/steamadvantage/models/item/steam_boiler_coal.json deleted file mode 100644 index cfd2a54..0000000 --- a/src/main/resources/assets/steamadvantage/models/item/steam_boiler_coal.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "steamadvantage:block/steam_boiler_coal", - "ambientocclusion": false -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/item/steam_boiler_electric.json b/src/main/resources/assets/steamadvantage/models/item/steam_boiler_electric.json deleted file mode 100644 index 99e828d..0000000 --- a/src/main/resources/assets/steamadvantage/models/item/steam_boiler_electric.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "steamadvantage:block/steam_boiler_electric", - "ambientocclusion": false -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/item/steam_boiler_geothermal.json b/src/main/resources/assets/steamadvantage/models/item/steam_boiler_geothermal.json deleted file mode 100644 index 252dac8..0000000 --- a/src/main/resources/assets/steamadvantage/models/item/steam_boiler_geothermal.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "steamadvantage:block/steam_boiler_geothermal", - "ambientocclusion": false -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/item/steam_boiler_oil.json b/src/main/resources/assets/steamadvantage/models/item/steam_boiler_oil.json deleted file mode 100644 index 08fcfc4..0000000 --- a/src/main/resources/assets/steamadvantage/models/item/steam_boiler_oil.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "steamadvantage:block/steam_boiler_oil", - "ambientocclusion": false -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/item/steam_crusher.json b/src/main/resources/assets/steamadvantage/models/item/steam_crusher.json deleted file mode 100644 index 0c1cc66..0000000 --- a/src/main/resources/assets/steamadvantage/models/item/steam_crusher.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "steamadvantage:block/steam_crusher", - "ambientocclusion": false -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/item/steam_drill.json b/src/main/resources/assets/steamadvantage/models/item/steam_drill.json deleted file mode 100644 index c150718..0000000 --- a/src/main/resources/assets/steamadvantage/models/item/steam_drill.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "steamadvantage:block/steam_drill", - "ambientocclusion": false -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/item/steam_elevator.json b/src/main/resources/assets/steamadvantage/models/item/steam_elevator.json deleted file mode 100644 index 3317c2f..0000000 --- a/src/main/resources/assets/steamadvantage/models/item/steam_elevator.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "steamadvantage:block/steam_elevator", - "ambientocclusion": false -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/item/steam_furnace.json b/src/main/resources/assets/steamadvantage/models/item/steam_furnace.json deleted file mode 100644 index 5c3b783..0000000 --- a/src/main/resources/assets/steamadvantage/models/item/steam_furnace.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "steamadvantage:block/steam_furnace", - "ambientocclusion": false -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/item/steam_pipe.json b/src/main/resources/assets/steamadvantage/models/item/steam_pipe.json deleted file mode 100644 index 9af65b0..0000000 --- a/src/main/resources/assets/steamadvantage/models/item/steam_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "steamadvantage:block/steam_pipe_ns", - "ambientocclusion": false -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/item/steam_pump.json b/src/main/resources/assets/steamadvantage/models/item/steam_pump.json deleted file mode 100644 index 9b2def0..0000000 --- a/src/main/resources/assets/steamadvantage/models/item/steam_pump.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "steamadvantage:block/steam_pump", - "ambientocclusion": false -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/item/steam_still.json b/src/main/resources/assets/steamadvantage/models/item/steam_still.json deleted file mode 100644 index 917f2a8..0000000 --- a/src/main/resources/assets/steamadvantage/models/item/steam_still.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "steamadvantage:block/steam_still", - "ambientocclusion": false -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/item/steam_switch.json b/src/main/resources/assets/steamadvantage/models/item/steam_switch.json deleted file mode 100644 index d8faa25..0000000 --- a/src/main/resources/assets/steamadvantage/models/item/steam_switch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "steamadvantage:block/steam_switch_on" -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/item/steam_tank.json b/src/main/resources/assets/steamadvantage/models/item/steam_tank.json deleted file mode 100644 index 2545a10..0000000 --- a/src/main/resources/assets/steamadvantage/models/item/steam_tank.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "steamadvantage:block/steam_tank" -} \ No newline at end of file diff --git a/src/main/resources/assets/steamadvantage/models/item/steam_track.json b/src/main/resources/assets/steamadvantage/models/item/steam_track.json deleted file mode 100644 index e7664c8..0000000 --- a/src/main/resources/assets/steamadvantage/models/item/steam_track.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "steamadvantage:block/steam_track_ns" -} \ No newline at end of file diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/blackpowder_cartridge.json b/src/main/resources/data/basesteam/advancements/recipes/blackpowder_cartridge.json similarity index 90% rename from src/main/resources/data/steamadvantage/advancements/recipes/blackpowder_cartridge.json rename to src/main/resources/data/basesteam/advancements/recipes/blackpowder_cartridge.json index 87fc6e3..3ec236d 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/blackpowder_cartridge.json +++ b/src/main/resources/data/basesteam/advancements/recipes/blackpowder_cartridge.json @@ -34,7 +34,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:blackpowder_cartridge" + "recipe": "basesteam:blackpowder_cartridge" } } }, @@ -48,7 +48,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:blackpowder_cartridge" + "basesteam:blackpowder_cartridge" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/musket_left_normal.json b/src/main/resources/data/basesteam/advancements/recipes/musket_left_normal.json similarity index 90% rename from src/main/resources/data/steamadvantage/advancements/recipes/musket_left_normal.json rename to src/main/resources/data/basesteam/advancements/recipes/musket_left_normal.json index 904b751..e84231f 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/musket_left_normal.json +++ b/src/main/resources/data/basesteam/advancements/recipes/musket_left_normal.json @@ -34,7 +34,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:musket_left_normal" + "recipe": "basesteam:musket_left_normal" } } }, @@ -48,7 +48,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:musket_left_normal" + "basesteam:musket_left_normal" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/musket_left_tech.json b/src/main/resources/data/basesteam/advancements/recipes/musket_left_tech.json similarity index 91% rename from src/main/resources/data/steamadvantage/advancements/recipes/musket_left_tech.json rename to src/main/resources/data/basesteam/advancements/recipes/musket_left_tech.json index 225dfd3..aa028d5 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/musket_left_tech.json +++ b/src/main/resources/data/basesteam/advancements/recipes/musket_left_tech.json @@ -34,7 +34,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:musket_left_tech" + "recipe": "basesteam:musket_left_tech" } } }, @@ -48,7 +48,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:musket_left_tech" + "basesteam:musket_left_tech" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/musket_right_normal.json b/src/main/resources/data/basesteam/advancements/recipes/musket_right_normal.json similarity index 90% rename from src/main/resources/data/steamadvantage/advancements/recipes/musket_right_normal.json rename to src/main/resources/data/basesteam/advancements/recipes/musket_right_normal.json index d18e04c..b065f75 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/musket_right_normal.json +++ b/src/main/resources/data/basesteam/advancements/recipes/musket_right_normal.json @@ -34,7 +34,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:musket_right_normal" + "recipe": "basesteam:musket_right_normal" } } }, @@ -48,7 +48,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:musket_right_normal" + "basesteam:musket_right_normal" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/musket_right_tech.json b/src/main/resources/data/basesteam/advancements/recipes/musket_right_tech.json similarity index 91% rename from src/main/resources/data/steamadvantage/advancements/recipes/musket_right_tech.json rename to src/main/resources/data/basesteam/advancements/recipes/musket_right_tech.json index 7ad1324..6032428 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/musket_right_tech.json +++ b/src/main/resources/data/basesteam/advancements/recipes/musket_right_tech.json @@ -34,7 +34,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:musket_right_tech" + "recipe": "basesteam:musket_right_tech" } } }, @@ -48,7 +48,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:musket_right_tech" + "basesteam:musket_right_tech" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/steam_boiler_coal.json b/src/main/resources/data/basesteam/advancements/recipes/steam_boiler_coal.json similarity index 92% rename from src/main/resources/data/steamadvantage/advancements/recipes/steam_boiler_coal.json rename to src/main/resources/data/basesteam/advancements/recipes/steam_boiler_coal.json index 5c8cd8d..c5cf8b8 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/steam_boiler_coal.json +++ b/src/main/resources/data/basesteam/advancements/recipes/steam_boiler_coal.json @@ -44,7 +44,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:steam_boiler_coal" + "recipe": "basesteam:steam_boiler_coal" } } }, @@ -59,7 +59,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:steam_boiler_coal" + "basesteam:steam_boiler_coal" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/steam_boiler_electric.json b/src/main/resources/data/basesteam/advancements/recipes/steam_boiler_electric.json similarity index 93% rename from src/main/resources/data/steamadvantage/advancements/recipes/steam_boiler_electric.json rename to src/main/resources/data/basesteam/advancements/recipes/steam_boiler_electric.json index d4256dd..f4ce9ae 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/steam_boiler_electric.json +++ b/src/main/resources/data/basesteam/advancements/recipes/steam_boiler_electric.json @@ -54,7 +54,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:steam_boiler_electric" + "recipe": "basesteam:steam_boiler_electric" } } }, @@ -70,7 +70,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:steam_boiler_electric" + "basesteam:steam_boiler_electric" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/steam_boiler_geothermal.json b/src/main/resources/data/basesteam/advancements/recipes/steam_boiler_geothermal.json similarity index 93% rename from src/main/resources/data/steamadvantage/advancements/recipes/steam_boiler_geothermal.json rename to src/main/resources/data/basesteam/advancements/recipes/steam_boiler_geothermal.json index 5b5241b..5ce1e6b 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/steam_boiler_geothermal.json +++ b/src/main/resources/data/basesteam/advancements/recipes/steam_boiler_geothermal.json @@ -54,7 +54,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:steam_boiler_geothermal" + "recipe": "basesteam:steam_boiler_geothermal" } } }, @@ -70,7 +70,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:steam_boiler_geothermal" + "basesteam:steam_boiler_geothermal" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/steam_boiler_oil.json b/src/main/resources/data/basesteam/advancements/recipes/steam_boiler_oil.json similarity index 93% rename from src/main/resources/data/steamadvantage/advancements/recipes/steam_boiler_oil.json rename to src/main/resources/data/basesteam/advancements/recipes/steam_boiler_oil.json index 81655b4..c5d4872 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/steam_boiler_oil.json +++ b/src/main/resources/data/basesteam/advancements/recipes/steam_boiler_oil.json @@ -54,7 +54,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:steam_boiler_oil" + "recipe": "basesteam:steam_boiler_oil" } } }, @@ -70,7 +70,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:steam_boiler_oil" + "basesteam:steam_boiler_oil" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/steam_crusher.json b/src/main/resources/data/basesteam/advancements/recipes/steam_crusher.json similarity index 94% rename from src/main/resources/data/steamadvantage/advancements/recipes/steam_crusher.json rename to src/main/resources/data/basesteam/advancements/recipes/steam_crusher.json index 877473f..c234146 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/steam_crusher.json +++ b/src/main/resources/data/basesteam/advancements/recipes/steam_crusher.json @@ -54,7 +54,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:steam_crusher" + "recipe": "basesteam:steam_crusher" } } }, @@ -70,7 +70,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:steam_crusher" + "basesteam:steam_crusher" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/steam_drill.json b/src/main/resources/data/basesteam/advancements/recipes/steam_drill.json similarity index 89% rename from src/main/resources/data/steamadvantage/advancements/recipes/steam_drill.json rename to src/main/resources/data/basesteam/advancements/recipes/steam_drill.json index 31bd734..73c757e 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/steam_drill.json +++ b/src/main/resources/data/basesteam/advancements/recipes/steam_drill.json @@ -6,7 +6,7 @@ "conditions": { "items": [ { - "item": "steamadvantage:steam_drill_bit" + "item": "basesteam:steam_drill_bit" } ] } @@ -44,7 +44,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:steam_drill" + "recipe": "basesteam:steam_drill" } } }, @@ -59,7 +59,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:steam_drill" + "basesteam:steam_drill" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/steam_drill_bit.json b/src/main/resources/data/basesteam/advancements/recipes/steam_drill_bit.json similarity index 91% rename from src/main/resources/data/steamadvantage/advancements/recipes/steam_drill_bit.json rename to src/main/resources/data/basesteam/advancements/recipes/steam_drill_bit.json index 7d79943..172d81a 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/steam_drill_bit.json +++ b/src/main/resources/data/basesteam/advancements/recipes/steam_drill_bit.json @@ -34,7 +34,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:steam_drill_bit" + "recipe": "basesteam:steam_drill_bit" } } }, @@ -48,7 +48,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:steam_drill_bit" + "basesteam:steam_drill_bit" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/steam_drill_diamond_pickaxe_normal.json b/src/main/resources/data/basesteam/advancements/recipes/steam_drill_diamond_pickaxe_normal.json similarity index 90% rename from src/main/resources/data/steamadvantage/advancements/recipes/steam_drill_diamond_pickaxe_normal.json rename to src/main/resources/data/basesteam/advancements/recipes/steam_drill_diamond_pickaxe_normal.json index 1c10065..8fb9751 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/steam_drill_diamond_pickaxe_normal.json +++ b/src/main/resources/data/basesteam/advancements/recipes/steam_drill_diamond_pickaxe_normal.json @@ -44,7 +44,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:steam_drill_diamond_pickaxe_normal" + "recipe": "basesteam:steam_drill_diamond_pickaxe_normal" } } }, @@ -59,7 +59,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:steam_drill_diamond_pickaxe_normal" + "basesteam:steam_drill_diamond_pickaxe_normal" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/steam_elevator.json b/src/main/resources/data/basesteam/advancements/recipes/steam_elevator.json similarity index 94% rename from src/main/resources/data/steamadvantage/advancements/recipes/steam_elevator.json rename to src/main/resources/data/basesteam/advancements/recipes/steam_elevator.json index eda9c30..89c7fc4 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/steam_elevator.json +++ b/src/main/resources/data/basesteam/advancements/recipes/steam_elevator.json @@ -54,7 +54,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:steam_elevator" + "recipe": "basesteam:steam_elevator" } } }, @@ -70,7 +70,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:steam_elevator" + "basesteam:steam_elevator" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/steam_furnace.json b/src/main/resources/data/basesteam/advancements/recipes/steam_furnace.json similarity index 93% rename from src/main/resources/data/steamadvantage/advancements/recipes/steam_furnace.json rename to src/main/resources/data/basesteam/advancements/recipes/steam_furnace.json index 7bb33ff..b6cdc35 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/steam_furnace.json +++ b/src/main/resources/data/basesteam/advancements/recipes/steam_furnace.json @@ -44,7 +44,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:steam_furnace" + "recipe": "basesteam:steam_furnace" } } }, @@ -59,7 +59,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:steam_furnace" + "basesteam:steam_furnace" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/steam_governor_apocalyptic.json b/src/main/resources/data/basesteam/advancements/recipes/steam_governor_apocalyptic.json similarity index 89% rename from src/main/resources/data/steamadvantage/advancements/recipes/steam_governor_apocalyptic.json rename to src/main/resources/data/basesteam/advancements/recipes/steam_governor_apocalyptic.json index 7b08fae..5e20e0e 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/steam_governor_apocalyptic.json +++ b/src/main/resources/data/basesteam/advancements/recipes/steam_governor_apocalyptic.json @@ -34,7 +34,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:steam_governor_apocalyptic" + "recipe": "basesteam:steam_governor_apocalyptic" } } }, @@ -48,7 +48,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:steam_governor_apocalyptic" + "basesteam:steam_governor_apocalyptic" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/steam_governor_normal.json b/src/main/resources/data/basesteam/advancements/recipes/steam_governor_normal.json similarity index 87% rename from src/main/resources/data/steamadvantage/advancements/recipes/steam_governor_normal.json rename to src/main/resources/data/basesteam/advancements/recipes/steam_governor_normal.json index a743e6a..72d611a 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/steam_governor_normal.json +++ b/src/main/resources/data/basesteam/advancements/recipes/steam_governor_normal.json @@ -24,7 +24,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:steam_governor_normal" + "recipe": "basesteam:steam_governor_normal" } } }, @@ -37,7 +37,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:steam_governor_normal" + "basesteam:steam_governor_normal" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/steam_governor_tech.json b/src/main/resources/data/basesteam/advancements/recipes/steam_governor_tech.json similarity index 90% rename from src/main/resources/data/steamadvantage/advancements/recipes/steam_governor_tech.json rename to src/main/resources/data/basesteam/advancements/recipes/steam_governor_tech.json index c4fa9fc..b6192ba 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/steam_governor_tech.json +++ b/src/main/resources/data/basesteam/advancements/recipes/steam_governor_tech.json @@ -34,7 +34,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:steam_governor_tech" + "recipe": "basesteam:steam_governor_tech" } } }, @@ -48,7 +48,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:steam_governor_tech" + "basesteam:steam_governor_tech" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/steam_pipe.json b/src/main/resources/data/basesteam/advancements/recipes/steam_pipe.json similarity index 86% rename from src/main/resources/data/steamadvantage/advancements/recipes/steam_pipe.json rename to src/main/resources/data/basesteam/advancements/recipes/steam_pipe.json index 128ed3e..7e3b4ca 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/steam_pipe.json +++ b/src/main/resources/data/basesteam/advancements/recipes/steam_pipe.json @@ -14,7 +14,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:steam_pipe" + "recipe": "basesteam:steam_pipe" } } }, @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:steam_pipe" + "basesteam:steam_pipe" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/steam_pump.json b/src/main/resources/data/basesteam/advancements/recipes/steam_pump.json similarity index 94% rename from src/main/resources/data/steamadvantage/advancements/recipes/steam_pump.json rename to src/main/resources/data/basesteam/advancements/recipes/steam_pump.json index 3e83c88..3d55361 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/steam_pump.json +++ b/src/main/resources/data/basesteam/advancements/recipes/steam_pump.json @@ -54,7 +54,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:steam_pump" + "recipe": "basesteam:steam_pump" } } }, @@ -70,7 +70,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:steam_pump" + "basesteam:steam_pump" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/steam_still.json b/src/main/resources/data/basesteam/advancements/recipes/steam_still.json similarity index 93% rename from src/main/resources/data/steamadvantage/advancements/recipes/steam_still.json rename to src/main/resources/data/basesteam/advancements/recipes/steam_still.json index bff7fde..f6cc61a 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/steam_still.json +++ b/src/main/resources/data/basesteam/advancements/recipes/steam_still.json @@ -44,7 +44,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:steam_still" + "recipe": "basesteam:steam_still" } } }, @@ -59,7 +59,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:steam_still" + "basesteam:steam_still" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/steam_switch.json b/src/main/resources/data/basesteam/advancements/recipes/steam_switch.json similarity index 91% rename from src/main/resources/data/steamadvantage/advancements/recipes/steam_switch.json rename to src/main/resources/data/basesteam/advancements/recipes/steam_switch.json index 6cfb907..824dd7e 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/steam_switch.json +++ b/src/main/resources/data/basesteam/advancements/recipes/steam_switch.json @@ -34,7 +34,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:steam_switch" + "recipe": "basesteam:steam_switch" } } }, @@ -48,7 +48,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:steam_switch" + "basesteam:steam_switch" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/steam_tank.json b/src/main/resources/data/basesteam/advancements/recipes/steam_tank.json similarity index 92% rename from src/main/resources/data/steamadvantage/advancements/recipes/steam_tank.json rename to src/main/resources/data/basesteam/advancements/recipes/steam_tank.json index ad0c1e8..56abcab 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/steam_tank.json +++ b/src/main/resources/data/basesteam/advancements/recipes/steam_tank.json @@ -34,7 +34,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:steam_tank" + "recipe": "basesteam:steam_tank" } } }, @@ -48,7 +48,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:steam_tank" + "basesteam:steam_tank" ] } } diff --git a/src/main/resources/data/steamadvantage/advancements/recipes/steam_track.json b/src/main/resources/data/basesteam/advancements/recipes/steam_track.json similarity index 78% rename from src/main/resources/data/steamadvantage/advancements/recipes/steam_track.json rename to src/main/resources/data/basesteam/advancements/recipes/steam_track.json index 86b973b..80b385c 100644 --- a/src/main/resources/data/steamadvantage/advancements/recipes/steam_track.json +++ b/src/main/resources/data/basesteam/advancements/recipes/steam_track.json @@ -6,7 +6,7 @@ "conditions": { "items": [ { - "item": "steamadvantage:steam_pipe" + "item": "basesteam:steam_pipe" } ] } @@ -16,7 +16,7 @@ "conditions": { "items": [ { - "item": "poweradvantage:steel_frame" + "item": "basepower:steel_frame" } ] } @@ -24,7 +24,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "steamadvantage:steam_track" + "recipe": "basesteam:steam_track" } } }, @@ -37,7 +37,7 @@ ], "rewards": { "recipes": [ - "steamadvantage:steam_track" + "basesteam:steam_track" ] } } diff --git a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_switch.json b/src/main/resources/data/basesteam/loot_tables/blocks/steam_boiler_coal.json similarity index 68% rename from src/main/resources/data/steamadvantage/loot_tables/blocks/steam_switch.json rename to src/main/resources/data/basesteam/loot_tables/blocks/steam_boiler_coal.json index f44009c..f819ea0 100644 --- a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_switch.json +++ b/src/main/resources/data/basesteam/loot_tables/blocks/steam_boiler_coal.json @@ -1,4 +1,4 @@ { "type": "minecraft:block", - "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "steamadvantage:steam_switch"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] + "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "basesteam:steam_boiler_coal"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] } diff --git a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_boiler_oil.json b/src/main/resources/data/basesteam/loot_tables/blocks/steam_boiler_electric.json similarity index 68% rename from src/main/resources/data/steamadvantage/loot_tables/blocks/steam_boiler_oil.json rename to src/main/resources/data/basesteam/loot_tables/blocks/steam_boiler_electric.json index 41f6305..9c2a682 100644 --- a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_boiler_oil.json +++ b/src/main/resources/data/basesteam/loot_tables/blocks/steam_boiler_electric.json @@ -1,4 +1,4 @@ { "type": "minecraft:block", - "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "steamadvantage:steam_boiler_oil"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] + "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "basesteam:steam_boiler_electric"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] } diff --git a/src/main/resources/data/basesteam/loot_tables/blocks/steam_boiler_geothermal.json b/src/main/resources/data/basesteam/loot_tables/blocks/steam_boiler_geothermal.json new file mode 100644 index 0000000..2549b85 --- /dev/null +++ b/src/main/resources/data/basesteam/loot_tables/blocks/steam_boiler_geothermal.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "basesteam:steam_boiler_geothermal"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] +} diff --git a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_track.json b/src/main/resources/data/basesteam/loot_tables/blocks/steam_boiler_oil.json similarity index 68% rename from src/main/resources/data/steamadvantage/loot_tables/blocks/steam_track.json rename to src/main/resources/data/basesteam/loot_tables/blocks/steam_boiler_oil.json index bf38f1f..3a708de 100644 --- a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_track.json +++ b/src/main/resources/data/basesteam/loot_tables/blocks/steam_boiler_oil.json @@ -1,4 +1,4 @@ { "type": "minecraft:block", - "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "steamadvantage:steam_track"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] + "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "basesteam:steam_boiler_oil"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] } diff --git a/src/main/resources/data/basesteam/loot_tables/blocks/steam_crusher.json b/src/main/resources/data/basesteam/loot_tables/blocks/steam_crusher.json new file mode 100644 index 0000000..93c07d5 --- /dev/null +++ b/src/main/resources/data/basesteam/loot_tables/blocks/steam_crusher.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "basesteam:steam_crusher"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] +} diff --git a/src/main/resources/data/basesteam/loot_tables/blocks/steam_drill.json b/src/main/resources/data/basesteam/loot_tables/blocks/steam_drill.json new file mode 100644 index 0000000..8010abf --- /dev/null +++ b/src/main/resources/data/basesteam/loot_tables/blocks/steam_drill.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "basesteam:steam_drill"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] +} diff --git a/src/main/resources/data/basesteam/loot_tables/blocks/steam_elevator.json b/src/main/resources/data/basesteam/loot_tables/blocks/steam_elevator.json new file mode 100644 index 0000000..60cce6e --- /dev/null +++ b/src/main/resources/data/basesteam/loot_tables/blocks/steam_elevator.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "basesteam:steam_elevator"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] +} diff --git a/src/main/resources/data/basesteam/loot_tables/blocks/steam_furnace.json b/src/main/resources/data/basesteam/loot_tables/blocks/steam_furnace.json new file mode 100644 index 0000000..c4892e8 --- /dev/null +++ b/src/main/resources/data/basesteam/loot_tables/blocks/steam_furnace.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "basesteam:steam_furnace"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] +} diff --git a/src/main/resources/data/basesteam/loot_tables/blocks/steam_pipe.json b/src/main/resources/data/basesteam/loot_tables/blocks/steam_pipe.json new file mode 100644 index 0000000..3f13bdf --- /dev/null +++ b/src/main/resources/data/basesteam/loot_tables/blocks/steam_pipe.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "basesteam:steam_pipe"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] +} diff --git a/src/main/resources/data/basesteam/loot_tables/blocks/steam_pump.json b/src/main/resources/data/basesteam/loot_tables/blocks/steam_pump.json new file mode 100644 index 0000000..3ac2804 --- /dev/null +++ b/src/main/resources/data/basesteam/loot_tables/blocks/steam_pump.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "basesteam:steam_pump"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] +} diff --git a/src/main/resources/data/basesteam/loot_tables/blocks/steam_still.json b/src/main/resources/data/basesteam/loot_tables/blocks/steam_still.json new file mode 100644 index 0000000..69aee45 --- /dev/null +++ b/src/main/resources/data/basesteam/loot_tables/blocks/steam_still.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "basesteam:steam_still"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] +} diff --git a/src/main/resources/data/basesteam/loot_tables/blocks/steam_switch.json b/src/main/resources/data/basesteam/loot_tables/blocks/steam_switch.json new file mode 100644 index 0000000..3c1b408 --- /dev/null +++ b/src/main/resources/data/basesteam/loot_tables/blocks/steam_switch.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "basesteam:steam_switch"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] +} diff --git a/src/main/resources/data/basesteam/loot_tables/blocks/steam_tank.json b/src/main/resources/data/basesteam/loot_tables/blocks/steam_tank.json new file mode 100644 index 0000000..9836b86 --- /dev/null +++ b/src/main/resources/data/basesteam/loot_tables/blocks/steam_tank.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "basesteam:steam_tank"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] +} diff --git a/src/main/resources/data/basesteam/loot_tables/blocks/steam_track.json b/src/main/resources/data/basesteam/loot_tables/blocks/steam_track.json new file mode 100644 index 0000000..d754fd5 --- /dev/null +++ b/src/main/resources/data/basesteam/loot_tables/blocks/steam_track.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "basesteam:steam_track"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] +} diff --git a/src/main/resources/data/steamadvantage/loot_tables/chests/advantage_parts.json b/src/main/resources/data/basesteam/loot_tables/chests/advantage_parts.json similarity index 79% rename from src/main/resources/data/steamadvantage/loot_tables/chests/advantage_parts.json rename to src/main/resources/data/basesteam/loot_tables/chests/advantage_parts.json index 0edf0a3..7dc5296 100644 --- a/src/main/resources/data/steamadvantage/loot_tables/chests/advantage_parts.json +++ b/src/main/resources/data/basesteam/loot_tables/chests/advantage_parts.json @@ -10,7 +10,7 @@ }, { "type": "item", - "name": "steamadvantage:steam_governor", + "name": "basesteam:steam_governor", "weight": 50, "functions": [ { @@ -24,7 +24,7 @@ }, { "type": "item", - "name": "steamadvantage:steam_pipe", + "name": "basesteam:steam_pipe", "weight": 25, "functions": [ { @@ -38,7 +38,7 @@ }, { "type": "item", - "name": "steamadvantage:blackpowder_cartridge", + "name": "basesteam:blackpowder_cartridge", "weight": 50, "functions": [ { @@ -52,14 +52,14 @@ }, { "type": "item", - "name": "steamadvantage:musket", - "entryName": "steamadvantage:musket_plain", + "name": "basesteam:musket", + "entryName": "basesteam:musket_plain", "weight": 18 }, { "type": "item", - "name": "steamadvantage:musket", - "entryName": "steamadvantage:musket_enchanted", + "name": "basesteam:musket", + "entryName": "basesteam:musket_enchanted", "weight": 2, "functions": [ { diff --git a/src/main/resources/data/steamadvantage/recipes/blackpowder_cartridge.json b/src/main/resources/data/basesteam/recipes/blackpowder_cartridge.json similarity index 70% rename from src/main/resources/data/steamadvantage/recipes/blackpowder_cartridge.json rename to src/main/resources/data/basesteam/recipes/blackpowder_cartridge.json index f677e54..818807a 100644 --- a/src/main/resources/data/steamadvantage/recipes/blackpowder_cartridge.json +++ b/src/main/resources/data/basesteam/recipes/blackpowder_cartridge.json @@ -17,12 +17,12 @@ } }, "result": { - "item": "steamadvantage:blackpowder_cartridge" + "item": "basesteam:blackpowder_cartridge" }, - "group": "steamadvantage:blackpowder_cartridge", + "group": "basesteam:blackpowder_cartridge", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:nuggets/lead" } ] diff --git a/src/main/resources/data/basesteam/recipes/crushing_steam_boiler_coal.json b/src/main/resources/data/basesteam/recipes/crushing_steam_boiler_coal.json new file mode 100644 index 0000000..918cf76 --- /dev/null +++ b/src/main/resources/data/basesteam/recipes/crushing_steam_boiler_coal.json @@ -0,0 +1,6 @@ +{ + "type": "basemetals:crushing", + "ingredient": { "item": "basesteam:steam_boiler_coal" }, + "result": { "item": "basesteam:steam_governor", "count": 2 }, + "conditions": [{ "type": "basesteam:recipe_mode", "mode": "APOCALYPTIC" }] +} diff --git a/src/main/resources/data/basesteam/recipes/crushing_steam_boiler_electric.json b/src/main/resources/data/basesteam/recipes/crushing_steam_boiler_electric.json new file mode 100644 index 0000000..c661d3d --- /dev/null +++ b/src/main/resources/data/basesteam/recipes/crushing_steam_boiler_electric.json @@ -0,0 +1,6 @@ +{ + "type": "basemetals:crushing", + "ingredient": { "item": "basesteam:steam_boiler_electric" }, + "result": { "item": "basesteam:steam_governor", "count": 2 }, + "conditions": [{ "type": "basesteam:recipe_mode", "mode": "APOCALYPTIC" }] +} diff --git a/src/main/resources/data/basesteam/recipes/crushing_steam_boiler_geothermal.json b/src/main/resources/data/basesteam/recipes/crushing_steam_boiler_geothermal.json new file mode 100644 index 0000000..4d2a82a --- /dev/null +++ b/src/main/resources/data/basesteam/recipes/crushing_steam_boiler_geothermal.json @@ -0,0 +1,6 @@ +{ + "type": "basemetals:crushing", + "ingredient": { "item": "basesteam:steam_boiler_geothermal" }, + "result": { "item": "basesteam:steam_governor", "count": 2 }, + "conditions": [{ "type": "basesteam:recipe_mode", "mode": "APOCALYPTIC" }] +} diff --git a/src/main/resources/data/basesteam/recipes/crushing_steam_crusher.json b/src/main/resources/data/basesteam/recipes/crushing_steam_crusher.json new file mode 100644 index 0000000..731355e --- /dev/null +++ b/src/main/resources/data/basesteam/recipes/crushing_steam_crusher.json @@ -0,0 +1,6 @@ +{ + "type": "basemetals:crushing", + "ingredient": { "item": "basesteam:steam_crusher" }, + "result": { "item": "basesteam:steam_governor", "count": 2 }, + "conditions": [{ "type": "basesteam:recipe_mode", "mode": "APOCALYPTIC" }] +} diff --git a/src/main/resources/data/basesteam/recipes/crushing_steam_drill.json b/src/main/resources/data/basesteam/recipes/crushing_steam_drill.json new file mode 100644 index 0000000..d76272d --- /dev/null +++ b/src/main/resources/data/basesteam/recipes/crushing_steam_drill.json @@ -0,0 +1,6 @@ +{ + "type": "basemetals:crushing", + "ingredient": { "item": "basesteam:steam_drill" }, + "result": { "item": "basesteam:steam_governor", "count": 2 }, + "conditions": [{ "type": "basesteam:recipe_mode", "mode": "APOCALYPTIC" }] +} diff --git a/src/main/resources/data/basesteam/recipes/crushing_steam_elevator.json b/src/main/resources/data/basesteam/recipes/crushing_steam_elevator.json new file mode 100644 index 0000000..e9dc7a6 --- /dev/null +++ b/src/main/resources/data/basesteam/recipes/crushing_steam_elevator.json @@ -0,0 +1,6 @@ +{ + "type": "basemetals:crushing", + "ingredient": { "item": "basesteam:steam_elevator" }, + "result": { "item": "basesteam:steam_governor", "count": 3 }, + "conditions": [{ "type": "basesteam:recipe_mode", "mode": "APOCALYPTIC" }] +} diff --git a/src/main/resources/data/basesteam/recipes/crushing_steam_furnace.json b/src/main/resources/data/basesteam/recipes/crushing_steam_furnace.json new file mode 100644 index 0000000..0c6596b --- /dev/null +++ b/src/main/resources/data/basesteam/recipes/crushing_steam_furnace.json @@ -0,0 +1,6 @@ +{ + "type": "basemetals:crushing", + "ingredient": { "item": "basesteam:steam_furnace" }, + "result": { "item": "basesteam:steam_governor", "count": 2 }, + "conditions": [{ "type": "basesteam:recipe_mode", "mode": "APOCALYPTIC" }] +} diff --git a/src/main/resources/data/basesteam/recipes/crushing_steam_governor.json b/src/main/resources/data/basesteam/recipes/crushing_steam_governor.json new file mode 100644 index 0000000..eca72b2 --- /dev/null +++ b/src/main/resources/data/basesteam/recipes/crushing_steam_governor.json @@ -0,0 +1,6 @@ +{ + "type": "basemetals:crushing", + "ingredient": { "item": "basesteam:steam_governor" }, + "result": { "item": "basepower:sprocket", "count": 2 }, + "conditions": [{ "type": "basesteam:recipe_mode", "mode": "APOCALYPTIC" }] +} diff --git a/src/main/resources/data/basesteam/recipes/crushing_steam_tank.json b/src/main/resources/data/basesteam/recipes/crushing_steam_tank.json new file mode 100644 index 0000000..c3ecfde --- /dev/null +++ b/src/main/resources/data/basesteam/recipes/crushing_steam_tank.json @@ -0,0 +1,6 @@ +{ + "type": "basemetals:crushing", + "ingredient": { "item": "basesteam:steam_tank" }, + "result": { "item": "basesteam:steam_governor" }, + "conditions": [{ "type": "basesteam:recipe_mode", "mode": "APOCALYPTIC" }] +} diff --git a/src/main/resources/data/steamadvantage/recipes/musket_left_normal.json b/src/main/resources/data/basesteam/recipes/musket_left_normal.json similarity index 65% rename from src/main/resources/data/steamadvantage/recipes/musket_left_normal.json rename to src/main/resources/data/basesteam/recipes/musket_left_normal.json index 372ce23..daff48a 100644 --- a/src/main/resources/data/steamadvantage/recipes/musket_left_normal.json +++ b/src/main/resources/data/basesteam/recipes/musket_left_normal.json @@ -16,20 +16,20 @@ } }, "result": { - "item": "steamadvantage:musket" + "item": "basesteam:musket" }, "conditions": [ { - "type": "steamadvantage:recipe_mode", + "type": "basesteam:recipe_mode", "mode": "NORMAL" }, { - "type": "steamadvantage:musket_enabled" + "type": "basesteam:musket_enabled" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/steel" } ], - "group": "steamadvantage:musket" + "group": "basesteam:musket" } diff --git a/src/main/resources/data/steamadvantage/recipes/musket_left_tech.json b/src/main/resources/data/basesteam/recipes/musket_left_tech.json similarity index 66% rename from src/main/resources/data/steamadvantage/recipes/musket_left_tech.json rename to src/main/resources/data/basesteam/recipes/musket_left_tech.json index 86eaea3..ede6426 100644 --- a/src/main/resources/data/steamadvantage/recipes/musket_left_tech.json +++ b/src/main/resources/data/basesteam/recipes/musket_left_tech.json @@ -16,20 +16,20 @@ } }, "result": { - "item": "steamadvantage:musket" + "item": "basesteam:musket" }, "conditions": [ { - "type": "steamadvantage:recipe_mode", + "type": "basesteam:recipe_mode", "mode": "TECH_PROGRESSION" }, { - "type": "steamadvantage:musket_enabled" + "type": "basesteam:musket_enabled" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/steel" } ], - "group": "steamadvantage:musket" + "group": "basesteam:musket" } diff --git a/src/main/resources/data/steamadvantage/recipes/musket_right_normal.json b/src/main/resources/data/basesteam/recipes/musket_right_normal.json similarity index 65% rename from src/main/resources/data/steamadvantage/recipes/musket_right_normal.json rename to src/main/resources/data/basesteam/recipes/musket_right_normal.json index f5a9303..a195847 100644 --- a/src/main/resources/data/steamadvantage/recipes/musket_right_normal.json +++ b/src/main/resources/data/basesteam/recipes/musket_right_normal.json @@ -16,20 +16,20 @@ } }, "result": { - "item": "steamadvantage:musket" + "item": "basesteam:musket" }, "conditions": [ { - "type": "steamadvantage:recipe_mode", + "type": "basesteam:recipe_mode", "mode": "NORMAL" }, { - "type": "steamadvantage:musket_enabled" + "type": "basesteam:musket_enabled" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/steel" } ], - "group": "steamadvantage:musket" + "group": "basesteam:musket" } diff --git a/src/main/resources/data/steamadvantage/recipes/musket_right_tech.json b/src/main/resources/data/basesteam/recipes/musket_right_tech.json similarity index 66% rename from src/main/resources/data/steamadvantage/recipes/musket_right_tech.json rename to src/main/resources/data/basesteam/recipes/musket_right_tech.json index 2ba3b46..8c9650d 100644 --- a/src/main/resources/data/steamadvantage/recipes/musket_right_tech.json +++ b/src/main/resources/data/basesteam/recipes/musket_right_tech.json @@ -16,20 +16,20 @@ } }, "result": { - "item": "steamadvantage:musket" + "item": "basesteam:musket" }, "conditions": [ { - "type": "steamadvantage:recipe_mode", + "type": "basesteam:recipe_mode", "mode": "TECH_PROGRESSION" }, { - "type": "steamadvantage:musket_enabled" + "type": "basesteam:musket_enabled" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/steel" } ], - "group": "steamadvantage:musket" + "group": "basesteam:musket" } diff --git a/src/main/resources/data/steamadvantage/recipes/steam_boiler_coal.json b/src/main/resources/data/basesteam/recipes/steam_boiler_coal.json similarity index 65% rename from src/main/resources/data/steamadvantage/recipes/steam_boiler_coal.json rename to src/main/resources/data/basesteam/recipes/steam_boiler_coal.json index 6db646b..5e8d3f4 100644 --- a/src/main/resources/data/steamadvantage/recipes/steam_boiler_coal.json +++ b/src/main/resources/data/basesteam/recipes/steam_boiler_coal.json @@ -19,24 +19,24 @@ } }, "result": { - "item": "steamadvantage:steam_boiler_coal" + "item": "basesteam:steam_boiler_coal" }, - "group": "steamadvantage:steam_boiler_coal", + "group": "basesteam:steam_boiler_coal", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:conduits/steam" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:governors" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/iron" } ] diff --git a/src/main/resources/data/steamadvantage/recipes/steam_boiler_electric.json b/src/main/resources/data/basesteam/recipes/steam_boiler_electric.json similarity index 66% rename from src/main/resources/data/steamadvantage/recipes/steam_boiler_electric.json rename to src/main/resources/data/basesteam/recipes/steam_boiler_electric.json index 671decc..e522c0c 100644 --- a/src/main/resources/data/steamadvantage/recipes/steam_boiler_electric.json +++ b/src/main/resources/data/basesteam/recipes/steam_boiler_electric.json @@ -23,24 +23,24 @@ } }, "result": { - "item": "steamadvantage:steam_boiler_electric" + "item": "basesteam:steam_boiler_electric" }, - "group": "steamadvantage:steam_boiler_electric", + "group": "basesteam:steam_boiler_electric", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:governors" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/iron" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:wires" } ] diff --git a/src/main/resources/data/steamadvantage/recipes/steam_boiler_geothermal.json b/src/main/resources/data/basesteam/recipes/steam_boiler_geothermal.json similarity index 67% rename from src/main/resources/data/steamadvantage/recipes/steam_boiler_geothermal.json rename to src/main/resources/data/basesteam/recipes/steam_boiler_geothermal.json index 027f7f8..0ed84b3 100644 --- a/src/main/resources/data/steamadvantage/recipes/steam_boiler_geothermal.json +++ b/src/main/resources/data/basesteam/recipes/steam_boiler_geothermal.json @@ -23,24 +23,24 @@ } }, "result": { - "item": "steamadvantage:steam_boiler_geothermal" + "item": "basesteam:steam_boiler_geothermal" }, - "group": "steamadvantage:steam_boiler_geothermal", + "group": "basesteam:steam_boiler_geothermal", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:conduits/steam" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:governors" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/iron" } ] diff --git a/src/main/resources/data/steamadvantage/recipes/steam_boiler_oil.json b/src/main/resources/data/basesteam/recipes/steam_boiler_oil.json similarity index 70% rename from src/main/resources/data/steamadvantage/recipes/steam_boiler_oil.json rename to src/main/resources/data/basesteam/recipes/steam_boiler_oil.json index ffd0c03..9197d3f 100644 --- a/src/main/resources/data/steamadvantage/recipes/steam_boiler_oil.json +++ b/src/main/resources/data/basesteam/recipes/steam_boiler_oil.json @@ -23,20 +23,20 @@ } }, "result": { - "item": "steamadvantage:steam_boiler_oil" + "item": "basesteam:steam_boiler_oil" }, - "group": "steamadvantage:steam_boiler_oil", + "group": "basesteam:steam_boiler_oil", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:governors" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/iron" } ] diff --git a/src/main/resources/data/steamadvantage/recipes/steam_crusher.json b/src/main/resources/data/basesteam/recipes/steam_crusher.json similarity index 69% rename from src/main/resources/data/steamadvantage/recipes/steam_crusher.json rename to src/main/resources/data/basesteam/recipes/steam_crusher.json index a572272..86f52b9 100644 --- a/src/main/resources/data/steamadvantage/recipes/steam_crusher.json +++ b/src/main/resources/data/basesteam/recipes/steam_crusher.json @@ -23,24 +23,24 @@ } }, "result": { - "item": "steamadvantage:steam_crusher" + "item": "basesteam:steam_crusher" }, - "group": "steamadvantage:steam_crusher", + "group": "basesteam:steam_crusher", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:governors" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/iron" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:storage_blocks/steel" } ] diff --git a/src/main/resources/data/steamadvantage/recipes/steam_drill.json b/src/main/resources/data/basesteam/recipes/steam_drill.json similarity index 62% rename from src/main/resources/data/steamadvantage/recipes/steam_drill.json rename to src/main/resources/data/basesteam/recipes/steam_drill.json index f872051..66a8ab0 100644 --- a/src/main/resources/data/steamadvantage/recipes/steam_drill.json +++ b/src/main/resources/data/basesteam/recipes/steam_drill.json @@ -6,7 +6,7 @@ ], "key": { "X": { - "item": "steamadvantage:steam_drill_bit" + "item": "basesteam:steam_drill_bit" }, "g": { "tag": "forge:governors" @@ -19,20 +19,20 @@ } }, "result": { - "item": "steamadvantage:steam_drill" + "item": "basesteam:steam_drill" }, - "group": "steamadvantage:steam_drill", + "group": "basesteam:steam_drill", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:governors" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/iron" } ] diff --git a/src/main/resources/data/steamadvantage/recipes/steam_drill_bit.json b/src/main/resources/data/basesteam/recipes/steam_drill_bit.json similarity index 65% rename from src/main/resources/data/steamadvantage/recipes/steam_drill_bit.json rename to src/main/resources/data/basesteam/recipes/steam_drill_bit.json index 397c0d6..28e9cfd 100644 --- a/src/main/resources/data/steamadvantage/recipes/steam_drill_bit.json +++ b/src/main/resources/data/basesteam/recipes/steam_drill_bit.json @@ -17,20 +17,20 @@ } }, "result": { - "item": "steamadvantage:steam_drill_bit" + "item": "basesteam:steam_drill_bit" }, - "group": "steamadvantage:steam_drill_bit", + "group": "basesteam:steam_drill_bit", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:gems/diamond" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:sprockets" } ] diff --git a/src/main/resources/data/steamadvantage/recipes/steam_drill_diamond_pickaxe_normal.json b/src/main/resources/data/basesteam/recipes/steam_drill_diamond_pickaxe_normal.json similarity index 66% rename from src/main/resources/data/steamadvantage/recipes/steam_drill_diamond_pickaxe_normal.json rename to src/main/resources/data/basesteam/recipes/steam_drill_diamond_pickaxe_normal.json index f718de3..d433383 100644 --- a/src/main/resources/data/steamadvantage/recipes/steam_drill_diamond_pickaxe_normal.json +++ b/src/main/resources/data/basesteam/recipes/steam_drill_diamond_pickaxe_normal.json @@ -19,25 +19,25 @@ } }, "result": { - "item": "steamadvantage:steam_drill" + "item": "basesteam:steam_drill" }, "conditions": [ { - "type": "steamadvantage:recipe_mode", + "type": "basesteam:recipe_mode", "mode": "NORMAL" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:governors" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/iron" } ], - "group": "steamadvantage:steam_drill" + "group": "basesteam:steam_drill" } diff --git a/src/main/resources/data/steamadvantage/recipes/steam_elevator.json b/src/main/resources/data/basesteam/recipes/steam_elevator.json similarity index 68% rename from src/main/resources/data/steamadvantage/recipes/steam_elevator.json rename to src/main/resources/data/basesteam/recipes/steam_elevator.json index cb90152..7b5bc50 100644 --- a/src/main/resources/data/steamadvantage/recipes/steam_elevator.json +++ b/src/main/resources/data/basesteam/recipes/steam_elevator.json @@ -23,24 +23,24 @@ } }, "result": { - "item": "steamadvantage:steam_elevator" + "item": "basesteam:steam_elevator" }, - "group": "steamadvantage:steam_elevator", + "group": "basesteam:steam_elevator", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:governors" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/iron" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:sprockets" } ] diff --git a/src/main/resources/data/steamadvantage/recipes/steam_furnace.json b/src/main/resources/data/basesteam/recipes/steam_furnace.json similarity index 68% rename from src/main/resources/data/steamadvantage/recipes/steam_furnace.json rename to src/main/resources/data/basesteam/recipes/steam_furnace.json index 642b304..7ae6714 100644 --- a/src/main/resources/data/steamadvantage/recipes/steam_furnace.json +++ b/src/main/resources/data/basesteam/recipes/steam_furnace.json @@ -19,20 +19,20 @@ } }, "result": { - "item": "steamadvantage:steam_furnace" + "item": "basesteam:steam_furnace" }, - "group": "steamadvantage:steam_furnace", + "group": "basesteam:steam_furnace", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:governors" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/iron" } ] diff --git a/src/main/resources/data/steamadvantage/recipes/steam_governor_apocalyptic.json b/src/main/resources/data/basesteam/recipes/steam_governor_apocalyptic.json similarity index 65% rename from src/main/resources/data/steamadvantage/recipes/steam_governor_apocalyptic.json rename to src/main/resources/data/basesteam/recipes/steam_governor_apocalyptic.json index 56eb2d9..171a860 100644 --- a/src/main/resources/data/steamadvantage/recipes/steam_governor_apocalyptic.json +++ b/src/main/resources/data/basesteam/recipes/steam_governor_apocalyptic.json @@ -20,25 +20,25 @@ } }, "result": { - "item": "steamadvantage:steam_governor" + "item": "basesteam:steam_governor" }, "conditions": [ { - "type": "steamadvantage:recipe_mode", + "type": "basesteam:recipe_mode", "mode": "APOCALYPTIC" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/brass" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:rods" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:sprockets" } ], - "group": "steamadvantage:steam_governor" + "group": "basesteam:steam_governor" } diff --git a/src/main/resources/data/steamadvantage/recipes/steam_governor_normal.json b/src/main/resources/data/basesteam/recipes/steam_governor_normal.json similarity index 68% rename from src/main/resources/data/steamadvantage/recipes/steam_governor_normal.json rename to src/main/resources/data/basesteam/recipes/steam_governor_normal.json index 6dbea01..230f301 100644 --- a/src/main/resources/data/steamadvantage/recipes/steam_governor_normal.json +++ b/src/main/resources/data/basesteam/recipes/steam_governor_normal.json @@ -20,21 +20,21 @@ } }, "result": { - "item": "steamadvantage:steam_governor" + "item": "basesteam:steam_governor" }, "conditions": [ { - "type": "steamadvantage:recipe_mode", + "type": "basesteam:recipe_mode", "mode": "NORMAL" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/brass" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:nuggets/iron" } ], - "group": "steamadvantage:steam_governor" + "group": "basesteam:steam_governor" } diff --git a/src/main/resources/data/steamadvantage/recipes/steam_governor_tech.json b/src/main/resources/data/basesteam/recipes/steam_governor_tech.json similarity index 65% rename from src/main/resources/data/steamadvantage/recipes/steam_governor_tech.json rename to src/main/resources/data/basesteam/recipes/steam_governor_tech.json index eb07874..c831ace 100644 --- a/src/main/resources/data/steamadvantage/recipes/steam_governor_tech.json +++ b/src/main/resources/data/basesteam/recipes/steam_governor_tech.json @@ -20,25 +20,25 @@ } }, "result": { - "item": "steamadvantage:steam_governor" + "item": "basesteam:steam_governor" }, "conditions": [ { - "type": "steamadvantage:recipe_mode", + "type": "basesteam:recipe_mode", "mode": "TECH_PROGRESSION" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/brass" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:rods" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:sprockets" } ], - "group": "steamadvantage:steam_governor" + "group": "basesteam:steam_governor" } diff --git a/src/main/resources/data/steamadvantage/recipes/steam_pipe.json b/src/main/resources/data/basesteam/recipes/steam_pipe.json similarity index 67% rename from src/main/resources/data/steamadvantage/recipes/steam_pipe.json rename to src/main/resources/data/basesteam/recipes/steam_pipe.json index 5ef549c..d2ee4bf 100644 --- a/src/main/resources/data/steamadvantage/recipes/steam_pipe.json +++ b/src/main/resources/data/basesteam/recipes/steam_pipe.json @@ -11,13 +11,13 @@ } }, "result": { - "item": "steamadvantage:steam_pipe", + "item": "basesteam:steam_pipe", "count": 6 }, - "group": "steamadvantage:steam_pipe", + "group": "basesteam:steam_pipe", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/brass" } ] diff --git a/src/main/resources/data/steamadvantage/recipes/steam_pump.json b/src/main/resources/data/basesteam/recipes/steam_pump.json similarity index 71% rename from src/main/resources/data/steamadvantage/recipes/steam_pump.json rename to src/main/resources/data/basesteam/recipes/steam_pump.json index 8de30eb..a3b22c0 100644 --- a/src/main/resources/data/steamadvantage/recipes/steam_pump.json +++ b/src/main/resources/data/basesteam/recipes/steam_pump.json @@ -23,20 +23,20 @@ } }, "result": { - "item": "steamadvantage:steam_pump" + "item": "basesteam:steam_pump" }, - "group": "steamadvantage:steam_pump", + "group": "basesteam:steam_pump", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:governors" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/iron" } ] diff --git a/src/main/resources/data/steamadvantage/recipes/steam_still.json b/src/main/resources/data/basesteam/recipes/steam_still.json similarity index 71% rename from src/main/resources/data/steamadvantage/recipes/steam_still.json rename to src/main/resources/data/basesteam/recipes/steam_still.json index dbfe1d0..049a2b6 100644 --- a/src/main/resources/data/steamadvantage/recipes/steam_still.json +++ b/src/main/resources/data/basesteam/recipes/steam_still.json @@ -23,20 +23,20 @@ } }, "result": { - "item": "steamadvantage:steam_still" + "item": "basesteam:steam_still" }, - "group": "steamadvantage:steam_still", + "group": "basesteam:steam_still", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:governors" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/iron" } ] diff --git a/src/main/resources/data/steamadvantage/recipes/steam_switch.json b/src/main/resources/data/basesteam/recipes/steam_switch.json similarity index 68% rename from src/main/resources/data/steamadvantage/recipes/steam_switch.json rename to src/main/resources/data/basesteam/recipes/steam_switch.json index 512dbbc..69b8889 100644 --- a/src/main/resources/data/steamadvantage/recipes/steam_switch.json +++ b/src/main/resources/data/basesteam/recipes/steam_switch.json @@ -16,16 +16,16 @@ } }, "result": { - "item": "steamadvantage:steam_switch" + "item": "basesteam:steam_switch" }, - "group": "steamadvantage:steam_switch", + "group": "basesteam:steam_switch", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:conduits/steam" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" } ] diff --git a/src/main/resources/data/steamadvantage/recipes/steam_tank.json b/src/main/resources/data/basesteam/recipes/steam_tank.json similarity index 67% rename from src/main/resources/data/steamadvantage/recipes/steam_tank.json rename to src/main/resources/data/basesteam/recipes/steam_tank.json index 2ec9ff1..acf8b40 100644 --- a/src/main/resources/data/steamadvantage/recipes/steam_tank.json +++ b/src/main/resources/data/basesteam/recipes/steam_tank.json @@ -17,20 +17,20 @@ } }, "result": { - "item": "steamadvantage:steam_tank" + "item": "basesteam:steam_tank" }, - "group": "steamadvantage:steam_tank", + "group": "basesteam:steam_tank", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:conduits/steam" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:governors" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/copper" } ] diff --git a/src/main/resources/data/basesteam/recipes/steam_track.json b/src/main/resources/data/basesteam/recipes/steam_track.json new file mode 100644 index 0000000..725fb3e --- /dev/null +++ b/src/main/resources/data/basesteam/recipes/steam_track.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "basesteam:steam_pipe" + }, + { + "item": "basepower:steel_frame" + } + ], + "result": { + "item": "basesteam:steam_track" + }, + "group": "basesteam:steam_track" +} diff --git a/src/main/resources/data/forge/tags/items/ammo/blackpowder.json b/src/main/resources/data/forge/tags/items/ammo/blackpowder.json index db1807c..53965df 100644 --- a/src/main/resources/data/forge/tags/items/ammo/blackpowder.json +++ b/src/main/resources/data/forge/tags/items/ammo/blackpowder.json @@ -1,4 +1,4 @@ { "replace": false, - "values": ["steamadvantage:blackpowder_cartridge"] + "values": ["basesteam:blackpowder_cartridge"] } diff --git a/src/main/resources/data/forge/tags/items/conduits/steam.json b/src/main/resources/data/forge/tags/items/conduits/steam.json index 28868b7..c9055e2 100644 --- a/src/main/resources/data/forge/tags/items/conduits/steam.json +++ b/src/main/resources/data/forge/tags/items/conduits/steam.json @@ -1,4 +1,4 @@ { "replace": false, - "values": ["steamadvantage:steam_pipe"] + "values": ["basesteam:steam_pipe"] } diff --git a/src/main/resources/data/forge/tags/items/governors/brass.json b/src/main/resources/data/forge/tags/items/governors/brass.json index 1997d16..b37a593 100644 --- a/src/main/resources/data/forge/tags/items/governors/brass.json +++ b/src/main/resources/data/forge/tags/items/governors/brass.json @@ -1,4 +1,4 @@ { "replace": false, - "values": ["steamadvantage:steam_governor"] + "values": ["basesteam:steam_governor"] } diff --git a/src/main/resources/data/forge/tags/items/guns.json b/src/main/resources/data/forge/tags/items/guns.json index ac2e893..92bce1d 100644 --- a/src/main/resources/data/forge/tags/items/guns.json +++ b/src/main/resources/data/forge/tags/items/guns.json @@ -1,4 +1,4 @@ { "replace": false, - "values": ["steamadvantage:musket"] + "values": ["basesteam:musket"] } diff --git a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_boiler_coal.json b/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_boiler_coal.json deleted file mode 100644 index 52d3197..0000000 --- a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_boiler_coal.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "steamadvantage:steam_boiler_coal"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] -} diff --git a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_boiler_electric.json b/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_boiler_electric.json deleted file mode 100644 index 31528b9..0000000 --- a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_boiler_electric.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "steamadvantage:steam_boiler_electric"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] -} diff --git a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_boiler_geothermal.json b/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_boiler_geothermal.json deleted file mode 100644 index 087e912..0000000 --- a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_boiler_geothermal.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "steamadvantage:steam_boiler_geothermal"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] -} diff --git a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_crusher.json b/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_crusher.json deleted file mode 100644 index bbb3022..0000000 --- a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_crusher.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "steamadvantage:steam_crusher"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] -} diff --git a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_drill.json b/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_drill.json deleted file mode 100644 index 24f06cc..0000000 --- a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_drill.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "steamadvantage:steam_drill"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] -} diff --git a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_elevator.json b/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_elevator.json deleted file mode 100644 index 5706289..0000000 --- a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_elevator.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "steamadvantage:steam_elevator"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] -} diff --git a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_furnace.json b/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_furnace.json deleted file mode 100644 index dcebd5b..0000000 --- a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_furnace.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "steamadvantage:steam_furnace"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] -} diff --git a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_pipe.json b/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_pipe.json deleted file mode 100644 index ec6970d..0000000 --- a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_pipe.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "steamadvantage:steam_pipe"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] -} diff --git a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_pump.json b/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_pump.json deleted file mode 100644 index 668b722..0000000 --- a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_pump.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "steamadvantage:steam_pump"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] -} diff --git a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_still.json b/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_still.json deleted file mode 100644 index cc4a602..0000000 --- a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_still.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "steamadvantage:steam_still"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] -} diff --git a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_tank.json b/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_tank.json deleted file mode 100644 index 5aca3a2..0000000 --- a/src/main/resources/data/steamadvantage/loot_tables/blocks/steam_tank.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [{"rolls": 1, "entries": [{"type": "minecraft:item", "name": "steamadvantage:steam_tank"}], "conditions": [{"condition": "minecraft:survives_explosion"}]}] -} diff --git a/src/main/resources/data/steamadvantage/recipes/crushing_steam_boiler_coal.json b/src/main/resources/data/steamadvantage/recipes/crushing_steam_boiler_coal.json deleted file mode 100644 index ea3b7af..0000000 --- a/src/main/resources/data/steamadvantage/recipes/crushing_steam_boiler_coal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { "item": "steamadvantage:steam_boiler_coal" }, - "result": { "item": "steamadvantage:steam_governor", "count": 2 }, - "conditions": [{ "type": "steamadvantage:recipe_mode", "mode": "APOCALYPTIC" }] -} diff --git a/src/main/resources/data/steamadvantage/recipes/crushing_steam_boiler_electric.json b/src/main/resources/data/steamadvantage/recipes/crushing_steam_boiler_electric.json deleted file mode 100644 index e5db1e1..0000000 --- a/src/main/resources/data/steamadvantage/recipes/crushing_steam_boiler_electric.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { "item": "steamadvantage:steam_boiler_electric" }, - "result": { "item": "steamadvantage:steam_governor", "count": 2 }, - "conditions": [{ "type": "steamadvantage:recipe_mode", "mode": "APOCALYPTIC" }] -} diff --git a/src/main/resources/data/steamadvantage/recipes/crushing_steam_boiler_geothermal.json b/src/main/resources/data/steamadvantage/recipes/crushing_steam_boiler_geothermal.json deleted file mode 100644 index eb383af..0000000 --- a/src/main/resources/data/steamadvantage/recipes/crushing_steam_boiler_geothermal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { "item": "steamadvantage:steam_boiler_geothermal" }, - "result": { "item": "steamadvantage:steam_governor", "count": 2 }, - "conditions": [{ "type": "steamadvantage:recipe_mode", "mode": "APOCALYPTIC" }] -} diff --git a/src/main/resources/data/steamadvantage/recipes/crushing_steam_crusher.json b/src/main/resources/data/steamadvantage/recipes/crushing_steam_crusher.json deleted file mode 100644 index ab487f9..0000000 --- a/src/main/resources/data/steamadvantage/recipes/crushing_steam_crusher.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { "item": "steamadvantage:steam_crusher" }, - "result": { "item": "steamadvantage:steam_governor", "count": 2 }, - "conditions": [{ "type": "steamadvantage:recipe_mode", "mode": "APOCALYPTIC" }] -} diff --git a/src/main/resources/data/steamadvantage/recipes/crushing_steam_drill.json b/src/main/resources/data/steamadvantage/recipes/crushing_steam_drill.json deleted file mode 100644 index 033ddb1..0000000 --- a/src/main/resources/data/steamadvantage/recipes/crushing_steam_drill.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { "item": "steamadvantage:steam_drill" }, - "result": { "item": "steamadvantage:steam_governor", "count": 2 }, - "conditions": [{ "type": "steamadvantage:recipe_mode", "mode": "APOCALYPTIC" }] -} diff --git a/src/main/resources/data/steamadvantage/recipes/crushing_steam_elevator.json b/src/main/resources/data/steamadvantage/recipes/crushing_steam_elevator.json deleted file mode 100644 index edc587d..0000000 --- a/src/main/resources/data/steamadvantage/recipes/crushing_steam_elevator.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { "item": "steamadvantage:steam_elevator" }, - "result": { "item": "steamadvantage:steam_governor", "count": 3 }, - "conditions": [{ "type": "steamadvantage:recipe_mode", "mode": "APOCALYPTIC" }] -} diff --git a/src/main/resources/data/steamadvantage/recipes/crushing_steam_furnace.json b/src/main/resources/data/steamadvantage/recipes/crushing_steam_furnace.json deleted file mode 100644 index 17389fd..0000000 --- a/src/main/resources/data/steamadvantage/recipes/crushing_steam_furnace.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { "item": "steamadvantage:steam_furnace" }, - "result": { "item": "steamadvantage:steam_governor", "count": 2 }, - "conditions": [{ "type": "steamadvantage:recipe_mode", "mode": "APOCALYPTIC" }] -} diff --git a/src/main/resources/data/steamadvantage/recipes/crushing_steam_governor.json b/src/main/resources/data/steamadvantage/recipes/crushing_steam_governor.json deleted file mode 100644 index 2c95255..0000000 --- a/src/main/resources/data/steamadvantage/recipes/crushing_steam_governor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { "item": "steamadvantage:steam_governor" }, - "result": { "item": "poweradvantage:sprocket", "count": 2 }, - "conditions": [{ "type": "steamadvantage:recipe_mode", "mode": "APOCALYPTIC" }] -} diff --git a/src/main/resources/data/steamadvantage/recipes/crushing_steam_tank.json b/src/main/resources/data/steamadvantage/recipes/crushing_steam_tank.json deleted file mode 100644 index 5cadc84..0000000 --- a/src/main/resources/data/steamadvantage/recipes/crushing_steam_tank.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { "item": "steamadvantage:steam_tank" }, - "result": { "item": "steamadvantage:steam_governor" }, - "conditions": [{ "type": "steamadvantage:recipe_mode", "mode": "APOCALYPTIC" }] -} diff --git a/src/main/resources/data/steamadvantage/recipes/steam_track.json b/src/main/resources/data/steamadvantage/recipes/steam_track.json deleted file mode 100644 index fd4546c..0000000 --- a/src/main/resources/data/steamadvantage/recipes/steam_track.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "steamadvantage:steam_pipe" - }, - { - "item": "poweradvantage:steel_frame" - } - ], - "result": { - "item": "steamadvantage:steam_track" - }, - "group": "steamadvantage:steam_track" -} diff --git a/src/test/java/zone/moddev/mc/steamadvantage/blocks/DrillBitPersistenceTest.java b/src/test/java/zone/moddev/mc/basesteam/blocks/DrillBitPersistenceTest.java similarity index 97% rename from src/test/java/zone/moddev/mc/steamadvantage/blocks/DrillBitPersistenceTest.java rename to src/test/java/zone/moddev/mc/basesteam/blocks/DrillBitPersistenceTest.java index 5fa588d..eebbe18 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/blocks/DrillBitPersistenceTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/blocks/DrillBitPersistenceTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.blocks; +package zone.moddev.mc.basesteam.blocks; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.Direction; diff --git a/src/test/java/zone/moddev/mc/steamadvantage/gui/GUIHelperTest.java b/src/test/java/zone/moddev/mc/basesteam/gui/GUIHelperTest.java similarity index 96% rename from src/test/java/zone/moddev/mc/steamadvantage/gui/GUIHelperTest.java rename to src/test/java/zone/moddev/mc/basesteam/gui/GUIHelperTest.java index 6e4be43..207fd50 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/gui/GUIHelperTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/gui/GUIHelperTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import java.lang.reflect.Method; import org.junit.Test; diff --git a/src/test/java/zone/moddev/mc/steamadvantage/items/MusketLoadedCartridgeTest.java b/src/test/java/zone/moddev/mc/basesteam/items/MusketLoadedCartridgeTest.java similarity index 96% rename from src/test/java/zone/moddev/mc/steamadvantage/items/MusketLoadedCartridgeTest.java rename to src/test/java/zone/moddev/mc/basesteam/items/MusketLoadedCartridgeTest.java index c2e1547..a02c408 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/items/MusketLoadedCartridgeTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/items/MusketLoadedCartridgeTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.items; +package zone.moddev.mc.basesteam.items; import java.io.InputStream; import java.util.ArrayList; @@ -56,7 +56,7 @@ public class MusketLoadedCartridgeTest { private static String guardResult(ItemStack stack, boolean hasAmmo, Hand hand) throws Exception { ClassNode node = new ClassNode(); try (InputStream input = MusketLoadedCartridgeTest.class.getResourceAsStream( - "/zone/moddev/mc/steamadvantage/items/MusketItem.class")) { + "/zone/moddev/mc/basesteam/items/MusketItem.class")) { assertNotNull(input); new ClassReader(input).accept(node, 0); } @@ -105,7 +105,7 @@ private static String guardResult(ItemStack stack, boolean hasAmmo, Hand hand) t assertSame(locals[2], pop(operands)); operands.add(stack); } else if (call.name.equals("isNotLoaded")) { - assertEquals("zone/moddev/mc/steamadvantage/items/MusketItem", call.owner); + assertEquals("zone/moddev/mc/basesteam/items/MusketItem", call.owner); operands.add(MusketItem.isNotLoaded((ItemStack) pop(operands))); } else if (call.name.equals("hasAmmo")) { assertSame(stack, pop(operands)); diff --git a/src/test/java/zone/moddev/mc/steamadvantage/items/MusketPersistenceTest.java b/src/test/java/zone/moddev/mc/basesteam/items/MusketPersistenceTest.java similarity index 97% rename from src/test/java/zone/moddev/mc/steamadvantage/items/MusketPersistenceTest.java rename to src/test/java/zone/moddev/mc/basesteam/items/MusketPersistenceTest.java index 8a491f5..ac8aa1d 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/items/MusketPersistenceTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/items/MusketPersistenceTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.items; +package zone.moddev.mc.basesteam.items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; diff --git a/src/test/java/zone/moddev/mc/steamadvantage/items/MusketTargetingContractTest.java b/src/test/java/zone/moddev/mc/basesteam/items/MusketTargetingContractTest.java similarity index 97% rename from src/test/java/zone/moddev/mc/steamadvantage/items/MusketTargetingContractTest.java rename to src/test/java/zone/moddev/mc/basesteam/items/MusketTargetingContractTest.java index 82e7eae..082c0c4 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/items/MusketTargetingContractTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/items/MusketTargetingContractTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.items; +package zone.moddev.mc.basesteam.items; import java.io.InputStream; import java.util.Optional; @@ -50,7 +50,7 @@ public class MusketTargetingContractTest { @Test public void targetingUsesLoadedServerEntitiesAndTerrainBeforeEntitySelection() throws Exception { ClassNode node = new ClassNode(); - try (InputStream input = getClass().getResourceAsStream("/zone/moddev/mc/steamadvantage/items/MusketItem.class")) { + try (InputStream input = getClass().getResourceAsStream("/zone/moddev/mc/basesteam/items/MusketItem.class")) { assertNotNull(input); new ClassReader(input).accept(node, 0); } diff --git a/src/test/java/zone/moddev/mc/steamadvantage/machines/CoalBoilerFillPersistenceTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/CoalBoilerFillPersistenceTest.java similarity index 96% rename from src/test/java/zone/moddev/mc/steamadvantage/machines/CoalBoilerFillPersistenceTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/CoalBoilerFillPersistenceTest.java index 2c62fed..a2d1d61 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/machines/CoalBoilerFillPersistenceTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/CoalBoilerFillPersistenceTest.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import static org.junit.Assert.*; import cyano.poweradvantage.api.ConduitType; -import zone.moddev.mc.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.init.Fluids; import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; import cyano.poweradvantage.api.fluid.FluidStack; @@ -14,8 +14,8 @@ public class CoalBoilerFillPersistenceTest { @BeforeClass public static void bootstrap() { net.minecraft.util.registry.Bootstrap.register(); - if (zone.moddev.mc.steamadvantage.init.Entities.STEAM_BOILER_COAL == null) - zone.moddev.mc.steamadvantage.init.Entities.STEAM_BOILER_COAL = net.minecraft.tileentity.TileEntityType.Builder.create(CoalBoilerTileEntity::new, net.minecraft.block.Blocks.STONE).build(null); + if (zone.moddev.mc.basesteam.init.Entities.STEAM_BOILER_COAL == null) + zone.moddev.mc.basesteam.init.Entities.STEAM_BOILER_COAL = net.minecraft.tileentity.TileEntityType.Builder.create(CoalBoilerTileEntity::new, net.minecraft.block.Blocks.STONE).build(null); } @Test public void acceptingTheLastFiveMillibucketsRequestsSavingBeforeAnyTick() { diff --git a/src/test/java/zone/moddev/mc/steamadvantage/machines/RockCrusherComparatorTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/RockCrusherComparatorTest.java similarity index 75% rename from src/test/java/zone/moddev/mc/steamadvantage/machines/RockCrusherComparatorTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/RockCrusherComparatorTest.java index ae42364..6a4395d 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/machines/RockCrusherComparatorTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/RockCrusherComparatorTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import static org.junit.Assert.assertEquals; import net.minecraft.item.ItemStack; @@ -9,8 +9,8 @@ public class RockCrusherComparatorTest { @BeforeClass public static void bootstrap() { net.minecraft.util.registry.Bootstrap.register(); - if (zone.moddev.mc.steamadvantage.init.Entities.STEAM_CRUSHER == null) - zone.moddev.mc.steamadvantage.init.Entities.STEAM_CRUSHER = net.minecraft.tileentity.TileEntityType.Builder.create(RockCrusherTileEntity::new, net.minecraft.block.Blocks.STONE).build(null); + if (zone.moddev.mc.basesteam.init.Entities.STEAM_CRUSHER == null) + zone.moddev.mc.basesteam.init.Entities.STEAM_CRUSHER = net.minecraft.tileentity.TileEntityType.Builder.create(RockCrusherTileEntity::new, net.minecraft.block.Blocks.STONE).build(null); } @Test public void emptyInputHasNoComparatorSignal() { assertSignal(0, 0); } @Test public void oneItemGivesSignalOne() { assertSignal(1, 1); } diff --git a/src/test/java/zone/moddev/mc/steamadvantage/machines/RockCrusherReloadRedstoneTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/RockCrusherReloadRedstoneTest.java similarity index 85% rename from src/test/java/zone/moddev/mc/steamadvantage/machines/RockCrusherReloadRedstoneTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/RockCrusherReloadRedstoneTest.java index 462a87a..6bc17a7 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/machines/RockCrusherReloadRedstoneTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/RockCrusherReloadRedstoneTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import static org.junit.Assert.*; import java.lang.reflect.Field; @@ -11,10 +11,10 @@ public class RockCrusherReloadRedstoneTest { @BeforeClass public static void bootstrap() { net.minecraft.util.registry.Bootstrap.register(); - if (zone.moddev.mc.steamadvantage.init.Entities.STEAM_CRUSHER == null) - zone.moddev.mc.steamadvantage.init.Entities.STEAM_CRUSHER = net.minecraft.tileentity.TileEntityType.Builder.create(RockCrusherTileEntity::new, net.minecraft.block.Blocks.STONE).build(null); - if (zone.moddev.mc.steamadvantage.init.Entities.STEAM_FURNACE == null) - zone.moddev.mc.steamadvantage.init.Entities.STEAM_FURNACE = net.minecraft.tileentity.TileEntityType.Builder.create(BlastFurnaceTileEntity::new, net.minecraft.block.Blocks.STONE).build(null); + if (zone.moddev.mc.basesteam.init.Entities.STEAM_CRUSHER == null) + zone.moddev.mc.basesteam.init.Entities.STEAM_CRUSHER = net.minecraft.tileentity.TileEntityType.Builder.create(RockCrusherTileEntity::new, net.minecraft.block.Blocks.STONE).build(null); + if (zone.moddev.mc.basesteam.init.Entities.STEAM_FURNACE == null) + zone.moddev.mc.basesteam.init.Entities.STEAM_FURNACE = net.minecraft.tileentity.TileEntityType.Builder.create(BlastFurnaceTileEntity::new, net.minecraft.block.Blocks.STONE).build(null); } @Test public void resumedWorkCannotBeDecrementedBeforeTheFirstLiveControlSample() throws Exception { diff --git a/src/test/java/zone/moddev/mc/steamadvantage/machines/SteamDrillPersistenceTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/SteamDrillPersistenceTest.java similarity index 98% rename from src/test/java/zone/moddev/mc/steamadvantage/machines/SteamDrillPersistenceTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/SteamDrillPersistenceTest.java index 6fd6c4f..fb8421b 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/machines/SteamDrillPersistenceTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/SteamDrillPersistenceTest.java @@ -1,11 +1,11 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import java.lang.reflect.Field; import java.io.InputStream; import java.lang.reflect.Method; diff --git a/src/test/java/zone/moddev/mc/steamadvantage/machines/SteamOperationalPumpSourceTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/SteamOperationalPumpSourceTest.java similarity index 97% rename from src/test/java/zone/moddev/mc/steamadvantage/machines/SteamOperationalPumpSourceTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/SteamOperationalPumpSourceTest.java index d6db645..4d76347 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/machines/SteamOperationalPumpSourceTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/SteamOperationalPumpSourceTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import java.io.InputStream; import java.lang.reflect.Proxy; @@ -81,7 +81,7 @@ public class SteamOperationalPumpSourceTest { @Test public void pumpUsesNativePickupBeforeCreditWithoutDestructiveFallback() throws Exception { ClassNode node = new ClassNode(); try (InputStream input = getClass().getResourceAsStream( - "/zone/moddev/mc/steamadvantage/machines/SteamPumpTileEntity.class")) { + "/zone/moddev/mc/basesteam/machines/SteamPumpTileEntity.class")) { assertNotNull(input); new ClassReader(input).accept(node, 0); } @@ -121,7 +121,7 @@ public class SteamOperationalPumpSourceTest { @Test public void rejectedNeighborFillDoesNotDrainOneMillibucket() throws Exception { ClassNode node = new ClassNode(); try (InputStream input = getClass().getResourceAsStream( - "/zone/moddev/mc/steamadvantage/machines/SteamPumpTileEntity.class")) { + "/zone/moddev/mc/basesteam/machines/SteamPumpTileEntity.class")) { assertNotNull(input); new ClassReader(input).accept(node, 0); } diff --git a/src/test/java/zone/moddev/mc/steamadvantage/machines/SteamOperationalStillCapacityTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/SteamOperationalStillCapacityTest.java similarity index 93% rename from src/test/java/zone/moddev/mc/steamadvantage/machines/SteamOperationalStillCapacityTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/SteamOperationalStillCapacityTest.java index 9fb503d..f2af597 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/machines/SteamOperationalStillCapacityTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/SteamOperationalStillCapacityTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.fluid.FluidStack; import java.lang.reflect.Method; @@ -7,9 +7,9 @@ import net.minecraft.tileentity.TileEntityType; import org.junit.BeforeClass; import org.junit.Test; -import zone.moddev.mc.poweradvantage.registry.still.recipe.DistillationRecipe; -import zone.moddev.mc.poweradvantage.registry.still.recipe.ExplicitFluidReference; -import zone.moddev.mc.steamadvantage.init.Entities; +import zone.moddev.mc.basepower.registry.still.recipe.DistillationRecipe; +import zone.moddev.mc.basepower.registry.still.recipe.ExplicitFluidReference; +import zone.moddev.mc.basesteam.init.Entities; import static org.junit.Assert.*; /** Pure capacity planning; native operating regressions live in SteamOperationalCases. */ diff --git a/src/test/java/zone/moddev/mc/steamadvantage/machines/WaterBoilerFluidBoundaryTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/WaterBoilerFluidBoundaryTest.java similarity index 88% rename from src/test/java/zone/moddev/mc/steamadvantage/machines/WaterBoilerFluidBoundaryTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/WaterBoilerFluidBoundaryTest.java index 1085312..97ed898 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/machines/WaterBoilerFluidBoundaryTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/WaterBoilerFluidBoundaryTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import static org.junit.Assert.*; import java.lang.reflect.Method; @@ -26,12 +26,12 @@ public static Collection boilers() { public WaterBoilerFluidBoundaryTest(Class type) { this.type = type; } @BeforeClass public static void bootstrap() { net.minecraft.util.registry.Bootstrap.register(); - if (zone.moddev.mc.steamadvantage.init.Entities.STEAM_BOILER_COAL == null) - zone.moddev.mc.steamadvantage.init.Entities.STEAM_BOILER_COAL = net.minecraft.tileentity.TileEntityType.Builder.create(CoalBoilerTileEntity::new, net.minecraft.block.Blocks.STONE).build(null); - if (zone.moddev.mc.steamadvantage.init.Entities.STEAM_BOILER_ELECTRIC == null) - zone.moddev.mc.steamadvantage.init.Entities.STEAM_BOILER_ELECTRIC = net.minecraft.tileentity.TileEntityType.Builder.create(ElectricBoilerTileEntity::new, net.minecraft.block.Blocks.STONE).build(null); - if (zone.moddev.mc.steamadvantage.init.Entities.STEAM_BOILER_GEOTHERMAL == null) - zone.moddev.mc.steamadvantage.init.Entities.STEAM_BOILER_GEOTHERMAL = net.minecraft.tileentity.TileEntityType.Builder.create(GeothermalBoilerTileEntity::new, net.minecraft.block.Blocks.STONE).build(null); + if (zone.moddev.mc.basesteam.init.Entities.STEAM_BOILER_COAL == null) + zone.moddev.mc.basesteam.init.Entities.STEAM_BOILER_COAL = net.minecraft.tileentity.TileEntityType.Builder.create(CoalBoilerTileEntity::new, net.minecraft.block.Blocks.STONE).build(null); + if (zone.moddev.mc.basesteam.init.Entities.STEAM_BOILER_ELECTRIC == null) + zone.moddev.mc.basesteam.init.Entities.STEAM_BOILER_ELECTRIC = net.minecraft.tileentity.TileEntityType.Builder.create(ElectricBoilerTileEntity::new, net.minecraft.block.Blocks.STONE).build(null); + if (zone.moddev.mc.basesteam.init.Entities.STEAM_BOILER_GEOTHERMAL == null) + zone.moddev.mc.basesteam.init.Entities.STEAM_BOILER_GEOTHERMAL = net.minecraft.tileentity.TileEntityType.Builder.create(GeothermalBoilerTileEntity::new, net.minecraft.block.Blocks.STONE).build(null); } @Before public void createActualBoiler() throws Exception { boiler = type.getConstructor().newInstance(); diff --git a/src/test/java/zone/moddev/mc/steamadvantage/machines/WaterBoilerTankNotificationTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/WaterBoilerTankNotificationTest.java similarity index 91% rename from src/test/java/zone/moddev/mc/steamadvantage/machines/WaterBoilerTankNotificationTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/WaterBoilerTankNotificationTest.java index 890ebc7..b25412a 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/machines/WaterBoilerTankNotificationTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/WaterBoilerTankNotificationTest.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import static org.junit.Assert.*; import cyano.poweradvantage.api.IPowerMachine; -import zone.moddev.mc.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.init.Fluids; import java.util.*; import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.World; @@ -24,10 +24,10 @@ public class WaterBoilerTankNotificationTest { public WaterBoilerTankNotificationTest(String type) { this.type = type; } @BeforeClass public static void bootstrap() { net.minecraft.util.registry.Bootstrap.register(); - if (zone.moddev.mc.steamadvantage.init.Entities.STEAM_BOILER_ELECTRIC == null) - zone.moddev.mc.steamadvantage.init.Entities.STEAM_BOILER_ELECTRIC = net.minecraft.tileentity.TileEntityType.Builder.create(ElectricBoilerTileEntity::new, net.minecraft.block.Blocks.STONE).build(null); - if (zone.moddev.mc.steamadvantage.init.Entities.STEAM_BOILER_GEOTHERMAL == null) - zone.moddev.mc.steamadvantage.init.Entities.STEAM_BOILER_GEOTHERMAL = net.minecraft.tileentity.TileEntityType.Builder.create(GeothermalBoilerTileEntity::new, net.minecraft.block.Blocks.STONE).build(null); + if (zone.moddev.mc.basesteam.init.Entities.STEAM_BOILER_ELECTRIC == null) + zone.moddev.mc.basesteam.init.Entities.STEAM_BOILER_ELECTRIC = net.minecraft.tileentity.TileEntityType.Builder.create(ElectricBoilerTileEntity::new, net.minecraft.block.Blocks.STONE).build(null); + if (zone.moddev.mc.basesteam.init.Entities.STEAM_BOILER_GEOTHERMAL == null) + zone.moddev.mc.basesteam.init.Entities.STEAM_BOILER_GEOTHERMAL = net.minecraft.tileentity.TileEntityType.Builder.create(GeothermalBoilerTileEntity::new, net.minecraft.block.Blocks.STONE).build(null); } @Before public void createRealBoiler() { probe = type.equals("electric") ? new ElectricProbe() : new GeothermalProbe(); diff --git a/src/test/java/zone/moddev/mc/steamadvantage/migration/SteamLegacyMigrationsTest.java b/src/test/java/zone/moddev/mc/basesteam/migration/SteamLegacyMigrationsTest.java similarity index 80% rename from src/test/java/zone/moddev/mc/steamadvantage/migration/SteamLegacyMigrationsTest.java rename to src/test/java/zone/moddev/mc/basesteam/migration/SteamLegacyMigrationsTest.java index 6df1471..9034d4a 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/migration/SteamLegacyMigrationsTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/migration/SteamLegacyMigrationsTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.migration; +package zone.moddev.mc.basesteam.migration; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -24,7 +24,7 @@ public class SteamLegacyMigrationsTest { @Test public void repairsLegacyPumpAndGeothermalKeysWithoutOverwritingCanonicalState() { CompoundNBT pump = new CompoundNBT(); - pump.putString("id", "steamadvantage.steam_pump"); + pump.putString("id", "basesteam.steam_pump"); CompoundNBT oldTank = new CompoundNBT(); oldTank.putInt("Amount", 1250); pump.put("TankOut", oldTank); @@ -32,13 +32,13 @@ public class SteamLegacyMigrationsTest { assertEquals(1250, pump.getCompound("Tank").getInt("Amount")); CompoundNBT boiler = new CompoundNBT(); - boiler.putString("id", "steamadvantage:steam_boiler_geothermal"); + boiler.putString("id", "basesteam:steam_boiler_geothermal"); boiler.putFloat("Tempoerature", 412.5F); assertTrue(SteamLegacyMigrations.repairPersistenceKeys(boiler)); assertEquals(412.5F, boiler.getFloat("Temperature"), 0.0F); CompoundNBT canonical = new CompoundNBT(); - canonical.putString("id", "steamadvantage:steam_boiler_geothermal"); + canonical.putString("id", "basesteam:steam_boiler_geothermal"); canonical.putFloat("Temperature", 500.0F); canonical.putFloat("Tempoerature", 100.0F); assertFalse(SteamLegacyMigrations.repairPersistenceKeys(canonical)); @@ -47,11 +47,11 @@ public class SteamLegacyMigrationsTest { @Test public void aliasesLegacyTileIds() { SteamLegacyMigrations.register(); - assertEquals("steamadvantage:steam_pump", - LegacyMigrationApi.tileTarget("steamadvantage.steam_pump")); - assertEquals("steamadvantage:steam_drill", + assertEquals("basesteam:steam_pump", + LegacyMigrationApi.tileTarget("basesteam.steam_pump")); + assertEquals("basesteam:steam_drill", LegacyMigrationApi.tileTarget("steamadvantage.steam_drill")); - assertEquals("steamadvantage:steam_drill", + assertEquals("basesteam:steam_drill", LegacyMigrationApi.tileTarget("minecraft:steamadvantage.steam_drill")); } } diff --git a/src/test/java/zone/moddev/mc/steamadvantage/resources/ClientResourceContractTest.java b/src/test/java/zone/moddev/mc/basesteam/resources/ClientResourceContractTest.java similarity index 92% rename from src/test/java/zone/moddev/mc/steamadvantage/resources/ClientResourceContractTest.java rename to src/test/java/zone/moddev/mc/basesteam/resources/ClientResourceContractTest.java index 0a025d5..044bf76 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/resources/ClientResourceContractTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/resources/ClientResourceContractTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.resources; +package zone.moddev.mc.basesteam.resources; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -15,7 +15,7 @@ public class ClientResourceContractTest { private static final Path ROOT = Paths.get("src/main/resources"); - private static final Path ASSETS = ROOT.resolve("assets/steamadvantage"); + private static final Path ASSETS = ROOT.resolve("assets/basesteam"); @Test public void blockstatesUseLiteralModelPaths() throws Exception { try (Stream files = Files.walk(ASSETS.resolve("blockstates"))) { @@ -55,7 +55,7 @@ public class ClientResourceContractTest { JsonObject locale = read(file); for (Map.Entry entry : locale.entrySet()) { String key = entry.getKey(); - if (!(key.startsWith("tile.steamadvantage.") || key.startsWith("item.steamadvantage.")) + if (!(key.startsWith("tile.basesteam.") || key.startsWith("item.basesteam.")) || !key.endsWith(".name")) continue; String alias = key.substring(0, key.length() - 5); if (alias.startsWith("tile.")) alias = "block." + alias.substring(5); @@ -80,7 +80,7 @@ private static void reference(String id, String directory, String suffix, Path f String path = parts.length == 2 ? parts[1] : parts[0]; if ("minecraft".equals(namespace) && path.startsWith("builtin/")) return; String resource = "assets/" + namespace + "/" + directory + "/" + path + suffix; - boolean exists = "steamadvantage".equals(namespace) ? Files.isRegularFile(ROOT.resolve(resource)) + boolean exists = "basesteam".equals(namespace) ? Files.isRegularFile(ROOT.resolve(resource)) : ClientResourceContractTest.class.getClassLoader().getResource(resource) != null; assertTrue(file + " references missing " + resource, exists); } diff --git a/src/test/java/zone/moddev/mc/steamadvantage/resources/NativeLootContractTest.java b/src/test/java/zone/moddev/mc/basesteam/resources/NativeLootContractTest.java similarity index 90% rename from src/test/java/zone/moddev/mc/steamadvantage/resources/NativeLootContractTest.java rename to src/test/java/zone/moddev/mc/basesteam/resources/NativeLootContractTest.java index b320881..350513a 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/resources/NativeLootContractTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/resources/NativeLootContractTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.resources; +package zone.moddev.mc.basesteam.resources; import com.google.gson.JsonObject; import com.google.gson.JsonParser; @@ -12,7 +12,7 @@ public class NativeLootContractTest { private static final Path ROOT = Paths.get("src/main/resources"); - private static final Path TABLES = ROOT.resolve("data/steamadvantage/loot_tables/blocks"); + private static final Path TABLES = ROOT.resolve("data/basesteam/loot_tables/blocks"); @Test public void ordinaryBlocksKeepOneSelfDropWithExplosionSurvival() throws Exception { for (String id : new String[] { "steam_pipe", "steam_track", "steam_boiler_coal", @@ -27,7 +27,7 @@ public class NativeLootContractTest { assertEquals(1, pool.getAsJsonArray("entries").size()); JsonObject entry = pool.getAsJsonArray("entries").get(0).getAsJsonObject(); assertEquals("minecraft:item", entry.get("type").getAsString()); - assertEquals("steamadvantage:" + id, entry.get("name").getAsString()); + assertEquals("basesteam:" + id, entry.get("name").getAsString()); assertEquals("minecraft:survives_explosion", pool.getAsJsonArray("conditions") .get(0).getAsJsonObject().get("condition").getAsString()); } diff --git a/src/test/java/zone/moddev/mc/steamadvantage/resources/RecipeUnlockContractTest.java b/src/test/java/zone/moddev/mc/basesteam/resources/RecipeUnlockContractTest.java similarity index 98% rename from src/test/java/zone/moddev/mc/steamadvantage/resources/RecipeUnlockContractTest.java rename to src/test/java/zone/moddev/mc/basesteam/resources/RecipeUnlockContractTest.java index a2811b2..0ed453d 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/resources/RecipeUnlockContractTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/resources/RecipeUnlockContractTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.resources; +package zone.moddev.mc.basesteam.resources; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -21,7 +21,7 @@ import static org.junit.Assert.*; public class RecipeUnlockContractTest { - private static final String MOD = "steamadvantage"; + private static final String MOD = "basesteam"; private static final Path DATA = Paths.get("src/main/resources/data", MOD); private static final Set IGNORED = new LinkedHashSet<>(java.util.Arrays.asList( "item:minecraft:stick", "item:minecraft:string", "item:minecraft:feather", "tag:forge:rods/wooden")); diff --git a/src/test/java/zone/moddev/mc/steamadvantage/util/SoundHelperLoadedPlayersTest.java b/src/test/java/zone/moddev/mc/basesteam/util/SoundHelperLoadedPlayersTest.java similarity index 98% rename from src/test/java/zone/moddev/mc/steamadvantage/util/SoundHelperLoadedPlayersTest.java rename to src/test/java/zone/moddev/mc/basesteam/util/SoundHelperLoadedPlayersTest.java index 8c7a44c..87bb2ae 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/util/SoundHelperLoadedPlayersTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/util/SoundHelperLoadedPlayersTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.util; +package zone.moddev.mc.basesteam.util; import java.io.InputStream; import net.minecraft.util.math.AxisAlignedBB; @@ -120,7 +120,7 @@ private static void verifyDispatch(String name, double radius) throws Exception private static ClassNode soundHelper() throws Exception { ClassNode node = new ClassNode(); try (InputStream input = SoundHelperLoadedPlayersTest.class.getResourceAsStream( - "/zone/moddev/mc/steamadvantage/util/SoundHelper.class")) { + "/zone/moddev/mc/basesteam/util/SoundHelper.class")) { assertNotNull("Compiled SoundHelper is available", input); new ClassReader(input).accept(node, 0); }