From c6e4721eff85d3b12a59c5ab099e5106821cff1c Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Wed, 4 Nov 2026 23:21:12 +0000 Subject: [PATCH 1/5] Bring baseSteam to Minecraft 1.12.2 Keep existing 1.10 worlds readable under the base mod IDs, and build against the audited basePower dependency. --- .github/workflows/ci.yml | 47 +++++++--- .github/workflows/codeql-analysis.yml | 35 ++++++-- .github/workflows/release-on-tag.yml | 4 +- CHANGELOG.txt | 8 +- README.md | 18 ++-- build.gradle | 80 ++++++++++-------- gradle.properties | 22 ++--- .../moddev/mc/basesteam}/SteamAdvantage.java | 18 ++-- .../mc/basesteam}/blocks/DrillBitBlock.java | 4 +- .../basesteam}/blocks/DrillBitTileEntity.java | 6 +- .../mc/basesteam}/blocks/PlatformBlock.java | 4 +- .../mc/basesteam}/blocks/PumpPipeBlock.java | 2 +- .../mc/basesteam}/blocks/SteamPipeBlock.java | 4 +- .../mc/basesteam}/blocks/SteamTrackBlock.java | 4 +- .../basesteam}/compat/BaseMetalsCompat.java | 4 +- .../HighExplosiveEnchantment.java | 4 +- .../enchantments/PowderlessEnchantment.java | 4 +- .../enchantments/RapidReloadEnchantment.java | 4 +- .../enchantments/RecoilEnchantment.java | 4 +- .../basesteam}/graphics/DrillBitRenderer.java | 6 +- .../mc/basesteam}/gui/BlastFurnaceGUI.java | 8 +- .../mc/basesteam}/gui/CoalBoilerGUI.java | 8 +- .../mc/basesteam}/gui/ElectricBoilerGUI.java | 8 +- .../moddev/mc/basesteam}/gui/GUIHelper.java | 4 +- .../basesteam}/gui/GeothermalBoilerGUI.java | 8 +- .../mc/basesteam}/gui/OilBoilerGUI.java | 8 +- .../mc/basesteam}/gui/RockCrusherGUI.java | 8 +- .../mc/basesteam}/gui/SteamDrillGUI.java | 8 +- .../mc/basesteam}/gui/SteamPumpGUI.java | 8 +- .../mc/basesteam}/gui/SteamStillGUI.java | 8 +- .../mc/basesteam}/gui/SteamTankGUI.java | 8 +- .../moddev/mc/basesteam}/init/Blocks.java | 12 +-- .../mc/basesteam}/init/Enchantments.java | 12 +-- .../moddev/mc/basesteam}/init/Entities.java | 46 ++-------- .../moddev/mc/basesteam}/init/GUI.java | 8 +- .../moddev/mc/basesteam}/init/Items.java | 8 +- .../moddev/mc/basesteam}/init/Power.java | 2 +- .../moddev/mc/basesteam}/init/Recipes.java | 10 +-- .../mc/basesteam}/init/TreasureChests.java | 18 ++-- .../moddev/mc/basesteam}/init/Villages.java | 2 +- .../mc/basesteam}/items/MusketItem.java | 14 +-- .../machines/BlastFurnaceBlock.java | 4 +- .../machines/BlastFurnaceTileEntity.java | 8 +- .../basesteam}/machines/CoalBoilerBlock.java | 10 +-- .../machines/CoalBoilerTileEntity.java | 12 +-- .../machines/ElectricBoilerBlock.java | 10 +-- .../machines/ElectricBoilerTileEntity.java | 12 +-- .../machines/GeothermalBoilerBlock.java | 10 +-- .../machines/GeothermalBoilerTileEntity.java | 12 +-- .../basesteam}/machines/OilBoilerBlock.java | 10 +-- .../machines/OilBoilerTileEntity.java | 21 +++-- .../basesteam}/machines/RockCrusherBlock.java | 4 +- .../machines/RockCrusherTileEntity.java | 10 +-- .../basesteam}/machines/SteamDrillBlock.java | 8 +- .../machines/SteamDrillTileEntity.java | 24 +++--- .../machines/SteamElevatorBlock.java | 4 +- .../machines/SteamElevatorTileEntity.java | 10 +-- .../basesteam}/machines/SteamPumpBlock.java | 12 +-- .../machines/SteamPumpTileEntity.java | 26 +++--- .../basesteam}/machines/SteamStillBlock.java | 10 +-- .../machines/SteamStillTileEntity.java | 22 ++--- .../basesteam}/machines/SteamTankBlock.java | 4 +- .../machines/SteamTankTileEntity.java | 6 +- .../MusketEnabledConditionFactory.java | 4 +- .../condition/RecipeModeConditionFactory.java | 6 +- .../basesteam}/util/LegacyFluidHandler.java | 2 +- .../mc/basesteam}/util/SoundHelper.java | 2 +- .../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.lang | 43 ++++++++++ .../assets/basesteam/lang/en_au.lang | 43 ++++++++++ .../assets/basesteam/lang/en_ca.lang | 42 +++++++++ .../assets/basesteam/lang/en_en.lang | 42 +++++++++ .../assets/basesteam/lang/en_gb.lang | 42 +++++++++ .../assets/basesteam/lang/en_pt.lang | 44 ++++++++++ .../assets/basesteam/lang/en_us.lang | 43 ++++++++++ .../assets/basesteam/lang/es_es.lang | 43 ++++++++++ .../assets/basesteam/lang/es_mx.lang | 46 ++++++++++ .../assets/basesteam/lang/fr_ca.lang | 43 ++++++++++ .../assets/basesteam/lang/fr_fr.lang | 44 ++++++++++ .../assets/basesteam/lang/it_it.lang | 44 ++++++++++ .../assets/basesteam/lang/ja_jp.lang | 45 ++++++++++ .../assets/basesteam/lang/ko_kr.lang | 46 ++++++++++ .../assets/basesteam/lang/pt_br.lang | 46 ++++++++++ .../assets/basesteam/lang/zh_cn.lang | 45 ++++++++++ .../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 + .../assets/basesteam/recipes/_factories.json | 6 ++ .../recipes/blackpowder_cartridge.json | 2 +- .../recipes/musket_left_normal.json | 6 +- .../recipes/musket_left_tech.json | 6 +- .../recipes/musket_right_normal.json | 6 +- .../recipes/musket_right_tech.json | 6 +- .../recipes/steam_boiler_coal.json | 2 +- .../recipes/steam_boiler_electric.json | 2 +- .../recipes/steam_boiler_geothermal.json | 2 +- .../recipes/steam_boiler_oil.json | 2 +- .../recipes/steam_crusher.json | 2 +- .../recipes/steam_drill.json | 4 +- .../recipes/steam_drill_bit.json | 2 +- .../steam_drill_diamond_pickaxe_normal.json | 4 +- .../recipes/steam_elevator.json | 2 +- .../recipes/steam_furnace.json | 2 +- .../recipes/steam_governor_apocalyptic.json | 4 +- .../recipes/steam_governor_normal.json | 4 +- .../recipes/steam_governor_tech.json | 4 +- .../recipes/steam_pipe.json | 2 +- .../recipes/steam_pump.json | 2 +- .../recipes/steam_still.json | 2 +- .../recipes/steam_switch.json | 2 +- .../recipes/steam_tank.json | 2 +- .../assets/basesteam/recipes/steam_track.json | 15 ++++ .../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.lang | 43 ---------- .../assets/steamadvantage/lang/en_au.lang | 43 ---------- .../assets/steamadvantage/lang/en_ca.lang | 42 --------- .../assets/steamadvantage/lang/en_en.lang | 42 --------- .../assets/steamadvantage/lang/en_gb.lang | 42 --------- .../assets/steamadvantage/lang/en_pt.lang | 44 ---------- .../assets/steamadvantage/lang/en_us.lang | 43 ---------- .../assets/steamadvantage/lang/es_es.lang | 43 ---------- .../assets/steamadvantage/lang/es_mx.lang | 46 ---------- .../assets/steamadvantage/lang/fr_ca.lang | 43 ---------- .../assets/steamadvantage/lang/fr_fr.lang | 44 ---------- .../assets/steamadvantage/lang/it_it.lang | 44 ---------- .../assets/steamadvantage/lang/ja_jp.lang | 45 ---------- .../assets/steamadvantage/lang/ko_kr.lang | 46 ---------- .../assets/steamadvantage/lang/pt_br.lang | 46 ---------- .../assets/steamadvantage/lang/zh_cn.lang | 45 ---------- .../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 - .../steamadvantage/recipes/_factories.json | 6 -- .../steamadvantage/recipes/steam_track.json | 15 ---- src/main/resources/mcmod.info | 4 +- .../mc/basesteam}/gui/GUIHelperTest.java | 2 +- .../items/MusketLoadedCartridgeTest.java | 6 +- .../items/MusketTargetingContractTest.java | 6 +- .../CoalBoilerFillPersistenceTest.java | 4 +- .../machines/RockCrusherComparatorTest.java | 2 +- .../RockCrusherReloadRedstoneTest.java | 2 +- .../machines/SteamDrillPersistenceTest.java | 2 +- .../SteamOperationalPumpSourceTest.java | 4 +- .../SteamOperationalStillCapacityTest.java | 6 +- .../SteamRedstoneInitializationTest.java | 2 +- .../WaterBoilerFluidBoundaryTest.java | 2 +- .../WaterBoilerTankNotificationTest.java | 4 +- .../util/SoundHelperLoadedPlayersTest.java | 4 +- 316 files changed, 1771 insertions(+), 1728 deletions(-) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/SteamAdvantage.java (88%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/blocks/DrillBitBlock.java (97%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/blocks/DrillBitTileEntity.java (94%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/blocks/PlatformBlock.java (97%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/blocks/PumpPipeBlock.java (98%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/blocks/SteamPipeBlock.java (72%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/blocks/SteamTrackBlock.java (93%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/compat/BaseMetalsCompat.java (98%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/enchantments/HighExplosiveEnchantment.java (90%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/enchantments/PowderlessEnchantment.java (89%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/enchantments/RapidReloadEnchantment.java (89%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/enchantments/RecoilEnchantment.java (89%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/graphics/DrillBitRenderer.java (96%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/gui/BlastFurnaceGUI.java (93%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/gui/CoalBoilerGUI.java (92%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/gui/ElectricBoilerGUI.java (91%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/gui/GUIHelper.java (97%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/gui/GeothermalBoilerGUI.java (91%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/gui/OilBoilerGUI.java (92%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/gui/RockCrusherGUI.java (91%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/gui/SteamDrillGUI.java (91%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/gui/SteamPumpGUI.java (91%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/gui/SteamStillGUI.java (92%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/gui/SteamTankGUI.java (90%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/init/Blocks.java (92%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/init/Enchantments.java (78%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/init/Entities.java (60%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/init/GUI.java (86%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/init/Items.java (91%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/init/Power.java (90%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/init/Recipes.java (84%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/init/TreasureChests.java (86%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/init/Villages.java (98%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/items/MusketItem.java (97%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/BlastFurnaceBlock.java (92%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/BlastFurnaceTileEntity.java (97%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/CoalBoilerBlock.java (89%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/CoalBoilerTileEntity.java (97%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/ElectricBoilerBlock.java (90%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/ElectricBoilerTileEntity.java (97%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/GeothermalBoilerBlock.java (88%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/GeothermalBoilerTileEntity.java (97%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/OilBoilerBlock.java (89%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/OilBoilerTileEntity.java (95%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/RockCrusherBlock.java (92%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/RockCrusherTileEntity.java (95%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/SteamDrillBlock.java (97%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/SteamDrillTileEntity.java (94%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/SteamElevatorBlock.java (92%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/SteamElevatorTileEntity.java (93%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/SteamPumpBlock.java (88%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/SteamPumpTileEntity.java (94%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/SteamStillBlock.java (88%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/SteamStillTileEntity.java (95%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/SteamTankBlock.java (92%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/SteamTankTileEntity.java (93%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/recipe/condition/MusketEnabledConditionFactory.java (79%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/recipe/condition/RecipeModeConditionFactory.java (78%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/util/LegacyFluidHandler.java (98%) rename src/main/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/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.lang create mode 100644 src/main/resources/assets/basesteam/lang/en_au.lang create mode 100644 src/main/resources/assets/basesteam/lang/en_ca.lang create mode 100644 src/main/resources/assets/basesteam/lang/en_en.lang create mode 100644 src/main/resources/assets/basesteam/lang/en_gb.lang create mode 100644 src/main/resources/assets/basesteam/lang/en_pt.lang create mode 100644 src/main/resources/assets/basesteam/lang/en_us.lang create mode 100644 src/main/resources/assets/basesteam/lang/es_es.lang create mode 100644 src/main/resources/assets/basesteam/lang/es_mx.lang create mode 100644 src/main/resources/assets/basesteam/lang/fr_ca.lang create mode 100644 src/main/resources/assets/basesteam/lang/fr_fr.lang create mode 100644 src/main/resources/assets/basesteam/lang/it_it.lang create mode 100644 src/main/resources/assets/basesteam/lang/ja_jp.lang create mode 100644 src/main/resources/assets/basesteam/lang/ko_kr.lang create mode 100644 src/main/resources/assets/basesteam/lang/pt_br.lang create mode 100644 src/main/resources/assets/basesteam/lang/zh_cn.lang 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 create mode 100644 src/main/resources/assets/basesteam/recipes/_factories.json rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/blackpowder_cartridge.json (84%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/musket_left_normal.json (75%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/musket_left_tech.json (75%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/musket_right_normal.json (75%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/musket_right_tech.json (75%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/steam_boiler_coal.json (89%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/steam_boiler_electric.json (89%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/steam_boiler_geothermal.json (89%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/steam_boiler_oil.json (90%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/steam_crusher.json (91%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/steam_drill.json (80%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/steam_drill_bit.json (88%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/steam_drill_diamond_pickaxe_normal.json (84%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/steam_elevator.json (91%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/steam_furnace.json (89%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/steam_governor_apocalyptic.json (83%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/steam_governor_normal.json (82%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/steam_governor_tech.json (83%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/steam_pipe.json (83%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/steam_pump.json (91%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/steam_still.json (91%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/steam_switch.json (88%) rename src/main/resources/assets/{steamadvantage => basesteam}/recipes/steam_tank.json (89%) create mode 100644 src/main/resources/assets/basesteam/recipes/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.lang delete mode 100644 src/main/resources/assets/steamadvantage/lang/en_au.lang delete mode 100644 src/main/resources/assets/steamadvantage/lang/en_ca.lang delete mode 100644 src/main/resources/assets/steamadvantage/lang/en_en.lang delete mode 100644 src/main/resources/assets/steamadvantage/lang/en_gb.lang delete mode 100644 src/main/resources/assets/steamadvantage/lang/en_pt.lang delete mode 100644 src/main/resources/assets/steamadvantage/lang/en_us.lang delete mode 100644 src/main/resources/assets/steamadvantage/lang/es_es.lang delete mode 100644 src/main/resources/assets/steamadvantage/lang/es_mx.lang delete mode 100644 src/main/resources/assets/steamadvantage/lang/fr_ca.lang delete mode 100644 src/main/resources/assets/steamadvantage/lang/fr_fr.lang delete mode 100644 src/main/resources/assets/steamadvantage/lang/it_it.lang delete mode 100644 src/main/resources/assets/steamadvantage/lang/ja_jp.lang delete mode 100644 src/main/resources/assets/steamadvantage/lang/ko_kr.lang delete mode 100644 src/main/resources/assets/steamadvantage/lang/pt_br.lang delete mode 100644 src/main/resources/assets/steamadvantage/lang/zh_cn.lang 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 delete mode 100644 src/main/resources/assets/steamadvantage/recipes/_factories.json delete mode 100644 src/main/resources/assets/steamadvantage/recipes/steam_track.json rename src/test/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/gui/GUIHelperTest.java (96%) rename src/test/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/items/MusketLoadedCartridgeTest.java (96%) rename src/test/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/items/MusketTargetingContractTest.java (97%) rename src/test/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/CoalBoilerFillPersistenceTest.java (98%) rename src/test/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/RockCrusherComparatorTest.java (95%) rename src/test/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/RockCrusherReloadRedstoneTest.java (98%) rename src/test/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/SteamDrillPersistenceTest.java (96%) rename src/test/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/SteamOperationalPumpSourceTest.java (98%) rename src/test/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/SteamOperationalStillCapacityTest.java (94%) rename src/test/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/SteamRedstoneInitializationTest.java (99%) rename src/test/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/WaterBoilerFluidBoundaryTest.java (99%) rename src/test/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/machines/WaterBoilerTankNotificationTest.java (98%) rename src/test/java/{com/mcmoddev/steamadvantage => zone/moddev/mc/basesteam}/util/SoundHelperLoadedPlayersTest.java (98%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7cebcd..4007a08 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ permissions: contents: read concurrency: - group: steamadvantage-1.12-${{ github.workflow }}-${{ github.ref }} + group: basesteam-1.12-${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: @@ -29,10 +29,18 @@ jobs: - name: Check out pinned PowerAdvantage uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: - repository: MinecraftModDevelopmentMods/PowerAdvantage - ref: 40811a0be37174a0633998eb3d820d95755d35e8 + repository: MinecraftModDevelopmentMods/basePower + ref: 7b375587dd9e6ca57ea51473fa9892531ac73c75 path: .ci-dependencies/PowerAdvantage + - name: Check out pinned OreSpawn + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 + with: + repository: MinecraftModDevelopmentMods/OreSpawn + ref: 72205b9bb6bfff17cf69715c0d5bd4d2efd3b148 + path: .ci-dependencies/OreSpawn + persist-credentials: false + - name: Install Java 8 toolchain uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 with: @@ -48,8 +56,23 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6 + - name: Build pinned OreSpawn development jar + id: orespawn + shell: bash + run: | + set -euo pipefail + dependency="$GITHUB_WORKSPACE/.ci-dependencies/OreSpawn" + chmod +x "$dependency/gradlew" + ( + cd "$dependency" + ./gradlew deobfJar --no-daemon --stacktrace + ) + jar="$dependency/build/libs-dev/OreSpawn-4.1.3.112021-deobf.jar" + test -f "$jar" + echo "jar=$jar" >> "$GITHUB_OUTPUT" + - name: Build pinned PowerAdvantage development jar - id: poweradvantage + id: basepower shell: bash run: | set -euo pipefail @@ -60,9 +83,10 @@ jobs: cd "$dependency" bash gradle/stage-reborncore-release.sh "$mirror" ./gradlew deobfJar verifyReleaseDependencies \ + -PoreSpawnDeobfJar="${{ steps.orespawn.outputs.jar }}" \ -PrebornCoreVerificationRepository="$mirror" --no-daemon --stacktrace ) - jar="$dependency/build/libs-dev/PowerAdvantage-2.4.1.112021-deobf.jar" + jar="$dependency/build/libs-dev/basePower-2.4.4.112021-deobf.jar" test -f "$jar" echo "jar=$jar" >> "$GITHUB_OUTPUT" @@ -70,19 +94,20 @@ jobs: run: >- ./gradlew clean check build javadoc verifyReleaseDependencies verifyReleaseArtifacts writeReleaseChecksums verifyEclipseProductionClasspath - -PpowerAdvantageDeobfJar=${{ steps.poweradvantage.outputs.jar }} + -PoreSpawnDeobfJar="${{ steps.orespawn.outputs.jar }}" + -PpowerAdvantageDeobfJar=${{ steps.basepower.outputs.jar }} --no-daemon --stacktrace - name: Upload audited release candidate uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: SteamAdvantage-1.12.2-${{ github.sha }} + name: baseSteam-1.12.2-${{ github.sha }} if-no-files-found: error retention-days: 30 path: | - build/libs/SteamAdvantage-2.2.2.112021.jar - build/libs/SteamAdvantage-2.2.2.112021-sources.jar - build/libs/SteamAdvantage-2.2.2.112021-javadoc.jar + build/libs/baseSteam-2.2.6.112021.jar + build/libs/baseSteam-2.2.6.112021-sources.jar + build/libs/baseSteam-2.2.6.112021-javadoc.jar build/release/SHA256SUMS CHANGELOG.txt @@ -90,7 +115,7 @@ jobs: if: failure() uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: SteamAdvantage-1.12.2-diagnostics-${{ github.sha }} + name: baseSteam-1.12.2-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 4de73be..f859ff2 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -29,10 +29,18 @@ jobs: - name: Check out pinned PowerAdvantage uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: - repository: MinecraftModDevelopmentMods/PowerAdvantage - ref: 40811a0be37174a0633998eb3d820d95755d35e8 + repository: MinecraftModDevelopmentMods/basePower + ref: 7b375587dd9e6ca57ea51473fa9892531ac73c75 path: .ci-dependencies/PowerAdvantage + - name: Check out pinned OreSpawn + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 + with: + repository: MinecraftModDevelopmentMods/OreSpawn + ref: 72205b9bb6bfff17cf69715c0d5bd4d2efd3b148 + path: .ci-dependencies/OreSpawn + persist-credentials: false + - name: Install Java 8 toolchain uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 with: @@ -48,8 +56,23 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6 + - name: Build pinned OreSpawn development jar + id: orespawn + shell: bash + run: | + set -euo pipefail + dependency="$GITHUB_WORKSPACE/.ci-dependencies/OreSpawn" + chmod +x "$dependency/gradlew" + ( + cd "$dependency" + ./gradlew deobfJar --no-daemon --stacktrace + ) + jar="$dependency/build/libs-dev/OreSpawn-4.1.3.112021-deobf.jar" + test -f "$jar" + echo "jar=$jar" >> "$GITHUB_OUTPUT" + - name: Build pinned PowerAdvantage development jar - id: poweradvantage + id: basepower shell: bash run: | set -euo pipefail @@ -60,9 +83,10 @@ jobs: cd "$dependency" bash gradle/stage-reborncore-release.sh "$mirror" ./gradlew deobfJar verifyReleaseDependencies \ + -PoreSpawnDeobfJar="${{ steps.orespawn.outputs.jar }}" \ -PrebornCoreVerificationRepository="$mirror" --no-daemon --stacktrace ) - jar="$dependency/build/libs-dev/PowerAdvantage-2.4.1.112021-deobf.jar" + jar="$dependency/build/libs-dev/basePower-2.4.4.112021-deobf.jar" test -f "$jar" echo "jar=$jar" >> "$GITHUB_OUTPUT" @@ -75,7 +99,8 @@ jobs: run: | chmod +x ./gradlew ./gradlew clean classes --rerun-tasks --no-build-cache --no-daemon --stacktrace \ - -PpowerAdvantageDeobfJar=${{ steps.poweradvantage.outputs.jar }} + -PoreSpawnDeobfJar="${{ steps.orespawn.outputs.jar }}" \ + -PpowerAdvantageDeobfJar=${{ steps.basepower.outputs.jar }} - name: Analyze uses: github/codeql-action/analyze@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4 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 79da421..65ba402 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,10 @@ -Unreleased - Minecraft 1.12.2 +2.2.6.112021 - baseSteam for Minecraft 1.12.2 + +- Continue Steam Advantage as baseSteam. Read saved tiles from both the original 1.10.2 mod and baseSteam 1.10.2. +- Map the four saved musket enchantments to their baseSteam names and retain the old oil fuel configuration overrides. +- Use matching basePower 1.12.2 and keep the earlier drill, pump, still and boiler fixes. + +Earlier 1.12.2 test-coverage repairs - Let Forge fluid sources control their own drainage, preserving the amount and fluid data they return. - Keep fluid in the steam pump when an attached tank refuses it, and only charge for successful pickup. diff --git a/README.md b/README.md index 46adcdb..f144d3f 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,25 @@ -# SteamAdvantage +# baseSteam for Minecraft 1.12.2 -Steam Advantage adds steam-powered machines and infrastructure to Power Advantage for Minecraft 1.12.2. +baseSteam continues DrCyano's Steam Advantage, adding boilers, brass pipework, storage and steam-powered machines to basePower. -## Drill Reload Fix +## Upgrading a world -Version `2.2.2.112021` keeps unfinished drill work when a chunk or world reloads. -Existing inventories, energy, orientation and saved-world names are unchanged. -The regression tests cover resumed progress and full server restarts. +Replace the installed Advantage family together. baseSteam `2.2.6.112021` reads the original Steam Advantage and released baseSteam 1.10.2 tile IDs. Back up your save, then check inventories, drill directions, pressure and unfinished work on a copy before and after a full restart. + +[World upgrade guide](https://github.com/MinecraftModDevelopmentMods/basePower/blob/master-1.12.2/docs/1.12-upgrade.md) | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/basesteam) ## Building Minecraft 1.12.2 The `master-1.12.2` build uses ForgeGradle 7.0.34 and Gradle 9.6.1. Run Gradle with Java 17; Gradle resolves the Java 8 toolchain used for compilation. -First build the pinned sibling PowerAdvantage development jar: +First build the pinned OreSpawn and sibling basePower development jars: ```text cd ..\..\PowerAdvantage gradlew.bat deobfJar ``` -Then build and audit SteamAdvantage: +Back in the baseSteam checkout, build and audit the release: ```text gradlew.bat clean check build javadoc verifyReleaseDependencies verifyReleaseArtifacts writeReleaseChecksums @@ -33,4 +33,4 @@ For Eclipse, import this repository as an existing Gradle project and run: gradlew.bat cleanEclipse verifyEclipseProductionClasspath ``` -Power Advantage is required at compile time and runtime but is never bundled. Base Metals remains a required distribution dependency while its integrations stay reflection-based and absent from the compile classpath. +basePower is required at compile time and runtime but is never bundled. For a different checkout layout, supply `-PpowerAdvantageDeobfJar=` and `-PoreSpawnDeobfJar=`. The expected commits and hashes are in `gradle.properties`. Base Metals remains a distribution dependency, but its integrations do not require it at compile time. diff --git a/build.gradle b/build.gradle index 198a467..2d250c4 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+/ }) { @@ -150,10 +150,12 @@ 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) +def oreSpawnJar = file(providers.gradleProperty('oreSpawnDeobfJar').getOrElse( + "../../../../MinecraftMineralogy/OS112/OreSpawn/build/libs-dev/OreSpawn-${project.orespawn_version}-deobf.jar")) if (!powerAdvantageDeobfJar.isFile()) { throw new GradleException("Missing PowerAdvantage deobf jar at ${powerAdvantageDeobfJar}. " + "Run gradlew.bat deobfJar in ../../PowerAdvantage first, or pass " @@ -169,6 +171,7 @@ dependencies { // PowerAdvantage is required at runtime but remains a separate mod jar. compileOnly files(powerAdvantageDeobfJar) runtimeOnly files(powerAdvantageDeobfJar) + runtimeOnly files(oreSpawnJar) testImplementation files(powerAdvantageDeobfJar) testImplementation 'junit:junit:4.13.2' } @@ -300,7 +303,7 @@ tasks.register('verifyReleaseConfiguration') { group = 'verification' description = 'Validates release identity, target metadata, and dependency policy.' doLast { - if (project.mod_version != '2.2.2.112021') { + if (project.mod_version != '2.2.6.112021') { throw new GradleException("Unexpected SteamAdvantage release version: ${project.mod_version}") } if (project.minecraft_version != '1.12.2' @@ -315,22 +318,22 @@ tasks.register('verifyReleaseConfiguration') { || project.gradle_java_version != '17') { throw new GradleException('Unexpected release dispatcher target metadata') } - if (project.mod_id != 'steamadvantage' - || project.group.toString() != 'com.mcmoddev.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.12.2') { throw new GradleException('Unexpected CurseForge dependency or game-version metadata') } - if (project.poweradvantage_version != '2.4.1.112021' - || project.poweradvantage_source_repository != 'MinecraftModDevelopmentMods/PowerAdvantage' - || project.poweradvantage_source_ref != '40811a0be37174a0633998eb3d820d95755d35e8' - || project.poweradvantage_deobf_sha256 != 'DE7759033A094718E1341CC82B9912425A24A035DBD7F91D590D8B921F08DEB2') { + if (project.poweradvantage_version != '2.4.4.112021' + || project.poweradvantage_source_repository != 'MinecraftModDevelopmentMods/basePower' + || project.poweradvantage_source_ref != '7b375587dd9e6ca57ea51473fa9892531ac73c75' + || project.poweradvantage_deobf_sha256 != '66FBC92F8A14B54ED9A33482A99AF21B1FDA23CCFC9E817AF4D2BD8DE0EB0A78') { throw new GradleException('Unexpected PowerAdvantage compile dependency identity') } ['.github/workflows/ci.yml', '.github/workflows/codeql-analysis.yml'].each { workflowPath -> @@ -341,16 +344,16 @@ tasks.register('verifyReleaseConfiguration') { } } String mainSource = file( - 'src/main/java/com/mcmoddev/steamadvantage/SteamAdvantage.java').getText('UTF-8') - if (!mainSource.contains('MODID = "steamadvantage"') - || !mainSource.contains('VERSION = "2.2.2.112021"') - || !mainSource.contains('dependencies = "required-after:poweradvantage;after:basemetals"')) { + 'src/main/java/zone/moddev/mc/basesteam/SteamAdvantage.java').getText('UTF-8') + if (!mainSource.contains('MODID = "basesteam"') + || !mainSource.contains('VERSION = "2.2.6.112021"') + || !mainSource.contains('required-after:basepower@[2.4.4.112021,);after:basemetals')) { throw new GradleException('SteamAdvantage source identity or dependency policy changed') } def metadata = new JsonSlurper().parse(file('src/main/resources/mcmod.info')) def mod = metadata instanceof List ? metadata.first() : metadata - if (mod.modid != 'steamadvantage') { - throw new GradleException('Source mcmod.info does not use the stable steamadvantage mod id') + if (mod.modid != 'basesteam') { + throw new GradleException('Source mcmod.info does not use the stable basesteam mod id') } } } @@ -369,8 +372,8 @@ tasks.register('verifyReleaseDependencies') { new ZipFile(powerAdvantageDeobfJar).withCloseable { zip -> ['cyano/poweradvantage/api/PoweredEntity.class', 'cyano/poweradvantage/api/GUIBlock.class', - 'com/mcmoddev/poweradvantage/conduitnetwork/ConduitRegistry.class', - 'com/mcmoddev/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}") } @@ -389,7 +392,12 @@ tasks.register('verifyReleaseDependencies') { if (!runtimeFiles.contains(powerAdvantageDeobfJar.canonicalFile)) { throw new GradleException('PowerAdvantage is missing from runtimeClasspath') } - List forbiddenRuntimeMods = runtimeFiles.collect { it.name.toLowerCase(Locale.ROOT) } + if (!runtimeFiles.contains(oreSpawnJar.canonicalFile) + || MessageDigest.getInstance('SHA-256').digest(oreSpawnJar.bytes).encodeHex() + .toString().toUpperCase(Locale.ROOT) != project.orespawn_deobf_sha256) { + throw new GradleException('Missing or unexpected OreSpawn development artifact') + } + List forbiddenRuntimeMods = (runtimeFiles - oreSpawnJar.canonicalFile).collect { it.name.toLowerCase(Locale.ROOT) } .findAll { name -> name.contains('basemetals') || name.contains('orespawn') || name.contains('rf-api') || name.contains('reborncore') @@ -440,18 +448,18 @@ tasks.register('verifyReleaseArtifacts') { new ZipFile(mainJar).withCloseable { zip -> List names = zip.entries().collect { it.name } ['mcmod.info', 'pack.mcmeta', - 'com/mcmoddev/steamadvantage/SteamAdvantage.class', - 'com/mcmoddev/steamadvantage/machines/SteamDrillTileEntity.class', - 'com/mcmoddev/steamadvantage/machines/SteamPumpTileEntity.class', - 'com/mcmoddev/steamadvantage/machines/GeothermalBoilerTileEntity.class', - 'assets/steamadvantage/lang/en_us.lang'].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.lang'].each { required -> if (!names.contains(required)) { throw new GradleException("Release jar is missing ${required}") } } ['agent-notes/', '.codex/', 'src/test/', 'fernflower_abstract_parameter_names.txt', - 'cyano/poweradvantage/', - 'com/mcmoddev/poweradvantage/', 'cyano/basemetals/', 'com/mcmoddev/lib/', + 'cyano/basepower/', + 'zone/moddev/mc/basepower/', '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) }) { @@ -487,8 +495,8 @@ tasks.register('verifyReleaseArtifacts') { } new ZipFile(new File(libs, expectedReleaseFiles.get()[1])).withCloseable { sourceZip -> - if (sourceZip.getEntry('com/mcmoddev/steamadvantage/SteamAdvantage.java') == null - || sourceZip.getEntry('com/mcmoddev/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') } } @@ -586,7 +594,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' @@ -594,9 +602,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' } } } @@ -816,7 +824,7 @@ tasks.register('verifyEclipseProductionClasspath') { if (contents.contains('org.eclipse.buildship.core.gradleclasspathcontainer')) { throw new GradleException("${name} exposes compileOnly dependencies at runtime") } - ['BaseMetals', 'OreSpawn', 'RF-API.jar', 'RebornCore-1.12.2'].each { forbiddenDependency -> + ['BaseMetals', 'RF-API.jar', 'RebornCore-1.12.2'].each { forbiddenDependency -> if (contents.toLowerCase(Locale.ROOT).contains(forbiddenDependency.toLowerCase(Locale.ROOT))) { throw new GradleException( "${name} includes forbidden runtime dependency ${forbiddenDependency}") @@ -874,7 +882,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}" diff --git a/gradle.properties b/gradle.properties index d646ca9..026b020 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,21 +19,23 @@ 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.2.112021 -mod_group=com.mcmoddev.steamadvantage +mod_version=2.2.6.112021 +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.12.2 -poweradvantage_version=2.4.1.112021 -poweradvantage_source_repository=MinecraftModDevelopmentMods/PowerAdvantage -poweradvantage_source_ref=40811a0be37174a0633998eb3d820d95755d35e8 -poweradvantage_deobf_sha256=DE7759033A094718E1341CC82B9912425A24A035DBD7F91D590D8B921F08DEB2 +poweradvantage_version=2.4.4.112021 +poweradvantage_source_repository=MinecraftModDevelopmentMods/basePower +poweradvantage_source_ref=7b375587dd9e6ca57ea51473fa9892531ac73c75 +poweradvantage_deobf_sha256=66FBC92F8A14B54ED9A33482A99AF21B1FDA23CCFC9E817AF4D2BD8DE0EB0A78 +orespawn_version=4.1.3.112021 +orespawn_deobf_sha256=E10D9D0409784F3D4260889186A2483E72D1EC838F2BEAD78BE69149B6975198 diff --git a/src/main/java/com/mcmoddev/steamadvantage/SteamAdvantage.java b/src/main/java/zone/moddev/mc/basesteam/SteamAdvantage.java similarity index 88% rename from src/main/java/com/mcmoddev/steamadvantage/SteamAdvantage.java rename to src/main/java/zone/moddev/mc/basesteam/SteamAdvantage.java index 33a0f0e..9edaf35 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/SteamAdvantage.java +++ b/src/main/java/zone/moddev/mc/basesteam/SteamAdvantage.java @@ -1,6 +1,7 @@ -package com.mcmoddev.steamadvantage; +package zone.moddev.mc.basesteam; -import com.mcmoddev.steamadvantage.init.*; +import zone.moddev.mc.basesteam.init.*; +import zone.moddev.mc.basepower.compat.LegacyIdentity; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.Mod; @@ -35,15 +36,16 @@ * - Bioreactor (slowly makes liquid fuel from organic matter) */ @Mod(modid = SteamAdvantage.MODID, version = SteamAdvantage.VERSION, name=SteamAdvantage.NAME, - dependencies = "required-after:poweradvantage;after:basemetals", + dependencies = "required-after:basepower@[2.4.4.112021,);after:basemetals", acceptedMinecraftVersions = "[1.12.2]") public class SteamAdvantage {/** The identifier for this mod */ - public static final String MODID = "steamadvantage"; + public static final String MODID = "basesteam"; + public static final String LEGACY_MODID = "steamadvantage"; /** The display name for this mod */ - public static final String NAME = "Steam Advantage"; + public static final String NAME = "baseSteam"; /** The version of this mod, in the format major.minor.update */ - public static final String VERSION = "2.2.2.112021"; + public static final String VERSION = "2.2.6.112021"; public static float MUSKET_DAMAGE = 20; public static int MUSKET_RELOAD = 20*5; @@ -60,7 +62,8 @@ public void preInit(FMLPreInitializationEvent event) { Entities.registerDataFixers(); - Configuration config = new Configuration(event.getSuggestedConfigurationFile()); + Configuration config = new Configuration(LegacyIdentity.migrateConfiguration( + event.getSuggestedConfigurationFile(), LEGACY_MODID)); config.load(); MUSKET_DAMAGE = config.getFloat("musket_damage", "options", MUSKET_DAMAGE, 0, 100, @@ -96,6 +99,7 @@ public void preInit(FMLPreInitializationEvent event) Blocks.init(); Items.init(); + LegacyIdentity.migrateAdditionalLootTables(config.getConfigFile().toPath().getParent(), LEGACY_MODID, MODID); TreasureChests.init(config.getConfigFile().toPath().getParent()); diff --git a/src/main/java/com/mcmoddev/steamadvantage/blocks/DrillBitBlock.java b/src/main/java/zone/moddev/mc/basesteam/blocks/DrillBitBlock.java similarity index 97% rename from src/main/java/com/mcmoddev/steamadvantage/blocks/DrillBitBlock.java rename to src/main/java/zone/moddev/mc/basesteam/blocks/DrillBitBlock.java index 3dbdcfd..76544a7 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/blocks/DrillBitBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/blocks/DrillBitBlock.java @@ -1,6 +1,6 @@ -package com.mcmoddev.steamadvantage.blocks; +package zone.moddev.mc.basesteam.blocks; -import com.mcmoddev.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/mcmoddev/steamadvantage/blocks/DrillBitTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/blocks/DrillBitTileEntity.java similarity index 94% rename from src/main/java/com/mcmoddev/steamadvantage/blocks/DrillBitTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/blocks/DrillBitTileEntity.java index 0bbec90..9bbc602 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/blocks/DrillBitTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/blocks/DrillBitTileEntity.java @@ -1,6 +1,6 @@ -package com.mcmoddev.steamadvantage.blocks; +package zone.moddev.mc.basesteam.blocks; -import com.mcmoddev.steamadvantage.init.Blocks; +import zone.moddev.mc.basesteam.init.Blocks; import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; @@ -38,7 +38,7 @@ public EnumFacing.Axis getDirection(){ } public static void createDrillBitBlock(World w, BlockPos coord, EnumFacing dir){ - w.setBlockState(coord, com.mcmoddev.steamadvantage.init.Blocks.drillbit.getDefaultState()); + w.setBlockState(coord, zone.moddev.mc.basesteam.init.Blocks.drillbit.getDefaultState()); DrillBitTileEntity te = new DrillBitTileEntity(); te.direction = dir; w.setTileEntity(coord, te); diff --git a/src/main/java/com/mcmoddev/steamadvantage/blocks/PlatformBlock.java b/src/main/java/zone/moddev/mc/basesteam/blocks/PlatformBlock.java similarity index 97% rename from src/main/java/com/mcmoddev/steamadvantage/blocks/PlatformBlock.java rename to src/main/java/zone/moddev/mc/basesteam/blocks/PlatformBlock.java index 88948f8..7b7a71f 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/blocks/PlatformBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/blocks/PlatformBlock.java @@ -1,6 +1,6 @@ -package com.mcmoddev.steamadvantage.blocks; +package zone.moddev.mc.basesteam.blocks; -import com.mcmoddev.steamadvantage.init.Blocks; +import zone.moddev.mc.basesteam.init.Blocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; diff --git a/src/main/java/com/mcmoddev/steamadvantage/blocks/PumpPipeBlock.java b/src/main/java/zone/moddev/mc/basesteam/blocks/PumpPipeBlock.java similarity index 98% rename from src/main/java/com/mcmoddev/steamadvantage/blocks/PumpPipeBlock.java rename to src/main/java/zone/moddev/mc/basesteam/blocks/PumpPipeBlock.java index c177b56..4742e9b 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/blocks/PumpPipeBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/blocks/PumpPipeBlock.java @@ -1,4 +1,4 @@ -package com.mcmoddev.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/com/mcmoddev/steamadvantage/blocks/SteamPipeBlock.java b/src/main/java/zone/moddev/mc/basesteam/blocks/SteamPipeBlock.java similarity index 72% rename from src/main/java/com/mcmoddev/steamadvantage/blocks/SteamPipeBlock.java rename to src/main/java/zone/moddev/mc/basesteam/blocks/SteamPipeBlock.java index 8ab37d6..78681ff 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/blocks/SteamPipeBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/blocks/SteamPipeBlock.java @@ -1,6 +1,6 @@ -package com.mcmoddev.steamadvantage.blocks; +package zone.moddev.mc.basesteam.blocks; -import com.mcmoddev.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/com/mcmoddev/steamadvantage/blocks/SteamTrackBlock.java b/src/main/java/zone/moddev/mc/basesteam/blocks/SteamTrackBlock.java similarity index 93% rename from src/main/java/com/mcmoddev/steamadvantage/blocks/SteamTrackBlock.java rename to src/main/java/zone/moddev/mc/basesteam/blocks/SteamTrackBlock.java index a1cd9e2..744fa80 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/blocks/SteamTrackBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/blocks/SteamTrackBlock.java @@ -1,6 +1,6 @@ -package com.mcmoddev.steamadvantage.blocks; +package zone.moddev.mc.basesteam.blocks; -import com.mcmoddev.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/mcmoddev/steamadvantage/compat/BaseMetalsCompat.java b/src/main/java/zone/moddev/mc/basesteam/compat/BaseMetalsCompat.java similarity index 98% rename from src/main/java/com/mcmoddev/steamadvantage/compat/BaseMetalsCompat.java rename to src/main/java/zone/moddev/mc/basesteam/compat/BaseMetalsCompat.java index f232014..c4245a1 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/compat/BaseMetalsCompat.java +++ b/src/main/java/zone/moddev/mc/basesteam/compat/BaseMetalsCompat.java @@ -1,6 +1,6 @@ -package com.mcmoddev.steamadvantage.compat; +package zone.moddev.mc.basesteam.compat; -import com.mcmoddev.steamadvantage.SteamAdvantage; +import zone.moddev.mc.basesteam.SteamAdvantage; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/mcmoddev/steamadvantage/enchantments/HighExplosiveEnchantment.java b/src/main/java/zone/moddev/mc/basesteam/enchantments/HighExplosiveEnchantment.java similarity index 90% rename from src/main/java/com/mcmoddev/steamadvantage/enchantments/HighExplosiveEnchantment.java rename to src/main/java/zone/moddev/mc/basesteam/enchantments/HighExplosiveEnchantment.java index 83980a8..4f40b20 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/enchantments/HighExplosiveEnchantment.java +++ b/src/main/java/zone/moddev/mc/basesteam/enchantments/HighExplosiveEnchantment.java @@ -1,6 +1,6 @@ -package com.mcmoddev.steamadvantage.enchantments; +package zone.moddev.mc.basesteam.enchantments; -import com.mcmoddev.steamadvantage.init.Items; +import zone.moddev.mc.basesteam.init.Items; import net.minecraft.enchantment.EnumEnchantmentType; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/mcmoddev/steamadvantage/enchantments/PowderlessEnchantment.java b/src/main/java/zone/moddev/mc/basesteam/enchantments/PowderlessEnchantment.java similarity index 89% rename from src/main/java/com/mcmoddev/steamadvantage/enchantments/PowderlessEnchantment.java rename to src/main/java/zone/moddev/mc/basesteam/enchantments/PowderlessEnchantment.java index 7729f81..895d017 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/enchantments/PowderlessEnchantment.java +++ b/src/main/java/zone/moddev/mc/basesteam/enchantments/PowderlessEnchantment.java @@ -1,6 +1,6 @@ -package com.mcmoddev.steamadvantage.enchantments; +package zone.moddev.mc.basesteam.enchantments; -import com.mcmoddev.steamadvantage.init.Items; +import zone.moddev.mc.basesteam.init.Items; import net.minecraft.enchantment.EnumEnchantmentType; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/mcmoddev/steamadvantage/enchantments/RapidReloadEnchantment.java b/src/main/java/zone/moddev/mc/basesteam/enchantments/RapidReloadEnchantment.java similarity index 89% rename from src/main/java/com/mcmoddev/steamadvantage/enchantments/RapidReloadEnchantment.java rename to src/main/java/zone/moddev/mc/basesteam/enchantments/RapidReloadEnchantment.java index fa8d759..247629b 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/enchantments/RapidReloadEnchantment.java +++ b/src/main/java/zone/moddev/mc/basesteam/enchantments/RapidReloadEnchantment.java @@ -1,6 +1,6 @@ -package com.mcmoddev.steamadvantage.enchantments; +package zone.moddev.mc.basesteam.enchantments; -import com.mcmoddev.steamadvantage.init.Items; +import zone.moddev.mc.basesteam.init.Items; import net.minecraft.enchantment.EnumEnchantmentType; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/mcmoddev/steamadvantage/enchantments/RecoilEnchantment.java b/src/main/java/zone/moddev/mc/basesteam/enchantments/RecoilEnchantment.java similarity index 89% rename from src/main/java/com/mcmoddev/steamadvantage/enchantments/RecoilEnchantment.java rename to src/main/java/zone/moddev/mc/basesteam/enchantments/RecoilEnchantment.java index 57bcca1..e59f9e6 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/enchantments/RecoilEnchantment.java +++ b/src/main/java/zone/moddev/mc/basesteam/enchantments/RecoilEnchantment.java @@ -1,6 +1,6 @@ -package com.mcmoddev.steamadvantage.enchantments; +package zone.moddev.mc.basesteam.enchantments; -import com.mcmoddev.steamadvantage.init.Items; +import zone.moddev.mc.basesteam.init.Items; import net.minecraft.enchantment.EnumEnchantmentType; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/mcmoddev/steamadvantage/graphics/DrillBitRenderer.java b/src/main/java/zone/moddev/mc/basesteam/graphics/DrillBitRenderer.java similarity index 96% rename from src/main/java/com/mcmoddev/steamadvantage/graphics/DrillBitRenderer.java rename to src/main/java/zone/moddev/mc/basesteam/graphics/DrillBitRenderer.java index 96dd057..6f9529e 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/graphics/DrillBitRenderer.java +++ b/src/main/java/zone/moddev/mc/basesteam/graphics/DrillBitRenderer.java @@ -1,7 +1,7 @@ -package com.mcmoddev.steamadvantage.graphics; +package zone.moddev.mc.basesteam.graphics; -import com.mcmoddev.steamadvantage.SteamAdvantage; -import com.mcmoddev.steamadvantage.blocks.DrillBitTileEntity; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.blocks.DrillBitTileEntity; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; diff --git a/src/main/java/com/mcmoddev/steamadvantage/gui/BlastFurnaceGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/BlastFurnaceGUI.java similarity index 93% rename from src/main/java/com/mcmoddev/steamadvantage/gui/BlastFurnaceGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/BlastFurnaceGUI.java index eeab1b5..ead3377 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/gui/BlastFurnaceGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/BlastFurnaceGUI.java @@ -1,13 +1,13 @@ -package com.mcmoddev.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.poweradvantage.math.Integer2D; -import com.mcmoddev.steamadvantage.SteamAdvantage; -import com.mcmoddev.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/com/mcmoddev/steamadvantage/gui/CoalBoilerGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/CoalBoilerGUI.java similarity index 92% rename from src/main/java/com/mcmoddev/steamadvantage/gui/CoalBoilerGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/CoalBoilerGUI.java index c890223..4c52898 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/gui/CoalBoilerGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/CoalBoilerGUI.java @@ -1,10 +1,10 @@ -package com.mcmoddev.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.poweradvantage.math.Integer2D; -import com.mcmoddev.steamadvantage.SteamAdvantage; -import com.mcmoddev.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/com/mcmoddev/steamadvantage/gui/ElectricBoilerGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/ElectricBoilerGUI.java similarity index 91% rename from src/main/java/com/mcmoddev/steamadvantage/gui/ElectricBoilerGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/ElectricBoilerGUI.java index 32b9768..8d5bf51 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/gui/ElectricBoilerGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/ElectricBoilerGUI.java @@ -1,10 +1,10 @@ -package com.mcmoddev.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.poweradvantage.math.Integer2D; -import com.mcmoddev.steamadvantage.SteamAdvantage; -import com.mcmoddev.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/com/mcmoddev/steamadvantage/gui/GUIHelper.java b/src/main/java/zone/moddev/mc/basesteam/gui/GUIHelper.java similarity index 97% rename from src/main/java/com/mcmoddev/steamadvantage/gui/GUIHelper.java rename to src/main/java/zone/moddev/mc/basesteam/gui/GUIHelper.java index 1f95306..70f4b5a 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/gui/GUIHelper.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/GUIHelper.java @@ -1,7 +1,7 @@ -package com.mcmoddev.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import cyano.poweradvantage.api.simple.SimpleMachineGUI.GUIContainer; -import com.mcmoddev.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/com/mcmoddev/steamadvantage/gui/GeothermalBoilerGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/GeothermalBoilerGUI.java similarity index 91% rename from src/main/java/com/mcmoddev/steamadvantage/gui/GeothermalBoilerGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/GeothermalBoilerGUI.java index 2c923bb..de599c5 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/gui/GeothermalBoilerGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/GeothermalBoilerGUI.java @@ -1,10 +1,10 @@ -package com.mcmoddev.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.poweradvantage.math.Integer2D; -import com.mcmoddev.steamadvantage.SteamAdvantage; -import com.mcmoddev.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/com/mcmoddev/steamadvantage/gui/OilBoilerGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/OilBoilerGUI.java similarity index 92% rename from src/main/java/com/mcmoddev/steamadvantage/gui/OilBoilerGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/OilBoilerGUI.java index 0d6d54d..f792099 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/gui/OilBoilerGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/OilBoilerGUI.java @@ -1,9 +1,9 @@ -package com.mcmoddev.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.poweradvantage.math.Integer2D; -import com.mcmoddev.steamadvantage.SteamAdvantage; -import com.mcmoddev.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 net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/mcmoddev/steamadvantage/gui/RockCrusherGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/RockCrusherGUI.java similarity index 91% rename from src/main/java/com/mcmoddev/steamadvantage/gui/RockCrusherGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/RockCrusherGUI.java index 8ee786a..5687661 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/gui/RockCrusherGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/RockCrusherGUI.java @@ -1,10 +1,10 @@ -package com.mcmoddev.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.poweradvantage.math.Integer2D; -import com.mcmoddev.steamadvantage.SteamAdvantage; -import com.mcmoddev.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/com/mcmoddev/steamadvantage/gui/SteamDrillGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/SteamDrillGUI.java similarity index 91% rename from src/main/java/com/mcmoddev/steamadvantage/gui/SteamDrillGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/SteamDrillGUI.java index 2b26f6b..b80698a 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/gui/SteamDrillGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/SteamDrillGUI.java @@ -1,10 +1,10 @@ -package com.mcmoddev.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.poweradvantage.math.Integer2D; -import com.mcmoddev.steamadvantage.SteamAdvantage; -import com.mcmoddev.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/com/mcmoddev/steamadvantage/gui/SteamPumpGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/SteamPumpGUI.java similarity index 91% rename from src/main/java/com/mcmoddev/steamadvantage/gui/SteamPumpGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/SteamPumpGUI.java index dbe2e34..6365a25 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/gui/SteamPumpGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/SteamPumpGUI.java @@ -1,9 +1,9 @@ -package com.mcmoddev.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.poweradvantage.math.Integer2D; -import com.mcmoddev.steamadvantage.SteamAdvantage; -import com.mcmoddev.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 net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/mcmoddev/steamadvantage/gui/SteamStillGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/SteamStillGUI.java similarity index 92% rename from src/main/java/com/mcmoddev/steamadvantage/gui/SteamStillGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/SteamStillGUI.java index 1097066..d7881f5 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/gui/SteamStillGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/SteamStillGUI.java @@ -1,9 +1,9 @@ -package com.mcmoddev.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.poweradvantage.math.Integer2D; -import com.mcmoddev.steamadvantage.SteamAdvantage; -import com.mcmoddev.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 net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/mcmoddev/steamadvantage/gui/SteamTankGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/SteamTankGUI.java similarity index 90% rename from src/main/java/com/mcmoddev/steamadvantage/gui/SteamTankGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/SteamTankGUI.java index 77c56e7..535175a 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/gui/SteamTankGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/SteamTankGUI.java @@ -1,10 +1,10 @@ -package com.mcmoddev.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.poweradvantage.math.Integer2D; -import com.mcmoddev.steamadvantage.SteamAdvantage; -import com.mcmoddev.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/com/mcmoddev/steamadvantage/init/Blocks.java b/src/main/java/zone/moddev/mc/basesteam/init/Blocks.java similarity index 92% rename from src/main/java/com/mcmoddev/steamadvantage/init/Blocks.java rename to src/main/java/zone/moddev/mc/basesteam/init/Blocks.java index a530818..989dec9 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/init/Blocks.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/Blocks.java @@ -1,10 +1,10 @@ -package com.mcmoddev.steamadvantage.init; +package zone.moddev.mc.basesteam.init; import cyano.poweradvantage.api.GUIBlock; -import com.mcmoddev.poweradvantage.blocks.BlockPowerSwitch; -import com.mcmoddev.steamadvantage.SteamAdvantage; -import com.mcmoddev.steamadvantage.blocks.*; -import com.mcmoddev.steamadvantage.machines.*; +import zone.moddev.mc.basepower.blocks.BlockPowerSwitch; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.blocks.*; +import zone.moddev.mc.basesteam.machines.*; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -88,7 +88,7 @@ private static Block addBlock(Block block, String name ){ ItemBlock itemBlock = new ItemBlock(block); itemBlock.setRegistryName(registryName); ForgeRegistries.ITEMS.register(itemBlock); - block.setCreativeTab(com.mcmoddev.poweradvantage.init.ItemGroups.tab_powerAdvantage); + block.setCreativeTab(zone.moddev.mc.basepower.init.ItemGroups.tab_powerAdvantage); allBlocks.put(name, block); return block; } diff --git a/src/main/java/com/mcmoddev/steamadvantage/init/Enchantments.java b/src/main/java/zone/moddev/mc/basesteam/init/Enchantments.java similarity index 78% rename from src/main/java/com/mcmoddev/steamadvantage/init/Enchantments.java rename to src/main/java/zone/moddev/mc/basesteam/init/Enchantments.java index 2dfb059..57a7b02 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/init/Enchantments.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/Enchantments.java @@ -1,10 +1,10 @@ -package com.mcmoddev.steamadvantage.init; +package zone.moddev.mc.basesteam.init; -import com.mcmoddev.steamadvantage.SteamAdvantage; -import com.mcmoddev.steamadvantage.enchantments.HighExplosiveEnchantment; -import com.mcmoddev.steamadvantage.enchantments.PowderlessEnchantment; -import com.mcmoddev.steamadvantage.enchantments.RapidReloadEnchantment; -import com.mcmoddev.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/com/mcmoddev/steamadvantage/init/Entities.java b/src/main/java/zone/moddev/mc/basesteam/init/Entities.java similarity index 60% rename from src/main/java/com/mcmoddev/steamadvantage/init/Entities.java rename to src/main/java/zone/moddev/mc/basesteam/init/Entities.java index d21d4f8..cb758a6 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/init/Entities.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/Entities.java @@ -1,19 +1,18 @@ -package com.mcmoddev.steamadvantage.init; +package zone.moddev.mc.basesteam.init; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.util.datafix.FixTypes; -import net.minecraft.util.datafix.IFixableData; import net.minecraftforge.common.util.ModFixs; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import com.mcmoddev.steamadvantage.SteamAdvantage; -import com.mcmoddev.steamadvantage.blocks.DrillBitTileEntity; -import com.mcmoddev.steamadvantage.machines.*; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basepower.compat.LegacyIdentity; +import zone.moddev.mc.basesteam.blocks.DrillBitTileEntity; +import zone.moddev.mc.basesteam.machines.*; public class Entities { @@ -23,7 +22,8 @@ public class Entities { public static void registerDataFixers(){ if(dataFixersRegistered) return; ModFixs fixes = FMLCommonHandler.instance().getDataFixer().init(SteamAdvantage.MODID, 1); - fixes.registerFix(FixTypes.BLOCK_ENTITY, new LegacyTileEntityIdFix(SteamAdvantage.MODID, 1)); + fixes.registerFix(FixTypes.BLOCK_ENTITY, LegacyIdentity.tileIds(SteamAdvantage.LEGACY_MODID, SteamAdvantage.MODID, 1)); + fixes.registerFix(FixTypes.ITEM_INSTANCE, LegacyIdentity.itemIds(SteamAdvantage.LEGACY_MODID, SteamAdvantage.MODID, 1)); dataFixersRegistered = true; } @@ -54,38 +54,8 @@ private static void registerTileEntity(Class tileEntityCla GameRegistry.registerTileEntity(tileEntityClass, new ResourceLocation(SteamAdvantage.MODID, path)); } - private static final class LegacyTileEntityIdFix implements IFixableData { - private final String modid; - private final int version; - - private LegacyTileEntityIdFix(String modid, int version) { - this.modid = modid; - this.version = version; - } - - @Override - public int getFixVersion() { - return version; - } - - @Override - public NBTTagCompound fixTagCompound(NBTTagCompound compound) { - if (compound.hasKey("id", 8)) { - String id = compound.getString("id"); - String legacyPrefix = modid + "."; - String legacyMinecraftPrefix = "minecraft:" + legacyPrefix; - if (id.startsWith(legacyMinecraftPrefix)) { - compound.setString("id", modid + ":" + id.substring(legacyMinecraftPrefix.length())); - } else if (id.startsWith(legacyPrefix)) { - compound.setString("id", modid + ":" + id.substring(legacyPrefix.length())); - } - } - return compound; - } - } - @SideOnly(Side.CLIENT) public static void registerRenderers(){ - ClientRegistry.bindTileEntitySpecialRenderer(DrillBitTileEntity.class, new com.mcmoddev.steamadvantage.graphics.DrillBitRenderer()); + ClientRegistry.bindTileEntitySpecialRenderer(DrillBitTileEntity.class, new zone.moddev.mc.basesteam.graphics.DrillBitRenderer()); } } diff --git a/src/main/java/com/mcmoddev/steamadvantage/init/GUI.java b/src/main/java/zone/moddev/mc/basesteam/init/GUI.java similarity index 86% rename from src/main/java/com/mcmoddev/steamadvantage/init/GUI.java rename to src/main/java/zone/moddev/mc/basesteam/init/GUI.java index 622559c..7699ef5 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/init/GUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/GUI.java @@ -1,8 +1,8 @@ -package com.mcmoddev.steamadvantage.init; +package zone.moddev.mc.basesteam.init; -import com.mcmoddev.poweradvantage.PowerAdvantage; -import com.mcmoddev.poweradvantage.registry.MachineGUIRegistry; -import com.mcmoddev.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/com/mcmoddev/steamadvantage/init/Items.java b/src/main/java/zone/moddev/mc/basesteam/init/Items.java similarity index 91% rename from src/main/java/com/mcmoddev/steamadvantage/init/Items.java rename to src/main/java/zone/moddev/mc/basesteam/init/Items.java index 6ebbeb1..ef77896 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/init/Items.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/Items.java @@ -1,7 +1,7 @@ -package com.mcmoddev.steamadvantage.init; +package zone.moddev.mc.basesteam.init; -import com.mcmoddev.steamadvantage.SteamAdvantage; -import com.mcmoddev.steamadvantage.items.MusketItem; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.items.MusketItem; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; @@ -52,7 +52,7 @@ private static Item addItem(String unlocalizedName, Item i){ i.setTranslationKey(SteamAdvantage.MODID+"."+unlocalizedName); i.setRegistryName(new ResourceLocation(SteamAdvantage.MODID, unlocalizedName)); ForgeRegistries.ITEMS.register(i); - i.setCreativeTab(com.mcmoddev.poweradvantage.init.ItemGroups.tab_powerAdvantage); + i.setCreativeTab(zone.moddev.mc.basepower.init.ItemGroups.tab_powerAdvantage); allItems.put(unlocalizedName, i); return i; } diff --git a/src/main/java/com/mcmoddev/steamadvantage/init/Power.java b/src/main/java/zone/moddev/mc/basesteam/init/Power.java similarity index 90% rename from src/main/java/com/mcmoddev/steamadvantage/init/Power.java rename to src/main/java/zone/moddev/mc/basesteam/init/Power.java index b259279..1febd10 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/init/Power.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/Power.java @@ -1,4 +1,4 @@ -package com.mcmoddev.steamadvantage.init; +package zone.moddev.mc.basesteam.init; import net.minecraft.util.DamageSource; import cyano.poweradvantage.api.ConduitType; diff --git a/src/main/java/com/mcmoddev/steamadvantage/init/Recipes.java b/src/main/java/zone/moddev/mc/basesteam/init/Recipes.java similarity index 84% rename from src/main/java/com/mcmoddev/steamadvantage/init/Recipes.java rename to src/main/java/zone/moddev/mc/basesteam/init/Recipes.java index 3ff62cf..6cd8286 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/init/Recipes.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/Recipes.java @@ -1,10 +1,10 @@ -package com.mcmoddev.steamadvantage.init; +package zone.moddev.mc.basesteam.init; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import com.mcmoddev.poweradvantage.PowerAdvantage; -import com.mcmoddev.poweradvantage.RecipeMode; -import com.mcmoddev.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 { @@ -23,7 +23,7 @@ public static void init(){ OreDictionary.registerOre("blockObsidian", net.minecraft.init.Blocks.OBSIDIAN); if(recipeMode == RecipeMode.APOCALYPTIC){ - BaseMetalsCompat.addCrusherRecipe(Items.steam_governor, new ItemStack(com.mcmoddev.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/com/mcmoddev/steamadvantage/init/TreasureChests.java b/src/main/java/zone/moddev/mc/basesteam/init/TreasureChests.java similarity index 86% rename from src/main/java/com/mcmoddev/steamadvantage/init/TreasureChests.java rename to src/main/java/zone/moddev/mc/basesteam/init/TreasureChests.java index 51fbf1f..4177a4f 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/init/TreasureChests.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/TreasureChests.java @@ -1,6 +1,6 @@ -package com.mcmoddev.steamadvantage.init; +package zone.moddev.mc.basesteam.init; -import com.mcmoddev.steamadvantage.SteamAdvantage; +import zone.moddev.mc.basesteam.SteamAdvantage; import net.minecraftforge.fml.common.FMLLog; import org.apache.logging.log4j.Level; @@ -50,7 +50,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" + @@ -64,7 +64,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" + @@ -78,7 +78,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" + @@ -92,14 +92,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/com/mcmoddev/steamadvantage/init/Villages.java b/src/main/java/zone/moddev/mc/basesteam/init/Villages.java similarity index 98% rename from src/main/java/com/mcmoddev/steamadvantage/init/Villages.java rename to src/main/java/zone/moddev/mc/basesteam/init/Villages.java index a62b4c3..4c7b0e0 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/init/Villages.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/Villages.java @@ -1,4 +1,4 @@ -package com.mcmoddev.steamadvantage.init; +package zone.moddev.mc.basesteam.init; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.item.Item; diff --git a/src/main/java/com/mcmoddev/steamadvantage/items/MusketItem.java b/src/main/java/zone/moddev/mc/basesteam/items/MusketItem.java similarity index 97% rename from src/main/java/com/mcmoddev/steamadvantage/items/MusketItem.java rename to src/main/java/zone/moddev/mc/basesteam/items/MusketItem.java index ca056f7..543509d 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/items/MusketItem.java +++ b/src/main/java/zone/moddev/mc/basesteam/items/MusketItem.java @@ -1,7 +1,7 @@ -package com.mcmoddev.steamadvantage.items; +package zone.moddev.mc.basesteam.items; -import static com.mcmoddev.steamadvantage.util.SoundHelper.playBigSoundAtPosition; -import static com.mcmoddev.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.Optional; @@ -9,9 +9,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import com.mcmoddev.steamadvantage.SteamAdvantage; -import com.mcmoddev.steamadvantage.init.Enchantments; -import com.mcmoddev.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.BlockTNT; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -464,7 +464,7 @@ public void addInformation(ItemStack stack, World world, List list, net. list.add(I18n.translateToLocal("tooltip.musket.loaded")); } else { list.add(I18n.translateToLocal("tooltip.musket.unloaded")); - list.add(I18n.translateToLocal("tooltip.musket.ammo").replace("%x",I18n.translateToLocal("item.steamadvantage.blackpowder_cartridge.name"))); + list.add(I18n.translateToLocal("tooltip.musket.ammo").replace("%x",I18n.translateToLocal("item.basesteam.blackpowder_cartridge.name"))); } } diff --git a/src/main/java/com/mcmoddev/steamadvantage/machines/BlastFurnaceBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/BlastFurnaceBlock.java similarity index 92% rename from src/main/java/com/mcmoddev/steamadvantage/machines/BlastFurnaceBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/BlastFurnaceBlock.java index 2c4b3d2..b7bfac1 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/BlastFurnaceBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/BlastFurnaceBlock.java @@ -1,8 +1,8 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import com.mcmoddev.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/mcmoddev/steamadvantage/machines/BlastFurnaceTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/BlastFurnaceTileEntity.java similarity index 97% rename from src/main/java/com/mcmoddev/steamadvantage/machines/BlastFurnaceTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/BlastFurnaceTileEntity.java index 51f1c0e..c9fa2d5 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/BlastFurnaceTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/BlastFurnaceTileEntity.java @@ -1,7 +1,7 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; -import com.mcmoddev.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; @@ -15,7 +15,7 @@ import java.util.Arrays; -import static com.mcmoddev.steamadvantage.util.SoundHelper.playSoundAtTileEntity; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtTileEntity; public class BlastFurnaceTileEntity extends cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine{ @@ -44,7 +44,7 @@ public void onLoad() { } public BlastFurnaceTileEntity() { - super(Power.steam_power, 200, "tile.steamadvantage.steam_furnace.name"); + super(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; diff --git a/src/main/java/com/mcmoddev/steamadvantage/machines/CoalBoilerBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/CoalBoilerBlock.java similarity index 89% rename from src/main/java/com/mcmoddev/steamadvantage/machines/CoalBoilerBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/CoalBoilerBlock.java index 79008bf..fb7e4b6 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/CoalBoilerBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/CoalBoilerBlock.java @@ -1,10 +1,10 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import com.mcmoddev.poweradvantage.conduitnetwork.ConduitRegistry; -import com.mcmoddev.poweradvantage.init.Fluids; -import com.mcmoddev.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.state.IBlockState; import net.minecraft.util.math.BlockPos; @@ -63,7 +63,7 @@ public boolean isPowerSource(ConduitType type){ @Override public void onBlockAdded(World w, BlockPos coord, IBlockState state){ super.onBlockAdded(w, coord, state); - ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, com.mcmoddev.poweradvantage.init.Fluids.fluidConduit_general); + ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, zone.moddev.mc.basepower.init.Fluids.fluidConduit_general); } /** diff --git a/src/main/java/com/mcmoddev/steamadvantage/machines/CoalBoilerTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/CoalBoilerTileEntity.java similarity index 97% rename from src/main/java/com/mcmoddev/steamadvantage/machines/CoalBoilerTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/CoalBoilerTileEntity.java index 3ace571..ba7e024 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/CoalBoilerTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/CoalBoilerTileEntity.java @@ -1,12 +1,12 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; -import static com.mcmoddev.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 com.mcmoddev.poweradvantage.init.Fluids; -import com.mcmoddev.steamadvantage.init.Power; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; @@ -19,7 +19,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; -import com.mcmoddev.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(new ConduitType[]{Power.steam_power,Fluids.fluidConduit_general}, new float[]{1000,1000}, "tile.steamadvantage.steam_boiler_coal.name"); + super(new ConduitType[]{Power.steam_power,Fluids.fluidConduit_general}, new float[]{1000,1000}, "tile.basesteam.steam_boiler_coal.name"); tank = new FluidTank(Fluid.BUCKET_VOLUME * 4) { @Override protected void onContentsChanged() { diff --git a/src/main/java/com/mcmoddev/steamadvantage/machines/ElectricBoilerBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/ElectricBoilerBlock.java similarity index 90% rename from src/main/java/com/mcmoddev/steamadvantage/machines/ElectricBoilerBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/ElectricBoilerBlock.java index 025de61..9153fc6 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/ElectricBoilerBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/ElectricBoilerBlock.java @@ -1,10 +1,10 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import com.mcmoddev.poweradvantage.conduitnetwork.ConduitRegistry; -import com.mcmoddev.poweradvantage.init.Fluids; -import com.mcmoddev.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.state.IBlockState; import net.minecraft.util.math.BlockPos; @@ -58,7 +58,7 @@ public boolean isPowerSource(ConduitType type){ public void onBlockAdded(World w, BlockPos coord, IBlockState state){ super.onBlockAdded(w, coord, state); ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, ElectricBoilerTileEntity.ELECTRIC_POWER); - ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, com.mcmoddev.poweradvantage.init.Fluids.fluidConduit_general); + ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, zone.moddev.mc.basepower.init.Fluids.fluidConduit_general); } /** diff --git a/src/main/java/com/mcmoddev/steamadvantage/machines/ElectricBoilerTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/ElectricBoilerTileEntity.java similarity index 97% rename from src/main/java/com/mcmoddev/steamadvantage/machines/ElectricBoilerTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/ElectricBoilerTileEntity.java index 11123f9..fd4dafd 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/ElectricBoilerTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/ElectricBoilerTileEntity.java @@ -1,12 +1,12 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; -import static com.mcmoddev.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 com.mcmoddev.poweradvantage.init.Fluids; -import com.mcmoddev.steamadvantage.init.Power; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; @@ -18,7 +18,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; -import com.mcmoddev.steamadvantage.util.LegacyFluidHandler; +import zone.moddev.mc.basesteam.util.LegacyFluidHandler; @SuppressWarnings("deprecation") public class ElectricBoilerTileEntity extends cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine implements LegacyFluidHandler{ @@ -39,7 +39,7 @@ public class ElectricBoilerTileEntity extends cyano.poweradvantage.api.simple.Ti public ElectricBoilerTileEntity() { super(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(Fluid.BUCKET_VOLUME * 2) { @Override protected void onContentsChanged() { diff --git a/src/main/java/com/mcmoddev/steamadvantage/machines/GeothermalBoilerBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/GeothermalBoilerBlock.java similarity index 88% rename from src/main/java/com/mcmoddev/steamadvantage/machines/GeothermalBoilerBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/GeothermalBoilerBlock.java index aac3482..9dd000e 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/GeothermalBoilerBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/GeothermalBoilerBlock.java @@ -1,10 +1,10 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import com.mcmoddev.poweradvantage.conduitnetwork.ConduitRegistry; -import com.mcmoddev.poweradvantage.init.Fluids; -import com.mcmoddev.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.state.IBlockState; import net.minecraft.util.math.BlockPos; @@ -50,7 +50,7 @@ public boolean isPowerSource(ConduitType type){ @Override public void onBlockAdded(World w, BlockPos coord, IBlockState state){ super.onBlockAdded(w, coord, state); - ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, com.mcmoddev.poweradvantage.init.Fluids.fluidConduit_general); + ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, zone.moddev.mc.basepower.init.Fluids.fluidConduit_general); } /** diff --git a/src/main/java/com/mcmoddev/steamadvantage/machines/GeothermalBoilerTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/GeothermalBoilerTileEntity.java similarity index 97% rename from src/main/java/com/mcmoddev/steamadvantage/machines/GeothermalBoilerTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/GeothermalBoilerTileEntity.java index 1368ab9..95772c7 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/GeothermalBoilerTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/GeothermalBoilerTileEntity.java @@ -1,12 +1,12 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; -import com.mcmoddev.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 com.mcmoddev.poweradvantage.init.Fluids; -import com.mcmoddev.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.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -18,7 +18,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fluids.*; -import static com.mcmoddev.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{ @@ -39,7 +39,7 @@ public class GeothermalBoilerTileEntity extends cyano.poweradvantage.api.simple. private final int[] dataSyncArray = new int[3]; public GeothermalBoilerTileEntity() { - super(new ConduitType[]{Power.steam_power,Fluids.fluidConduit_general}, new float[]{100,1000}, "tile.steamadvantage.steam_boiler_geothermal.name"); + super(new ConduitType[]{Power.steam_power,Fluids.fluidConduit_general}, new float[]{100,1000}, "tile.basesteam.steam_boiler_geothermal.name"); tank = new FluidTank(Fluid.BUCKET_VOLUME * 2) { @Override protected void onContentsChanged() { diff --git a/src/main/java/com/mcmoddev/steamadvantage/machines/OilBoilerBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerBlock.java similarity index 89% rename from src/main/java/com/mcmoddev/steamadvantage/machines/OilBoilerBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerBlock.java index c8137d2..5f1463a 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/OilBoilerBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerBlock.java @@ -1,10 +1,10 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import com.mcmoddev.poweradvantage.conduitnetwork.ConduitRegistry; -import com.mcmoddev.poweradvantage.init.Fluids; -import com.mcmoddev.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.state.IBlockState; import net.minecraft.util.math.BlockPos; @@ -62,7 +62,7 @@ public boolean isPowerSource(ConduitType type){ @Override public void onBlockAdded(World w, BlockPos coord, IBlockState state){ super.onBlockAdded(w, coord, state); - ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, com.mcmoddev.poweradvantage.init.Fluids.fluidConduit_general); + ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, zone.moddev.mc.basepower.init.Fluids.fluidConduit_general); } /** diff --git a/src/main/java/com/mcmoddev/steamadvantage/machines/OilBoilerTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerTileEntity.java similarity index 95% rename from src/main/java/com/mcmoddev/steamadvantage/machines/OilBoilerTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerTileEntity.java index d402c1e..ef4b52a 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/OilBoilerTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerTileEntity.java @@ -1,16 +1,16 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; -import com.mcmoddev.poweradvantage.util.FluidIdHelper; +import zone.moddev.mc.basepower.util.FluidIdHelper; -import com.mcmoddev.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 com.mcmoddev.poweradvantage.init.Fluids; -import com.mcmoddev.poweradvantage.registry.FuelRegistry; -import com.mcmoddev.steamadvantage.SteamAdvantage; -import com.mcmoddev.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.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.Map; -import static com.mcmoddev.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{ @@ -40,7 +40,7 @@ public class OilBoilerTileEntity extends cyano.poweradvantage.api.simple.TileEnt private final int[] dataSyncArray = new int[6]; public OilBoilerTileEntity() { - super(new ConduitType[]{Power.steam_power, Fluids.fluidConduit_general}, new float[]{1000,1000}, "tile.steamadvantage.steam_boiler_oil.name"); + super(new ConduitType[]{Power.steam_power, Fluids.fluidConduit_general}, new float[]{1000,1000}, "tile.basesteam.steam_boiler_oil.name"); waterTank = new FluidTank(Fluid.BUCKET_VOLUME * 4); fuelTank = new FluidTank(Fluid.BUCKET_VOLUME * 4); } @@ -143,6 +143,9 @@ private static Float getConfiguredBurnTimePerBucketFor(Fluid fluid) { if(SteamAdvantage.fluidBurnValues.containsKey(fluid.getUnlocalizedName())){ return SteamAdvantage.fluidBurnValues.get(fluid.getUnlocalizedName()); } + if ("crude_oil".equals(fluid.getName()) || "refined_oil".equals(fluid.getName())) { + return SteamAdvantage.fluidBurnValues.get("fluid.poweradvantage." + fluid.getName()); + } return null; } diff --git a/src/main/java/com/mcmoddev/steamadvantage/machines/RockCrusherBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/RockCrusherBlock.java similarity index 92% rename from src/main/java/com/mcmoddev/steamadvantage/machines/RockCrusherBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/RockCrusherBlock.java index 8f0f5ae..f9068c5 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/RockCrusherBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/RockCrusherBlock.java @@ -1,8 +1,8 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import com.mcmoddev.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/mcmoddev/steamadvantage/machines/RockCrusherTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/RockCrusherTileEntity.java similarity index 95% rename from src/main/java/com/mcmoddev/steamadvantage/machines/RockCrusherTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/RockCrusherTileEntity.java index 4c4c37a..4ffe02a 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/RockCrusherTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/RockCrusherTileEntity.java @@ -1,4 +1,4 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import net.minecraft.entity.player.EntityPlayer; @@ -6,11 +6,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import com.mcmoddev.steamadvantage.compat.BaseMetalsCompat; -import com.mcmoddev.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.compat.BaseMetalsCompat; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.util.SoundCategory; -import static com.mcmoddev.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(Power.steam_power, 50, "tile.steamadvantage.steam_crusher.name"); + super(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/com/mcmoddev/steamadvantage/machines/SteamDrillBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamDrillBlock.java similarity index 97% rename from src/main/java/com/mcmoddev/steamadvantage/machines/SteamDrillBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamDrillBlock.java index fa51efc..38e69c4 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/SteamDrillBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamDrillBlock.java @@ -1,10 +1,10 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.*; import cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine; -import com.mcmoddev.poweradvantage.conduitnetwork.ConduitRegistry; -import com.mcmoddev.steamadvantage.blocks.DrillBitTileEntity; -import com.mcmoddev.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.block.properties.IProperty; import net.minecraft.block.properties.PropertyDirection; diff --git a/src/main/java/com/mcmoddev/steamadvantage/machines/SteamDrillTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamDrillTileEntity.java similarity index 94% rename from src/main/java/com/mcmoddev/steamadvantage/machines/SteamDrillTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamDrillTileEntity.java index e8a8cd5..e26610d 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/SteamDrillTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamDrillTileEntity.java @@ -1,11 +1,11 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; -import com.mcmoddev.poweradvantage.util.InventoryWrapper; -import com.mcmoddev.steamadvantage.blocks.DrillBitTileEntity; -import com.mcmoddev.steamadvantage.compat.BaseMetalsCompat; -import com.mcmoddev.steamadvantage.init.Blocks; -import com.mcmoddev.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.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -23,8 +23,8 @@ import java.util.Arrays; import java.util.List; -import static com.mcmoddev.steamadvantage.util.SoundHelper.playSoundAtPosition; -import static com.mcmoddev.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{ @@ -50,7 +50,7 @@ public class SteamDrillTileEntity extends cyano.poweradvantage.api.simple.TileEn private boolean deferred = false; public SteamDrillTileEntity() { - super(Power.steam_power, 50, "tile.steamadvantage.steam_drill.name"); + super(Power.steam_power, 50, "tile.basesteam.steam_drill.name"); } @@ -194,7 +194,7 @@ private boolean followTrack(){ // replace this block with steam pipe destroyDrillBit(drillDirection); - w.setBlockState(currentPos.offset(drillDirection), com.mcmoddev.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; } @@ -283,7 +283,7 @@ public void onDataFieldUpdate() { if(hitEnd){ boolean moved = followTrack(); if(moved){ - com.mcmoddev.poweradvantage.conduitnetwork.ConduitRegistry.getInstance() + zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry.getInstance() .conduitBlockRemovedEvent(powerAdvantageWorld(), powerAdvantageWorld().provider.getDimension(), powerAdvantagePos(), Power.steam_power); return; } @@ -313,7 +313,7 @@ public void onDataFieldUpdate() { private void destroyDrillBit(EnumFacing f) { BlockPos n = powerAdvantagePos().offset(f); - while(powerAdvantageWorld().getBlockState(n).getBlock() == com.mcmoddev.steamadvantage.init.Blocks.drillbit){ + while(powerAdvantageWorld().getBlockState(n).getBlock() == zone.moddev.mc.basesteam.init.Blocks.drillbit){ powerAdvantageWorld().setBlockToAir(n); n = n.offset(f); } diff --git a/src/main/java/com/mcmoddev/steamadvantage/machines/SteamElevatorBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamElevatorBlock.java similarity index 92% rename from src/main/java/com/mcmoddev/steamadvantage/machines/SteamElevatorBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamElevatorBlock.java index c263b9d..89412b2 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/SteamElevatorBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamElevatorBlock.java @@ -1,8 +1,8 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import com.mcmoddev.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/mcmoddev/steamadvantage/machines/SteamElevatorTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamElevatorTileEntity.java similarity index 93% rename from src/main/java/com/mcmoddev/steamadvantage/machines/SteamElevatorTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamElevatorTileEntity.java index 433c7db..db55823 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/SteamElevatorTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamElevatorTileEntity.java @@ -1,8 +1,8 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; -import com.mcmoddev.steamadvantage.init.Blocks; -import com.mcmoddev.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.EntityPlayer; import net.minecraft.init.SoundEvents; @@ -14,7 +14,7 @@ import java.util.List; -import static com.mcmoddev.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(Power.steam_power, STEAM_PER_ELEVATOR_MOVE*2, "tile.steamadvantage.steam_elevator.name"); + super(Power.steam_power, STEAM_PER_ELEVATOR_MOVE*2, "tile.basesteam.steam_elevator.name"); } private boolean redstone = true; diff --git a/src/main/java/com/mcmoddev/steamadvantage/machines/SteamPumpBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamPumpBlock.java similarity index 88% rename from src/main/java/com/mcmoddev/steamadvantage/machines/SteamPumpBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamPumpBlock.java index ba2e011..3385e2a 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/SteamPumpBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamPumpBlock.java @@ -1,11 +1,11 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import com.mcmoddev.poweradvantage.conduitnetwork.ConduitRegistry; -import com.mcmoddev.poweradvantage.init.Fluids; -import com.mcmoddev.steamadvantage.init.Blocks; -import com.mcmoddev.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.state.IBlockState; import net.minecraft.util.math.BlockPos; @@ -62,7 +62,7 @@ public boolean isPowerSource(ConduitType type){ @Override public void onBlockAdded(World w, BlockPos coord, IBlockState state){ super.onBlockAdded(w, coord, state); - ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, com.mcmoddev.poweradvantage.init.Fluids.fluidConduit_general); + ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, zone.moddev.mc.basepower.init.Fluids.fluidConduit_general); } /** diff --git a/src/main/java/com/mcmoddev/steamadvantage/machines/SteamPumpTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamPumpTileEntity.java similarity index 94% rename from src/main/java/com/mcmoddev/steamadvantage/machines/SteamPumpTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamPumpTileEntity.java index 8aa90ab..6cdaa4d 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/SteamPumpTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamPumpTileEntity.java @@ -1,15 +1,15 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; -import com.mcmoddev.poweradvantage.util.FluidIdHelper; +import zone.moddev.mc.basepower.util.FluidIdHelper; -import com.mcmoddev.steamadvantage.util.LegacyFluidHandler; +import zone.moddev.mc.basesteam.util.LegacyFluidHandler; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerRequest; -import com.mcmoddev.poweradvantage.conduitnetwork.ConduitRegistry; -import com.mcmoddev.poweradvantage.init.Fluids; -import com.mcmoddev.poweradvantage.util.FluidHandlerHelper; -import com.mcmoddev.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.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; @@ -29,7 +29,7 @@ import java.util.HashSet; import java.util.Set; -import static com.mcmoddev.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{ @@ -48,7 +48,7 @@ public class SteamPumpTileEntity extends cyano.poweradvantage.api.simple.TileEnt private byte timeUntilNextPump = PUMP_INTERVAL; public SteamPumpTileEntity() { - super(new ConduitType[]{Power.steam_power,Fluids.fluidConduit_general}, new float[]{300f,1000f}, "tile.steamadvantage.steam_pump.name"); + super(new ConduitType[]{Power.steam_power,Fluids.fluidConduit_general}, new float[]{300f,1000f}, "tile.basesteam.steam_pump.name"); tank = new FluidTank(Fluid.BUCKET_VOLUME); } @@ -65,12 +65,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() == com.mcmoddev.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, com.mcmoddev.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); @@ -215,7 +215,7 @@ public void powerUpdate(){ FluidStack fluid = getTank().getFluid(); ConduitType type = Fluids.fluidToConduitType(fluid.getFluid()); float availableAmount = getTank().getFluidAmount(); - float delta = ConduitRegistry.transmitPowerToConsumers(availableAmount, com.mcmoddev.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! @@ -342,7 +342,7 @@ public boolean isPowerSink(ConduitType type){ @Override public boolean isPowerSource(ConduitType type){ - return com.mcmoddev.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/com/mcmoddev/steamadvantage/machines/SteamStillBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamStillBlock.java similarity index 88% rename from src/main/java/com/mcmoddev/steamadvantage/machines/SteamStillBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamStillBlock.java index 13ae4ca..8b54e52 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/SteamStillBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamStillBlock.java @@ -1,10 +1,10 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import com.mcmoddev.poweradvantage.conduitnetwork.ConduitRegistry; -import com.mcmoddev.poweradvantage.init.Fluids; -import com.mcmoddev.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.state.IBlockState; import net.minecraft.util.math.BlockPos; @@ -64,7 +64,7 @@ public boolean isPowerSource(ConduitType type){ @Override public void onBlockAdded(World w, BlockPos coord, IBlockState state){ super.onBlockAdded(w, coord, state); - ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, com.mcmoddev.poweradvantage.init.Fluids.fluidConduit_general); + ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, zone.moddev.mc.basepower.init.Fluids.fluidConduit_general); } /** diff --git a/src/main/java/com/mcmoddev/steamadvantage/machines/SteamStillTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamStillTileEntity.java similarity index 95% rename from src/main/java/com/mcmoddev/steamadvantage/machines/SteamStillTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamStillTileEntity.java index 9eee603..432f383 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/SteamStillTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamStillTileEntity.java @@ -1,17 +1,17 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; -import com.mcmoddev.poweradvantage.util.FluidIdHelper; +import zone.moddev.mc.basepower.util.FluidIdHelper; -import com.mcmoddev.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 com.mcmoddev.poweradvantage.conduitnetwork.ConduitRegistry; -import com.mcmoddev.poweradvantage.init.Fluids; -import com.mcmoddev.poweradvantage.registry.still.recipe.DistillationRecipe; -import com.mcmoddev.poweradvantage.registry.still.recipe.DistillationRecipeRegistry; -import com.mcmoddev.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.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; @@ -20,7 +20,7 @@ import net.minecraft.util.SoundCategory; import net.minecraftforge.fluids.*; -import static com.mcmoddev.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{ @@ -34,7 +34,7 @@ public class SteamStillTileEntity extends cyano.poweradvantage.api.simple.TileEn private final int[] dataSyncArray = new int[5]; public SteamStillTileEntity() { - super(new ConduitType[]{Power.steam_power, Fluids.fluidConduit_general}, new float[]{100,1000}, "tile.steamadvantage.steam_still.name"); + super(new ConduitType[]{Power.steam_power, Fluids.fluidConduit_general}, new float[]{100,1000}, "tile.basesteam.steam_still.name"); outputTank = new FluidTank(Fluid.BUCKET_VOLUME ); inputTank = new FluidTank(Fluid.BUCKET_VOLUME); } @@ -87,7 +87,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, com.mcmoddev.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/com/mcmoddev/steamadvantage/machines/SteamTankBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamTankBlock.java similarity index 92% rename from src/main/java/com/mcmoddev/steamadvantage/machines/SteamTankBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamTankBlock.java index 1f92b09..eaa1d5b 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/SteamTankBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamTankBlock.java @@ -1,8 +1,8 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import com.mcmoddev.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/mcmoddev/steamadvantage/machines/SteamTankTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamTankTileEntity.java similarity index 93% rename from src/main/java/com/mcmoddev/steamadvantage/machines/SteamTankTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamTankTileEntity.java index a9810aa..21d8f79 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/machines/SteamTankTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamTankTileEntity.java @@ -1,8 +1,8 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerRequest; -import com.mcmoddev.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; @@ -14,7 +14,7 @@ public class SteamTankTileEntity extends cyano.poweradvantage.api.simple.TileEn private final int[] dataSyncArray = new int[1]; public SteamTankTileEntity() { - super(Power.steam_power, Fluid.BUCKET_VOLUME * 10, "tile.steamadvantage.steam_tank.name"); + super(Power.steam_power, Fluid.BUCKET_VOLUME * 10, "tile.basesteam.steam_tank.name"); } private boolean redstone = true; diff --git a/src/main/java/com/mcmoddev/steamadvantage/recipe/condition/MusketEnabledConditionFactory.java b/src/main/java/zone/moddev/mc/basesteam/recipe/condition/MusketEnabledConditionFactory.java similarity index 79% rename from src/main/java/com/mcmoddev/steamadvantage/recipe/condition/MusketEnabledConditionFactory.java rename to src/main/java/zone/moddev/mc/basesteam/recipe/condition/MusketEnabledConditionFactory.java index fe1ee5c..1eb486f 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/recipe/condition/MusketEnabledConditionFactory.java +++ b/src/main/java/zone/moddev/mc/basesteam/recipe/condition/MusketEnabledConditionFactory.java @@ -1,7 +1,7 @@ -package com.mcmoddev.steamadvantage.recipe.condition; +package zone.moddev.mc.basesteam.recipe.condition; import com.google.gson.JsonObject; -import com.mcmoddev.steamadvantage.SteamAdvantage; +import zone.moddev.mc.basesteam.SteamAdvantage; import net.minecraftforge.common.crafting.IConditionFactory; import net.minecraftforge.common.crafting.JsonContext; diff --git a/src/main/java/com/mcmoddev/steamadvantage/recipe/condition/RecipeModeConditionFactory.java b/src/main/java/zone/moddev/mc/basesteam/recipe/condition/RecipeModeConditionFactory.java similarity index 78% rename from src/main/java/com/mcmoddev/steamadvantage/recipe/condition/RecipeModeConditionFactory.java rename to src/main/java/zone/moddev/mc/basesteam/recipe/condition/RecipeModeConditionFactory.java index ce77237..d12be23 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/recipe/condition/RecipeModeConditionFactory.java +++ b/src/main/java/zone/moddev/mc/basesteam/recipe/condition/RecipeModeConditionFactory.java @@ -1,8 +1,8 @@ -package com.mcmoddev.steamadvantage.recipe.condition; +package zone.moddev.mc.basesteam.recipe.condition; import com.google.gson.JsonObject; -import com.mcmoddev.poweradvantage.PowerAdvantage; -import com.mcmoddev.poweradvantage.RecipeMode; +import zone.moddev.mc.basepower.PowerAdvantage; +import zone.moddev.mc.basepower.RecipeMode; import net.minecraft.util.JsonUtils; import net.minecraftforge.common.crafting.IConditionFactory; import net.minecraftforge.common.crafting.JsonContext; diff --git a/src/main/java/com/mcmoddev/steamadvantage/util/LegacyFluidHandler.java b/src/main/java/zone/moddev/mc/basesteam/util/LegacyFluidHandler.java similarity index 98% rename from src/main/java/com/mcmoddev/steamadvantage/util/LegacyFluidHandler.java rename to src/main/java/zone/moddev/mc/basesteam/util/LegacyFluidHandler.java index 4b72a6c..d835a60 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/util/LegacyFluidHandler.java +++ b/src/main/java/zone/moddev/mc/basesteam/util/LegacyFluidHandler.java @@ -1,4 +1,4 @@ -package com.mcmoddev.steamadvantage.util; +package zone.moddev.mc.basesteam.util; import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/com/mcmoddev/steamadvantage/util/SoundHelper.java b/src/main/java/zone/moddev/mc/basesteam/util/SoundHelper.java similarity index 98% rename from src/main/java/com/mcmoddev/steamadvantage/util/SoundHelper.java rename to src/main/java/zone/moddev/mc/basesteam/util/SoundHelper.java index b48e5e1..8c1eb88 100644 --- a/src/main/java/com/mcmoddev/steamadvantage/util/SoundHelper.java +++ b/src/main/java/zone/moddev/mc/basesteam/util/SoundHelper.java @@ -1,4 +1,4 @@ -package com.mcmoddev.steamadvantage.util; +package zone.moddev.mc.basesteam.util; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; 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..c215ee9 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/drillbit.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "basesteam: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..10be8be --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/platform.json @@ -0,0 +1,9 @@ +{ + "variants": { + "height=0": { "model": "basesteam:platform_shaft" }, + "height=1": { "model": "basesteam:platform1" }, + "height=2": { "model": "basesteam:platform2" }, + "height=3": { "model": "basesteam:platform3" }, + "height=4": { "model": "basesteam: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..4051e54 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/pump_pipe_steam.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": {"model": "basepower: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..21e2483 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_boiler_coal.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "basesteam:steam_boiler_coal", "y": 90 }, + "facing=north": { "model": "basesteam:steam_boiler_coal" }, + "facing=south": { "model": "basesteam:steam_boiler_coal", "y": 180 }, + "facing=west": { "model": "basesteam: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..d1c0c11 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_boiler_electric.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "basesteam:steam_boiler_electric", "y": 90 }, + "facing=north": { "model": "basesteam:steam_boiler_electric" }, + "facing=south": { "model": "basesteam:steam_boiler_electric", "y": 180 }, + "facing=west": { "model": "basesteam: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..61b70ab --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_boiler_geothermal.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "basesteam:steam_boiler_geothermal", "y": 90 }, + "facing=north": { "model": "basesteam:steam_boiler_geothermal" }, + "facing=south": { "model": "basesteam:steam_boiler_geothermal", "y": 180 }, + "facing=west": { "model": "basesteam: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..424ea9f --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_boiler_oil.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "basesteam:steam_boiler_oil", "x":270, "y": 90 }, + "facing=north": { "model": "basesteam:steam_boiler_oil", "x":270 }, + "facing=south": { "model": "basesteam:steam_boiler_oil", "x":270, "y": 180 }, + "facing=west": { "model": "basesteam: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..f749878 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_crusher.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "basesteam:steam_crusher", "y": 90 }, + "facing=north": { "model": "basesteam:steam_crusher" }, + "facing=south": { "model": "basesteam:steam_crusher", "y": 180 }, + "facing=west": { "model": "basesteam: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..bafd246 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_drill.json @@ -0,0 +1,10 @@ +{ + "variants": { + "facing=down": { "model": "basesteam:steam_drill", "x": 90 }, + "facing=up": { "model": "basesteam:steam_drill", "x": 270 }, + "facing=east": { "model": "basesteam:steam_drill", "y": 90 }, + "facing=north": { "model": "basesteam:steam_drill" }, + "facing=south": { "model": "basesteam:steam_drill", "y": 180 }, + "facing=west": { "model": "basesteam: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..70458da --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_elevator.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "basesteam:steam_elevator", "y": 90}, + "facing=north": { "model": "basesteam:steam_elevator" }, + "facing=south": { "model": "basesteam:steam_elevator", "y": 180}, + "facing=west": { "model": "basesteam: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..b6cb9a3 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_furnace.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "basesteam:steam_furnace", "y": 90 }, + "facing=north": { "model": "basesteam:steam_furnace" }, + "facing=south": { "model": "basesteam:steam_furnace", "y": 180 }, + "facing=west": { "model": "basesteam: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..9519322 --- /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:steam_pipe_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=false,west=false": { "model": "basesteam:steam_pipe_n", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=false,west=false": { "model": "basesteam:steam_pipe_n", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=false,west=false": { "model": "basesteam:steam_pipe_n", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=false,west=false": { "model": "basesteam:steam_pipe_n", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=true,west=false": { "model": "basesteam:steam_pipe_n", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=false,west=true": { "model": "basesteam:steam_pipe_n", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=false,west=false": { "model": "basesteam:steam_pipe_nw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=false,west=false": { "model": "basesteam:steam_pipe_nw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=false,west=false": { "model": "basesteam:steam_pipe_nw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=true,west=false": { "model": "basesteam:steam_pipe_ns", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=false,west=true": { "model": "basesteam:steam_pipe_nw", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=false,west=false": { "model": "basesteam:steam_pipe_nw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=false,west=false": { "model": "basesteam:steam_pipe_nw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=true,west=false": { "model": "basesteam:steam_pipe_nw", "x": 270, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=false,west=true": { "model": "basesteam:steam_pipe_ns", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=false,west=false": { "model": "basesteam:steam_pipe_ns", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=true,west=false": { "model": "basesteam:steam_pipe_nw", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=false,west=true": { "model": "basesteam:steam_pipe_nw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=true,west=false": { "model": "basesteam:steam_pipe_nw", "x": 270, "y": 270, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=false,west=true": { "model": "basesteam:steam_pipe_nw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=true,west=true": { "model": "basesteam:steam_pipe_nw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=false,west=false": { "model": "basesteam:steam_pipe_nuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=false,west=false": { "model": "basesteam:steam_pipe_nuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=true,west=false": { "model": "basesteam:steam_pipe_dnu", "x": 0, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=false,west=true": { "model": "basesteam:steam_pipe_dnu", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=false,west=false": { "model": "basesteam:steam_pipe_dnu", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=true,west=false": { "model": "basesteam:steam_pipe_dnu", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=false,west=true": { "model": "basesteam:steam_pipe_nuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=true,west=false": { "model": "basesteam:steam_pipe_dnu", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=false,west=true": { "model": "basesteam:steam_pipe_nuw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=true,west=true": { "model": "basesteam:steam_pipe_dnu", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=false,west=false": { "model": "basesteam:steam_pipe_nsw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=true,west=false": { "model": "basesteam:steam_pipe_nuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=false,west=true": { "model": "basesteam:steam_pipe_nsw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=true,west=false": { "model": "basesteam:steam_pipe_nuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=false,west=true": { "model": "basesteam:steam_pipe_nsw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=true,west=true": { "model": "basesteam:steam_pipe_dnu", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=true,west=false": { "model": "basesteam:steam_pipe_dnu", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=false,west=true": { "model": "basesteam:steam_pipe_nsw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=true,west=true": { "model": "basesteam:steam_pipe_nuw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=true,west=true": { "model": "basesteam:steam_pipe_nuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=false,west=false": { "model": "basesteam:steam_pipe_nsuw", "x": 180, "y": 180, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=true,west=false": { "model": "basesteam:steam_pipe_nsuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=false,west=true": { "model": "basesteam:steam_pipe_nsuw", "x": 180, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=true,west=false": { "model": "basesteam:steam_pipe_nsuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=false,west=true": { "model": "basesteam:steam_pipe_nsuw", "x": 180, "y": 270, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=true,west=true": { "model": "basesteam:steam_pipe_ensw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=true,west=false": { "model": "basesteam:steam_pipe_ensw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=false,west=true": { "model": "basesteam:steam_pipe_nsuw", "x": 180, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=true,west=true": { "model": "basesteam:steam_pipe_nsuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=true,west=true": { "model": "basesteam:steam_pipe_nsuw", "x": 90, "y": 270, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=true,west=false": { "model": "basesteam:steam_pipe_nsuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=false,west=true": { "model": "basesteam:steam_pipe_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=true,west=true": { "model": "basesteam:steam_pipe_nsuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=true,west=true": { "model": "basesteam:steam_pipe_nsuw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=true,west=true": { "model": "basesteam:steam_pipe_nsuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=true,west=false": { "model": "basesteam:steam_pipe_desuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=false,west=true": { "model": "basesteam:steam_pipe_desuw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=true,west=true": { "model": "basesteam:steam_pipe_desuw", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=true,west=true": { "model": "basesteam:steam_pipe_desuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=true,west=true": { "model": "basesteam:steam_pipe_desuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=true,west=true": { "model": "basesteam:steam_pipe_desuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=true,west=true": { "model": "basesteam: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..91d5bb4 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_pump.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "basesteam:steam_pump", "y": 90 }, + "facing=north": { "model": "basesteam:steam_pump" }, + "facing=south": { "model": "basesteam:steam_pump", "y": 180 }, + "facing=west": { "model": "basesteam: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..c141ef1 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_still.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "basesteam:steam_still", "y": 90 }, + "facing=north": { "model": "basesteam:steam_still" }, + "facing=south": { "model": "basesteam:steam_still", "y": 180 }, + "facing=west": { "model": "basesteam: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..4d393f1 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_switch.json @@ -0,0 +1,6 @@ +{ + "variants": { + "active=false": { "model": "basesteam:steam_switch_off"}, + "active=true": { "model": "basesteam: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..d2a94e8 --- /dev/null +++ b/src/main/resources/assets/basesteam/blockstates/steam_tank.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "basesteam:steam_tank", "y": 90, "uvlock": true }, + "facing=north": { "model": "basesteam:steam_tank", "uvlock": true }, + "facing=south": { "model": "basesteam:steam_tank", "y": 180, "uvlock": true }, + "facing=west": { "model": "basesteam: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..668bb8d --- /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:steam_track_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=false,west=false": { "model": "basesteam:steam_track_n", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=false,west=false": { "model": "basesteam:steam_track_n", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=false,west=false": { "model": "basesteam:steam_track_n", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=false,west=false": { "model": "basesteam:steam_track_n", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=true,west=false": { "model": "basesteam:steam_track_n", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=false,west=true": { "model": "basesteam:steam_track_n", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=false,west=false": { "model": "basesteam:steam_track_nw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=false,west=false": { "model": "basesteam:steam_track_nw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=false,west=false": { "model": "basesteam:steam_track_nw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=true,west=false": { "model": "basesteam:steam_track_ns", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=false,west=true": { "model": "basesteam:steam_track_nw", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=false,west=false": { "model": "basesteam:steam_track_nw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=false,west=false": { "model": "basesteam:steam_track_nw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=true,west=false": { "model": "basesteam:steam_track_nw", "x": 270, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=false,west=true": { "model": "basesteam:steam_track_ns", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=false,west=false": { "model": "basesteam:steam_track_ns", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=true,west=false": { "model": "basesteam:steam_track_nw", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=false,west=true": { "model": "basesteam:steam_track_nw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=true,west=false": { "model": "basesteam:steam_track_nw", "x": 270, "y": 270, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=false,west=true": { "model": "basesteam:steam_track_nw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=true,west=true": { "model": "basesteam:steam_track_nw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=false,west=false": { "model": "basesteam:steam_track_nuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=false,west=false": { "model": "basesteam:steam_track_nuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=true,west=false": { "model": "basesteam:steam_track_dnu", "x": 0, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=false,west=true": { "model": "basesteam:steam_track_dnu", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=false,west=false": { "model": "basesteam:steam_track_dnu", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=true,west=false": { "model": "basesteam:steam_track_dnu", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=false,west=true": { "model": "basesteam:steam_track_nuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=true,west=false": { "model": "basesteam:steam_track_dnu", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=false,west=true": { "model": "basesteam:steam_track_nuw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=true,west=true": { "model": "basesteam:steam_track_dnu", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=false,west=false": { "model": "basesteam:steam_track_nsw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=true,west=false": { "model": "basesteam:steam_track_nuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=false,west=true": { "model": "basesteam:steam_track_nsw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=true,west=false": { "model": "basesteam:steam_track_nuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=false,west=true": { "model": "basesteam:steam_track_nsw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=true,west=true": { "model": "basesteam:steam_track_dnu", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=true,west=false": { "model": "basesteam:steam_track_dnu", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=false,west=true": { "model": "basesteam:steam_track_nsw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=true,west=true": { "model": "basesteam:steam_track_nuw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=true,west=true": { "model": "basesteam:steam_track_nuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=false,west=false": { "model": "basesteam:steam_track_nsuw", "x": 180, "y": 180, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=true,west=false": { "model": "basesteam:steam_track_nsuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=false,west=true": { "model": "basesteam:steam_track_nsuw", "x": 180, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=true,west=false": { "model": "basesteam:steam_track_nsuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=false,west=true": { "model": "basesteam:steam_track_nsuw", "x": 180, "y": 270, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=true,west=true": { "model": "basesteam:steam_track_ensw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=true,west=false": { "model": "basesteam:steam_track_ensw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=false,west=true": { "model": "basesteam:steam_track_nsuw", "x": 180, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=true,west=true": { "model": "basesteam:steam_track_nsuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=true,west=true": { "model": "basesteam:steam_track_nsuw", "x": 90, "y": 270, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=true,west=false": { "model": "basesteam:steam_track_nsuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=false,west=true": { "model": "basesteam:steam_track_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=true,west=true": { "model": "basesteam:steam_track_nsuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=true,west=true": { "model": "basesteam:steam_track_nsuw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=true,west=true": { "model": "basesteam:steam_track_nsuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=true,west=false": { "model": "basesteam:steam_track_desuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=false,west=true": { "model": "basesteam:steam_track_desuw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=true,west=true": { "model": "basesteam:steam_track_desuw", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=true,west=true": { "model": "basesteam:steam_track_desuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=true,west=true": { "model": "basesteam:steam_track_desuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=true,west=true": { "model": "basesteam:steam_track_desuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=true,west=true": { "model": "basesteam: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.lang b/src/main/resources/assets/basesteam/lang/de_de.lang new file mode 100644 index 0000000..4ba9d9f --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/de_de.lang @@ -0,0 +1,43 @@ +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 diff --git a/src/main/resources/assets/basesteam/lang/en_au.lang b/src/main/resources/assets/basesteam/lang/en_au.lang new file mode 100644 index 0000000..2134f6a --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/en_au.lang @@ -0,0 +1,43 @@ +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 diff --git a/src/main/resources/assets/basesteam/lang/en_ca.lang b/src/main/resources/assets/basesteam/lang/en_ca.lang new file mode 100644 index 0000000..ebdce20 --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/en_ca.lang @@ -0,0 +1,42 @@ + +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 diff --git a/src/main/resources/assets/basesteam/lang/en_en.lang b/src/main/resources/assets/basesteam/lang/en_en.lang new file mode 100644 index 0000000..ebdce20 --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/en_en.lang @@ -0,0 +1,42 @@ + +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 diff --git a/src/main/resources/assets/basesteam/lang/en_gb.lang b/src/main/resources/assets/basesteam/lang/en_gb.lang new file mode 100644 index 0000000..ebdce20 --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/en_gb.lang @@ -0,0 +1,42 @@ + +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 diff --git a/src/main/resources/assets/basesteam/lang/en_pt.lang b/src/main/resources/assets/basesteam/lang/en_pt.lang new file mode 100644 index 0000000..2fcf4f3 --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/en_pt.lang @@ -0,0 +1,44 @@ +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 diff --git a/src/main/resources/assets/basesteam/lang/en_us.lang b/src/main/resources/assets/basesteam/lang/en_us.lang new file mode 100644 index 0000000..2134f6a --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/en_us.lang @@ -0,0 +1,43 @@ +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 diff --git a/src/main/resources/assets/basesteam/lang/es_es.lang b/src/main/resources/assets/basesteam/lang/es_es.lang new file mode 100644 index 0000000..1fc6e02 --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/es_es.lang @@ -0,0 +1,43 @@ +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 diff --git a/src/main/resources/assets/basesteam/lang/es_mx.lang b/src/main/resources/assets/basesteam/lang/es_mx.lang new file mode 100644 index 0000000..b90d990 --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/es_mx.lang @@ -0,0 +1,46 @@ +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 diff --git a/src/main/resources/assets/basesteam/lang/fr_ca.lang b/src/main/resources/assets/basesteam/lang/fr_ca.lang new file mode 100644 index 0000000..ba88cba --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/fr_ca.lang @@ -0,0 +1,43 @@ +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 diff --git a/src/main/resources/assets/basesteam/lang/fr_fr.lang b/src/main/resources/assets/basesteam/lang/fr_fr.lang new file mode 100644 index 0000000..4654384 --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/fr_fr.lang @@ -0,0 +1,44 @@ +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 diff --git a/src/main/resources/assets/basesteam/lang/it_it.lang b/src/main/resources/assets/basesteam/lang/it_it.lang new file mode 100644 index 0000000..7886b57 --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/it_it.lang @@ -0,0 +1,44 @@ +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 diff --git a/src/main/resources/assets/basesteam/lang/ja_jp.lang b/src/main/resources/assets/basesteam/lang/ja_jp.lang new file mode 100644 index 0000000..77fcf9a --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/ja_jp.lang @@ -0,0 +1,45 @@ +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=ポンプ配管 diff --git a/src/main/resources/assets/basesteam/lang/ko_kr.lang b/src/main/resources/assets/basesteam/lang/ko_kr.lang new file mode 100644 index 0000000..61844a5 --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/ko_kr.lang @@ -0,0 +1,46 @@ +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=펌프 파이프 diff --git a/src/main/resources/assets/basesteam/lang/pt_br.lang b/src/main/resources/assets/basesteam/lang/pt_br.lang new file mode 100644 index 0000000..a800881 --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/pt_br.lang @@ -0,0 +1,46 @@ +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 diff --git a/src/main/resources/assets/basesteam/lang/zh_cn.lang b/src/main/resources/assets/basesteam/lang/zh_cn.lang new file mode 100644 index 0000000..e7a66e7 --- /dev/null +++ b/src/main/resources/assets/basesteam/lang/zh_cn.lang @@ -0,0 +1,45 @@ +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=泵管 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/basesteam/recipes/_factories.json b/src/main/resources/assets/basesteam/recipes/_factories.json new file mode 100644 index 0000000..84c5959 --- /dev/null +++ b/src/main/resources/assets/basesteam/recipes/_factories.json @@ -0,0 +1,6 @@ +{ + "conditions": { + "recipe_mode": "zone.moddev.mc.basesteam.recipe.condition.RecipeModeConditionFactory", + "musket_enabled": "zone.moddev.mc.basesteam.recipe.condition.MusketEnabledConditionFactory" + } +} diff --git a/src/main/resources/assets/steamadvantage/recipes/blackpowder_cartridge.json b/src/main/resources/assets/basesteam/recipes/blackpowder_cartridge.json similarity index 84% rename from src/main/resources/assets/steamadvantage/recipes/blackpowder_cartridge.json rename to src/main/resources/assets/basesteam/recipes/blackpowder_cartridge.json index 71ec2ba..66f705b 100644 --- a/src/main/resources/assets/steamadvantage/recipes/blackpowder_cartridge.json +++ b/src/main/resources/assets/basesteam/recipes/blackpowder_cartridge.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "steamadvantage:blackpowder_cartridge" + "item": "basesteam:blackpowder_cartridge" }, "group": "weapons" } diff --git a/src/main/resources/assets/steamadvantage/recipes/musket_left_normal.json b/src/main/resources/assets/basesteam/recipes/musket_left_normal.json similarity index 75% rename from src/main/resources/assets/steamadvantage/recipes/musket_left_normal.json rename to src/main/resources/assets/basesteam/recipes/musket_left_normal.json index ea0125c..7f2a2d1 100644 --- a/src/main/resources/assets/steamadvantage/recipes/musket_left_normal.json +++ b/src/main/resources/assets/basesteam/recipes/musket_left_normal.json @@ -18,15 +18,15 @@ } }, "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" } ], "group": "weapons" diff --git a/src/main/resources/assets/steamadvantage/recipes/musket_left_tech.json b/src/main/resources/assets/basesteam/recipes/musket_left_tech.json similarity index 75% rename from src/main/resources/assets/steamadvantage/recipes/musket_left_tech.json rename to src/main/resources/assets/basesteam/recipes/musket_left_tech.json index 9c4590c..3e970ab 100644 --- a/src/main/resources/assets/steamadvantage/recipes/musket_left_tech.json +++ b/src/main/resources/assets/basesteam/recipes/musket_left_tech.json @@ -18,15 +18,15 @@ } }, "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" } ], "group": "weapons" diff --git a/src/main/resources/assets/steamadvantage/recipes/musket_right_normal.json b/src/main/resources/assets/basesteam/recipes/musket_right_normal.json similarity index 75% rename from src/main/resources/assets/steamadvantage/recipes/musket_right_normal.json rename to src/main/resources/assets/basesteam/recipes/musket_right_normal.json index 176192c..71d9893 100644 --- a/src/main/resources/assets/steamadvantage/recipes/musket_right_normal.json +++ b/src/main/resources/assets/basesteam/recipes/musket_right_normal.json @@ -18,15 +18,15 @@ } }, "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" } ], "group": "weapons" diff --git a/src/main/resources/assets/steamadvantage/recipes/musket_right_tech.json b/src/main/resources/assets/basesteam/recipes/musket_right_tech.json similarity index 75% rename from src/main/resources/assets/steamadvantage/recipes/musket_right_tech.json rename to src/main/resources/assets/basesteam/recipes/musket_right_tech.json index 781dcfd..7773019 100644 --- a/src/main/resources/assets/steamadvantage/recipes/musket_right_tech.json +++ b/src/main/resources/assets/basesteam/recipes/musket_right_tech.json @@ -18,15 +18,15 @@ } }, "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" } ], "group": "weapons" diff --git a/src/main/resources/assets/steamadvantage/recipes/steam_boiler_coal.json b/src/main/resources/assets/basesteam/recipes/steam_boiler_coal.json similarity index 89% rename from src/main/resources/assets/steamadvantage/recipes/steam_boiler_coal.json rename to src/main/resources/assets/basesteam/recipes/steam_boiler_coal.json index 885dbd3..7102748 100644 --- a/src/main/resources/assets/steamadvantage/recipes/steam_boiler_coal.json +++ b/src/main/resources/assets/basesteam/recipes/steam_boiler_coal.json @@ -23,7 +23,7 @@ } }, "result": { - "item": "steamadvantage:steam_boiler_coal" + "item": "basesteam:steam_boiler_coal" }, "group": "steam_machines" } diff --git a/src/main/resources/assets/steamadvantage/recipes/steam_boiler_electric.json b/src/main/resources/assets/basesteam/recipes/steam_boiler_electric.json similarity index 89% rename from src/main/resources/assets/steamadvantage/recipes/steam_boiler_electric.json rename to src/main/resources/assets/basesteam/recipes/steam_boiler_electric.json index 0122f67..82227a4 100644 --- a/src/main/resources/assets/steamadvantage/recipes/steam_boiler_electric.json +++ b/src/main/resources/assets/basesteam/recipes/steam_boiler_electric.json @@ -27,7 +27,7 @@ } }, "result": { - "item": "steamadvantage:steam_boiler_electric" + "item": "basesteam:steam_boiler_electric" }, "group": "steam_machines" } diff --git a/src/main/resources/assets/steamadvantage/recipes/steam_boiler_geothermal.json b/src/main/resources/assets/basesteam/recipes/steam_boiler_geothermal.json similarity index 89% rename from src/main/resources/assets/steamadvantage/recipes/steam_boiler_geothermal.json rename to src/main/resources/assets/basesteam/recipes/steam_boiler_geothermal.json index e58a957..07b6663 100644 --- a/src/main/resources/assets/steamadvantage/recipes/steam_boiler_geothermal.json +++ b/src/main/resources/assets/basesteam/recipes/steam_boiler_geothermal.json @@ -27,7 +27,7 @@ } }, "result": { - "item": "steamadvantage:steam_boiler_geothermal" + "item": "basesteam:steam_boiler_geothermal" }, "group": "steam_machines" } diff --git a/src/main/resources/assets/steamadvantage/recipes/steam_boiler_oil.json b/src/main/resources/assets/basesteam/recipes/steam_boiler_oil.json similarity index 90% rename from src/main/resources/assets/steamadvantage/recipes/steam_boiler_oil.json rename to src/main/resources/assets/basesteam/recipes/steam_boiler_oil.json index e3e4d26..e45082a 100644 --- a/src/main/resources/assets/steamadvantage/recipes/steam_boiler_oil.json +++ b/src/main/resources/assets/basesteam/recipes/steam_boiler_oil.json @@ -26,7 +26,7 @@ } }, "result": { - "item": "steamadvantage:steam_boiler_oil" + "item": "basesteam:steam_boiler_oil" }, "group": "steam_machines" } diff --git a/src/main/resources/assets/steamadvantage/recipes/steam_crusher.json b/src/main/resources/assets/basesteam/recipes/steam_crusher.json similarity index 91% rename from src/main/resources/assets/steamadvantage/recipes/steam_crusher.json rename to src/main/resources/assets/basesteam/recipes/steam_crusher.json index 19f80f8..e0bbccf 100644 --- a/src/main/resources/assets/steamadvantage/recipes/steam_crusher.json +++ b/src/main/resources/assets/basesteam/recipes/steam_crusher.json @@ -27,7 +27,7 @@ } }, "result": { - "item": "steamadvantage:steam_crusher" + "item": "basesteam:steam_crusher" }, "group": "steam_machines" } diff --git a/src/main/resources/assets/steamadvantage/recipes/steam_drill.json b/src/main/resources/assets/basesteam/recipes/steam_drill.json similarity index 80% rename from src/main/resources/assets/steamadvantage/recipes/steam_drill.json rename to src/main/resources/assets/basesteam/recipes/steam_drill.json index 981351c..3326b97 100644 --- a/src/main/resources/assets/steamadvantage/recipes/steam_drill.json +++ b/src/main/resources/assets/basesteam/recipes/steam_drill.json @@ -6,7 +6,7 @@ ], "key": { "X": { - "item": "steamadvantage:steam_drill_bit" + "item": "basesteam:steam_drill_bit" }, "g": { "type": "forge:ore_dict", @@ -22,7 +22,7 @@ } }, "result": { - "item": "steamadvantage:steam_drill" + "item": "basesteam:steam_drill" }, "group": "steam_machines" } diff --git a/src/main/resources/assets/steamadvantage/recipes/steam_drill_bit.json b/src/main/resources/assets/basesteam/recipes/steam_drill_bit.json similarity index 88% rename from src/main/resources/assets/steamadvantage/recipes/steam_drill_bit.json rename to src/main/resources/assets/basesteam/recipes/steam_drill_bit.json index 51c2f82..c4ab80c 100644 --- a/src/main/resources/assets/steamadvantage/recipes/steam_drill_bit.json +++ b/src/main/resources/assets/basesteam/recipes/steam_drill_bit.json @@ -20,7 +20,7 @@ } }, "result": { - "item": "steamadvantage:steam_drill_bit" + "item": "basesteam:steam_drill_bit" }, "group": "parts" } diff --git a/src/main/resources/assets/steamadvantage/recipes/steam_drill_diamond_pickaxe_normal.json b/src/main/resources/assets/basesteam/recipes/steam_drill_diamond_pickaxe_normal.json similarity index 84% rename from src/main/resources/assets/steamadvantage/recipes/steam_drill_diamond_pickaxe_normal.json rename to src/main/resources/assets/basesteam/recipes/steam_drill_diamond_pickaxe_normal.json index baf00a4..293446d 100644 --- a/src/main/resources/assets/steamadvantage/recipes/steam_drill_diamond_pickaxe_normal.json +++ b/src/main/resources/assets/basesteam/recipes/steam_drill_diamond_pickaxe_normal.json @@ -22,11 +22,11 @@ } }, "result": { - "item": "steamadvantage:steam_drill" + "item": "basesteam:steam_drill" }, "conditions": [ { - "type": "steamadvantage:recipe_mode", + "type": "basesteam:recipe_mode", "mode": "NORMAL" } ], diff --git a/src/main/resources/assets/steamadvantage/recipes/steam_elevator.json b/src/main/resources/assets/basesteam/recipes/steam_elevator.json similarity index 91% rename from src/main/resources/assets/steamadvantage/recipes/steam_elevator.json rename to src/main/resources/assets/basesteam/recipes/steam_elevator.json index b885f67..21b1e83 100644 --- a/src/main/resources/assets/steamadvantage/recipes/steam_elevator.json +++ b/src/main/resources/assets/basesteam/recipes/steam_elevator.json @@ -27,7 +27,7 @@ } }, "result": { - "item": "steamadvantage:steam_elevator" + "item": "basesteam:steam_elevator" }, "group": "steam_machines" } diff --git a/src/main/resources/assets/steamadvantage/recipes/steam_furnace.json b/src/main/resources/assets/basesteam/recipes/steam_furnace.json similarity index 89% rename from src/main/resources/assets/steamadvantage/recipes/steam_furnace.json rename to src/main/resources/assets/basesteam/recipes/steam_furnace.json index 951063c..6603558 100644 --- a/src/main/resources/assets/steamadvantage/recipes/steam_furnace.json +++ b/src/main/resources/assets/basesteam/recipes/steam_furnace.json @@ -22,7 +22,7 @@ } }, "result": { - "item": "steamadvantage:steam_furnace" + "item": "basesteam:steam_furnace" }, "group": "steam_machines" } diff --git a/src/main/resources/assets/steamadvantage/recipes/steam_governor_apocalyptic.json b/src/main/resources/assets/basesteam/recipes/steam_governor_apocalyptic.json similarity index 83% rename from src/main/resources/assets/steamadvantage/recipes/steam_governor_apocalyptic.json rename to src/main/resources/assets/basesteam/recipes/steam_governor_apocalyptic.json index bc6468c..78cb905 100644 --- a/src/main/resources/assets/steamadvantage/recipes/steam_governor_apocalyptic.json +++ b/src/main/resources/assets/basesteam/recipes/steam_governor_apocalyptic.json @@ -24,11 +24,11 @@ } }, "result": { - "item": "steamadvantage:steam_governor" + "item": "basesteam:steam_governor" }, "conditions": [ { - "type": "steamadvantage:recipe_mode", + "type": "basesteam:recipe_mode", "mode": "APOCALYPTIC" } ], diff --git a/src/main/resources/assets/steamadvantage/recipes/steam_governor_normal.json b/src/main/resources/assets/basesteam/recipes/steam_governor_normal.json similarity index 82% rename from src/main/resources/assets/steamadvantage/recipes/steam_governor_normal.json rename to src/main/resources/assets/basesteam/recipes/steam_governor_normal.json index 6367cc9..94ebad1 100644 --- a/src/main/resources/assets/steamadvantage/recipes/steam_governor_normal.json +++ b/src/main/resources/assets/basesteam/recipes/steam_governor_normal.json @@ -22,11 +22,11 @@ } }, "result": { - "item": "steamadvantage:steam_governor" + "item": "basesteam:steam_governor" }, "conditions": [ { - "type": "steamadvantage:recipe_mode", + "type": "basesteam:recipe_mode", "mode": "NORMAL" } ], diff --git a/src/main/resources/assets/steamadvantage/recipes/steam_governor_tech.json b/src/main/resources/assets/basesteam/recipes/steam_governor_tech.json similarity index 83% rename from src/main/resources/assets/steamadvantage/recipes/steam_governor_tech.json rename to src/main/resources/assets/basesteam/recipes/steam_governor_tech.json index c68d19a..3481002 100644 --- a/src/main/resources/assets/steamadvantage/recipes/steam_governor_tech.json +++ b/src/main/resources/assets/basesteam/recipes/steam_governor_tech.json @@ -24,11 +24,11 @@ } }, "result": { - "item": "steamadvantage:steam_governor" + "item": "basesteam:steam_governor" }, "conditions": [ { - "type": "steamadvantage:recipe_mode", + "type": "basesteam:recipe_mode", "mode": "TECH_PROGRESSION" } ], diff --git a/src/main/resources/assets/steamadvantage/recipes/steam_pipe.json b/src/main/resources/assets/basesteam/recipes/steam_pipe.json similarity index 83% rename from src/main/resources/assets/steamadvantage/recipes/steam_pipe.json rename to src/main/resources/assets/basesteam/recipes/steam_pipe.json index 29da7f3..0b2dc08 100644 --- a/src/main/resources/assets/steamadvantage/recipes/steam_pipe.json +++ b/src/main/resources/assets/basesteam/recipes/steam_pipe.json @@ -12,7 +12,7 @@ } }, "result": { - "item": "steamadvantage:steam_pipe", + "item": "basesteam:steam_pipe", "count": 6 }, "group": "pipes" diff --git a/src/main/resources/assets/steamadvantage/recipes/steam_pump.json b/src/main/resources/assets/basesteam/recipes/steam_pump.json similarity index 91% rename from src/main/resources/assets/steamadvantage/recipes/steam_pump.json rename to src/main/resources/assets/basesteam/recipes/steam_pump.json index e93712f..9e29ebc 100644 --- a/src/main/resources/assets/steamadvantage/recipes/steam_pump.json +++ b/src/main/resources/assets/basesteam/recipes/steam_pump.json @@ -26,7 +26,7 @@ } }, "result": { - "item": "steamadvantage:steam_pump" + "item": "basesteam:steam_pump" }, "group": "steam_machines" } diff --git a/src/main/resources/assets/steamadvantage/recipes/steam_still.json b/src/main/resources/assets/basesteam/recipes/steam_still.json similarity index 91% rename from src/main/resources/assets/steamadvantage/recipes/steam_still.json rename to src/main/resources/assets/basesteam/recipes/steam_still.json index 6cad9a5..78c5d0f 100644 --- a/src/main/resources/assets/steamadvantage/recipes/steam_still.json +++ b/src/main/resources/assets/basesteam/recipes/steam_still.json @@ -26,7 +26,7 @@ } }, "result": { - "item": "steamadvantage:steam_still" + "item": "basesteam:steam_still" }, "group": "steam_machines" } diff --git a/src/main/resources/assets/steamadvantage/recipes/steam_switch.json b/src/main/resources/assets/basesteam/recipes/steam_switch.json similarity index 88% rename from src/main/resources/assets/steamadvantage/recipes/steam_switch.json rename to src/main/resources/assets/basesteam/recipes/steam_switch.json index 6aad0c9..c186f11 100644 --- a/src/main/resources/assets/steamadvantage/recipes/steam_switch.json +++ b/src/main/resources/assets/basesteam/recipes/steam_switch.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "steamadvantage:steam_switch" + "item": "basesteam:steam_switch" }, "group": "steam_machines" } diff --git a/src/main/resources/assets/steamadvantage/recipes/steam_tank.json b/src/main/resources/assets/basesteam/recipes/steam_tank.json similarity index 89% rename from src/main/resources/assets/steamadvantage/recipes/steam_tank.json rename to src/main/resources/assets/basesteam/recipes/steam_tank.json index 75008f3..e20ffbd 100644 --- a/src/main/resources/assets/steamadvantage/recipes/steam_tank.json +++ b/src/main/resources/assets/basesteam/recipes/steam_tank.json @@ -20,7 +20,7 @@ } }, "result": { - "item": "steamadvantage:steam_tank" + "item": "basesteam:steam_tank" }, "group": "steam_machines" } diff --git a/src/main/resources/assets/basesteam/recipes/steam_track.json b/src/main/resources/assets/basesteam/recipes/steam_track.json new file mode 100644 index 0000000..40c0f9c --- /dev/null +++ b/src/main/resources/assets/basesteam/recipes/steam_track.json @@ -0,0 +1,15 @@ +{ + "type": "forge:ore_shapeless", + "ingredients": [ + { + "item": "basesteam:steam_pipe" + }, + { + "item": "basepower:steel_frame" + } + ], + "result": { + "item": "basesteam:steam_track" + }, + "group": "tracks" +} 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 c24a259..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/drillbit.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "steamadvantage: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 afe5e15..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/platform.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "variants": { - "height=0": { "model": "steamadvantage:platform_shaft" }, - "height=1": { "model": "steamadvantage:platform1" }, - "height=2": { "model": "steamadvantage:platform2" }, - "height=3": { "model": "steamadvantage:platform3" }, - "height=4": { "model": "steamadvantage: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 ee18552..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/pump_pipe_steam.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": {"model": "poweradvantage: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 17325a4..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_boiler_coal.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "steamadvantage:steam_boiler_coal", "y": 90 }, - "facing=north": { "model": "steamadvantage:steam_boiler_coal" }, - "facing=south": { "model": "steamadvantage:steam_boiler_coal", "y": 180 }, - "facing=west": { "model": "steamadvantage: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 67a3660..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_boiler_electric.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "steamadvantage:steam_boiler_electric", "y": 90 }, - "facing=north": { "model": "steamadvantage:steam_boiler_electric" }, - "facing=south": { "model": "steamadvantage:steam_boiler_electric", "y": 180 }, - "facing=west": { "model": "steamadvantage: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 6ad2105..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_boiler_geothermal.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "steamadvantage:steam_boiler_geothermal", "y": 90 }, - "facing=north": { "model": "steamadvantage:steam_boiler_geothermal" }, - "facing=south": { "model": "steamadvantage:steam_boiler_geothermal", "y": 180 }, - "facing=west": { "model": "steamadvantage: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 2d1855f..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_boiler_oil.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "steamadvantage:steam_boiler_oil", "x":270, "y": 90 }, - "facing=north": { "model": "steamadvantage:steam_boiler_oil", "x":270 }, - "facing=south": { "model": "steamadvantage:steam_boiler_oil", "x":270, "y": 180 }, - "facing=west": { "model": "steamadvantage: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 7aed4d1..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_crusher.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "steamadvantage:steam_crusher", "y": 90 }, - "facing=north": { "model": "steamadvantage:steam_crusher" }, - "facing=south": { "model": "steamadvantage:steam_crusher", "y": 180 }, - "facing=west": { "model": "steamadvantage: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 d1585b3..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_drill.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "facing=down": { "model": "steamadvantage:steam_drill", "x": 90 }, - "facing=up": { "model": "steamadvantage:steam_drill", "x": 270 }, - "facing=east": { "model": "steamadvantage:steam_drill", "y": 90 }, - "facing=north": { "model": "steamadvantage:steam_drill" }, - "facing=south": { "model": "steamadvantage:steam_drill", "y": 180 }, - "facing=west": { "model": "steamadvantage: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 c98e432..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_elevator.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "steamadvantage:steam_elevator", "y": 90}, - "facing=north": { "model": "steamadvantage:steam_elevator" }, - "facing=south": { "model": "steamadvantage:steam_elevator", "y": 180}, - "facing=west": { "model": "steamadvantage: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 145bf50..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_furnace.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "steamadvantage:steam_furnace", "y": 90 }, - "facing=north": { "model": "steamadvantage:steam_furnace" }, - "facing=south": { "model": "steamadvantage:steam_furnace", "y": 180 }, - "facing=west": { "model": "steamadvantage: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 da73875..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:steam_pipe_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=false,west=false": { "model": "steamadvantage:steam_pipe_n", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=false,west=false": { "model": "steamadvantage:steam_pipe_n", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=false,west=false": { "model": "steamadvantage:steam_pipe_n", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=false,west=false": { "model": "steamadvantage:steam_pipe_n", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=true,west=false": { "model": "steamadvantage:steam_pipe_n", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=false,west=true": { "model": "steamadvantage:steam_pipe_n", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=false,west=false": { "model": "steamadvantage:steam_pipe_nw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=false,west=false": { "model": "steamadvantage:steam_pipe_nw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=false,west=false": { "model": "steamadvantage:steam_pipe_nw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=true,west=false": { "model": "steamadvantage:steam_pipe_ns", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=false,west=true": { "model": "steamadvantage:steam_pipe_nw", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=false,west=false": { "model": "steamadvantage:steam_pipe_nw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=false,west=false": { "model": "steamadvantage:steam_pipe_nw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=true,west=false": { "model": "steamadvantage:steam_pipe_nw", "x": 270, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=false,west=true": { "model": "steamadvantage:steam_pipe_ns", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=false,west=false": { "model": "steamadvantage:steam_pipe_ns", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=true,west=false": { "model": "steamadvantage:steam_pipe_nw", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=false,west=true": { "model": "steamadvantage:steam_pipe_nw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=true,west=false": { "model": "steamadvantage:steam_pipe_nw", "x": 270, "y": 270, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=false,west=true": { "model": "steamadvantage:steam_pipe_nw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=true,west=true": { "model": "steamadvantage:steam_pipe_nw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=false,west=false": { "model": "steamadvantage:steam_pipe_nuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=false,west=false": { "model": "steamadvantage:steam_pipe_nuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=true,west=false": { "model": "steamadvantage:steam_pipe_dnu", "x": 0, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=false,west=true": { "model": "steamadvantage:steam_pipe_dnu", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=false,west=false": { "model": "steamadvantage:steam_pipe_dnu", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=true,west=false": { "model": "steamadvantage:steam_pipe_dnu", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=false,west=true": { "model": "steamadvantage:steam_pipe_nuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=true,west=false": { "model": "steamadvantage:steam_pipe_dnu", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=false,west=true": { "model": "steamadvantage:steam_pipe_nuw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=true,west=true": { "model": "steamadvantage:steam_pipe_dnu", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=false,west=false": { "model": "steamadvantage:steam_pipe_nsw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=true,west=false": { "model": "steamadvantage:steam_pipe_nuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=false,west=true": { "model": "steamadvantage:steam_pipe_nsw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=true,west=false": { "model": "steamadvantage:steam_pipe_nuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=false,west=true": { "model": "steamadvantage:steam_pipe_nsw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=true,west=true": { "model": "steamadvantage:steam_pipe_dnu", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=true,west=false": { "model": "steamadvantage:steam_pipe_dnu", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=false,west=true": { "model": "steamadvantage:steam_pipe_nsw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=true,west=true": { "model": "steamadvantage:steam_pipe_nuw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=true,west=true": { "model": "steamadvantage:steam_pipe_nuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=false,west=false": { "model": "steamadvantage:steam_pipe_nsuw", "x": 180, "y": 180, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=true,west=false": { "model": "steamadvantage:steam_pipe_nsuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=false,west=true": { "model": "steamadvantage:steam_pipe_nsuw", "x": 180, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=true,west=false": { "model": "steamadvantage:steam_pipe_nsuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=false,west=true": { "model": "steamadvantage:steam_pipe_nsuw", "x": 180, "y": 270, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=true,west=true": { "model": "steamadvantage:steam_pipe_ensw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=true,west=false": { "model": "steamadvantage:steam_pipe_ensw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=false,west=true": { "model": "steamadvantage:steam_pipe_nsuw", "x": 180, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=true,west=true": { "model": "steamadvantage:steam_pipe_nsuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=true,west=true": { "model": "steamadvantage:steam_pipe_nsuw", "x": 90, "y": 270, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=true,west=false": { "model": "steamadvantage:steam_pipe_nsuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=false,west=true": { "model": "steamadvantage:steam_pipe_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=true,west=true": { "model": "steamadvantage:steam_pipe_nsuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=true,west=true": { "model": "steamadvantage:steam_pipe_nsuw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=true,west=true": { "model": "steamadvantage:steam_pipe_nsuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=true,west=false": { "model": "steamadvantage:steam_pipe_desuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=false,west=true": { "model": "steamadvantage:steam_pipe_desuw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=true,west=true": { "model": "steamadvantage:steam_pipe_desuw", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=true,west=true": { "model": "steamadvantage:steam_pipe_desuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=true,west=true": { "model": "steamadvantage:steam_pipe_desuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=true,west=true": { "model": "steamadvantage:steam_pipe_desuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=true,west=true": { "model": "steamadvantage: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 19a20dd..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_pump.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "steamadvantage:steam_pump", "y": 90 }, - "facing=north": { "model": "steamadvantage:steam_pump" }, - "facing=south": { "model": "steamadvantage:steam_pump", "y": 180 }, - "facing=west": { "model": "steamadvantage: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 b008d4e..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_still.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "steamadvantage:steam_still", "y": 90 }, - "facing=north": { "model": "steamadvantage:steam_still" }, - "facing=south": { "model": "steamadvantage:steam_still", "y": 180 }, - "facing=west": { "model": "steamadvantage: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 7da844b..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_switch.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "active=false": { "model": "steamadvantage:steam_switch_off"}, - "active=true": { "model": "steamadvantage: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 72a453d..0000000 --- a/src/main/resources/assets/steamadvantage/blockstates/steam_tank.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "steamadvantage:steam_tank", "y": 90, "uvlock": true }, - "facing=north": { "model": "steamadvantage:steam_tank", "uvlock": true }, - "facing=south": { "model": "steamadvantage:steam_tank", "y": 180, "uvlock": true }, - "facing=west": { "model": "steamadvantage: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 d24efce..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:steam_track_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=false,west=false": { "model": "steamadvantage:steam_track_n", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=false,west=false": { "model": "steamadvantage:steam_track_n", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=false,west=false": { "model": "steamadvantage:steam_track_n", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=false,west=false": { "model": "steamadvantage:steam_track_n", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=true,west=false": { "model": "steamadvantage:steam_track_n", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=false,west=true": { "model": "steamadvantage:steam_track_n", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=false,west=false": { "model": "steamadvantage:steam_track_nw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=false,west=false": { "model": "steamadvantage:steam_track_nw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=false,west=false": { "model": "steamadvantage:steam_track_nw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=true,west=false": { "model": "steamadvantage:steam_track_ns", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=false,west=true": { "model": "steamadvantage:steam_track_nw", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=false,west=false": { "model": "steamadvantage:steam_track_nw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=false,west=false": { "model": "steamadvantage:steam_track_nw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=true,west=false": { "model": "steamadvantage:steam_track_nw", "x": 270, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=false,west=true": { "model": "steamadvantage:steam_track_ns", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=false,west=false": { "model": "steamadvantage:steam_track_ns", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=true,west=false": { "model": "steamadvantage:steam_track_nw", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=false,west=true": { "model": "steamadvantage:steam_track_nw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=true,west=false": { "model": "steamadvantage:steam_track_nw", "x": 270, "y": 270, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=false,west=true": { "model": "steamadvantage:steam_track_nw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=true,west=true": { "model": "steamadvantage:steam_track_nw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=false,west=false": { "model": "steamadvantage:steam_track_nuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=false,west=false": { "model": "steamadvantage:steam_track_nuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=true,west=false": { "model": "steamadvantage:steam_track_dnu", "x": 0, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=false,west=true": { "model": "steamadvantage:steam_track_dnu", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=false,west=false": { "model": "steamadvantage:steam_track_dnu", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=true,west=false": { "model": "steamadvantage:steam_track_dnu", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=false,west=true": { "model": "steamadvantage:steam_track_nuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=true,west=false": { "model": "steamadvantage:steam_track_dnu", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=false,west=true": { "model": "steamadvantage:steam_track_nuw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=true,west=true": { "model": "steamadvantage:steam_track_dnu", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=false,west=false": { "model": "steamadvantage:steam_track_nsw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=true,west=false": { "model": "steamadvantage:steam_track_nuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=false,west=true": { "model": "steamadvantage:steam_track_nsw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=true,west=false": { "model": "steamadvantage:steam_track_nuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=false,west=true": { "model": "steamadvantage:steam_track_nsw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=true,west=true": { "model": "steamadvantage:steam_track_dnu", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=true,west=false": { "model": "steamadvantage:steam_track_dnu", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=false,west=true": { "model": "steamadvantage:steam_track_nsw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=true,west=true": { "model": "steamadvantage:steam_track_nuw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=true,west=true": { "model": "steamadvantage:steam_track_nuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=false,west=false": { "model": "steamadvantage:steam_track_nsuw", "x": 180, "y": 180, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=true,west=false": { "model": "steamadvantage:steam_track_nsuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=false,west=true": { "model": "steamadvantage:steam_track_nsuw", "x": 180, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=true,west=false": { "model": "steamadvantage:steam_track_nsuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=false,west=true": { "model": "steamadvantage:steam_track_nsuw", "x": 180, "y": 270, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=true,west=true": { "model": "steamadvantage:steam_track_ensw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=true,west=false": { "model": "steamadvantage:steam_track_ensw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=false,west=true": { "model": "steamadvantage:steam_track_nsuw", "x": 180, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=true,west=true": { "model": "steamadvantage:steam_track_nsuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=true,west=true": { "model": "steamadvantage:steam_track_nsuw", "x": 90, "y": 270, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=true,west=false": { "model": "steamadvantage:steam_track_nsuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=false,west=true": { "model": "steamadvantage:steam_track_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=true,west=true": { "model": "steamadvantage:steam_track_nsuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=true,west=true": { "model": "steamadvantage:steam_track_nsuw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=true,west=true": { "model": "steamadvantage:steam_track_nsuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=true,west=false": { "model": "steamadvantage:steam_track_desuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=false,west=true": { "model": "steamadvantage:steam_track_desuw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=true,west=true": { "model": "steamadvantage:steam_track_desuw", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=true,west=true": { "model": "steamadvantage:steam_track_desuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=true,west=true": { "model": "steamadvantage:steam_track_desuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=true,west=true": { "model": "steamadvantage:steam_track_desuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=true,west=true": { "model": "steamadvantage: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.lang b/src/main/resources/assets/steamadvantage/lang/de_de.lang deleted file mode 100644 index 67fb3f3..0000000 --- a/src/main/resources/assets/steamadvantage/lang/de_de.lang +++ /dev/null @@ -1,43 +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 diff --git a/src/main/resources/assets/steamadvantage/lang/en_au.lang b/src/main/resources/assets/steamadvantage/lang/en_au.lang deleted file mode 100644 index 0ec440b..0000000 --- a/src/main/resources/assets/steamadvantage/lang/en_au.lang +++ /dev/null @@ -1,43 +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 diff --git a/src/main/resources/assets/steamadvantage/lang/en_ca.lang b/src/main/resources/assets/steamadvantage/lang/en_ca.lang deleted file mode 100644 index c4a6f78..0000000 --- a/src/main/resources/assets/steamadvantage/lang/en_ca.lang +++ /dev/null @@ -1,42 +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 diff --git a/src/main/resources/assets/steamadvantage/lang/en_en.lang b/src/main/resources/assets/steamadvantage/lang/en_en.lang deleted file mode 100644 index c4a6f78..0000000 --- a/src/main/resources/assets/steamadvantage/lang/en_en.lang +++ /dev/null @@ -1,42 +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 diff --git a/src/main/resources/assets/steamadvantage/lang/en_gb.lang b/src/main/resources/assets/steamadvantage/lang/en_gb.lang deleted file mode 100644 index c4a6f78..0000000 --- a/src/main/resources/assets/steamadvantage/lang/en_gb.lang +++ /dev/null @@ -1,42 +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 diff --git a/src/main/resources/assets/steamadvantage/lang/en_pt.lang b/src/main/resources/assets/steamadvantage/lang/en_pt.lang deleted file mode 100644 index 96edf74..0000000 --- a/src/main/resources/assets/steamadvantage/lang/en_pt.lang +++ /dev/null @@ -1,44 +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 diff --git a/src/main/resources/assets/steamadvantage/lang/en_us.lang b/src/main/resources/assets/steamadvantage/lang/en_us.lang deleted file mode 100644 index 0ec440b..0000000 --- a/src/main/resources/assets/steamadvantage/lang/en_us.lang +++ /dev/null @@ -1,43 +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 diff --git a/src/main/resources/assets/steamadvantage/lang/es_es.lang b/src/main/resources/assets/steamadvantage/lang/es_es.lang deleted file mode 100644 index c29b19b..0000000 --- a/src/main/resources/assets/steamadvantage/lang/es_es.lang +++ /dev/null @@ -1,43 +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 diff --git a/src/main/resources/assets/steamadvantage/lang/es_mx.lang b/src/main/resources/assets/steamadvantage/lang/es_mx.lang deleted file mode 100644 index dfdffdd..0000000 --- a/src/main/resources/assets/steamadvantage/lang/es_mx.lang +++ /dev/null @@ -1,46 +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 diff --git a/src/main/resources/assets/steamadvantage/lang/fr_ca.lang b/src/main/resources/assets/steamadvantage/lang/fr_ca.lang deleted file mode 100644 index 965481f..0000000 --- a/src/main/resources/assets/steamadvantage/lang/fr_ca.lang +++ /dev/null @@ -1,43 +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 diff --git a/src/main/resources/assets/steamadvantage/lang/fr_fr.lang b/src/main/resources/assets/steamadvantage/lang/fr_fr.lang deleted file mode 100644 index 59bf38d..0000000 --- a/src/main/resources/assets/steamadvantage/lang/fr_fr.lang +++ /dev/null @@ -1,44 +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 diff --git a/src/main/resources/assets/steamadvantage/lang/it_it.lang b/src/main/resources/assets/steamadvantage/lang/it_it.lang deleted file mode 100644 index 66856aa..0000000 --- a/src/main/resources/assets/steamadvantage/lang/it_it.lang +++ /dev/null @@ -1,44 +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 diff --git a/src/main/resources/assets/steamadvantage/lang/ja_jp.lang b/src/main/resources/assets/steamadvantage/lang/ja_jp.lang deleted file mode 100644 index ecb2cc9..0000000 --- a/src/main/resources/assets/steamadvantage/lang/ja_jp.lang +++ /dev/null @@ -1,45 +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=ポンプ配管 diff --git a/src/main/resources/assets/steamadvantage/lang/ko_kr.lang b/src/main/resources/assets/steamadvantage/lang/ko_kr.lang deleted file mode 100644 index bd4c1fa..0000000 --- a/src/main/resources/assets/steamadvantage/lang/ko_kr.lang +++ /dev/null @@ -1,46 +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=펌프 파이프 diff --git a/src/main/resources/assets/steamadvantage/lang/pt_br.lang b/src/main/resources/assets/steamadvantage/lang/pt_br.lang deleted file mode 100644 index 581cd6d..0000000 --- a/src/main/resources/assets/steamadvantage/lang/pt_br.lang +++ /dev/null @@ -1,46 +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 diff --git a/src/main/resources/assets/steamadvantage/lang/zh_cn.lang b/src/main/resources/assets/steamadvantage/lang/zh_cn.lang deleted file mode 100644 index c5f2680..0000000 --- a/src/main/resources/assets/steamadvantage/lang/zh_cn.lang +++ /dev/null @@ -1,45 +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=泵管 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/assets/steamadvantage/recipes/_factories.json b/src/main/resources/assets/steamadvantage/recipes/_factories.json deleted file mode 100644 index f14f3ce..0000000 --- a/src/main/resources/assets/steamadvantage/recipes/_factories.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "conditions": { - "recipe_mode": "com.mcmoddev.steamadvantage.recipe.condition.RecipeModeConditionFactory", - "musket_enabled": "com.mcmoddev.steamadvantage.recipe.condition.MusketEnabledConditionFactory" - } -} diff --git a/src/main/resources/assets/steamadvantage/recipes/steam_track.json b/src/main/resources/assets/steamadvantage/recipes/steam_track.json deleted file mode 100644 index 102da53..0000000 --- a/src/main/resources/assets/steamadvantage/recipes/steam_track.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "forge:ore_shapeless", - "ingredients": [ - { - "item": "steamadvantage:steam_pipe" - }, - { - "item": "poweradvantage:steel_frame" - } - ], - "result": { - "item": "steamadvantage:steam_track" - }, - "group": "tracks" -} diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index cbfac9f..f9f07ac 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,7 +1,7 @@ [ { - "modid": "steamadvantage", - "name": "Steam Advantage", + "modid": "basesteam", + "name": "baseSteam", "description": "Add-on mod to Power Advantage that adds steam-powered machines to Minecraft", "version": "${version}", "mcversion": "${mcversion}", diff --git a/src/test/java/com/mcmoddev/steamadvantage/gui/GUIHelperTest.java b/src/test/java/zone/moddev/mc/basesteam/gui/GUIHelperTest.java similarity index 96% rename from src/test/java/com/mcmoddev/steamadvantage/gui/GUIHelperTest.java rename to src/test/java/zone/moddev/mc/basesteam/gui/GUIHelperTest.java index cc6efe5..207fd50 100644 --- a/src/test/java/com/mcmoddev/steamadvantage/gui/GUIHelperTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/gui/GUIHelperTest.java @@ -1,4 +1,4 @@ -package com.mcmoddev.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import java.lang.reflect.Method; import org.junit.Test; diff --git a/src/test/java/com/mcmoddev/steamadvantage/items/MusketLoadedCartridgeTest.java b/src/test/java/zone/moddev/mc/basesteam/items/MusketLoadedCartridgeTest.java similarity index 96% rename from src/test/java/com/mcmoddev/steamadvantage/items/MusketLoadedCartridgeTest.java rename to src/test/java/zone/moddev/mc/basesteam/items/MusketLoadedCartridgeTest.java index a30fdf9..598d309 100644 --- a/src/test/java/com/mcmoddev/steamadvantage/items/MusketLoadedCartridgeTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/items/MusketLoadedCartridgeTest.java @@ -1,4 +1,4 @@ -package com.mcmoddev.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, EnumHand hand) throws Exception { ClassNode node = new ClassNode(); try (InputStream input = MusketLoadedCartridgeTest.class.getResourceAsStream( - "/com/mcmoddev/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, EnumHand han assertSame(locals[2], pop(operands)); operands.add(stack); } else if (call.name.equals("isNotLoaded")) { - assertEquals("com/mcmoddev/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/com/mcmoddev/steamadvantage/items/MusketTargetingContractTest.java b/src/test/java/zone/moddev/mc/basesteam/items/MusketTargetingContractTest.java similarity index 97% rename from src/test/java/com/mcmoddev/steamadvantage/items/MusketTargetingContractTest.java rename to src/test/java/zone/moddev/mc/basesteam/items/MusketTargetingContractTest.java index ea5e29a..23ef5cf 100644 --- a/src/test/java/com/mcmoddev/steamadvantage/items/MusketTargetingContractTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/items/MusketTargetingContractTest.java @@ -1,4 +1,4 @@ -package com.mcmoddev.steamadvantage.items; +package zone.moddev.mc.basesteam.items; import java.io.InputStream; import java.util.Optional; @@ -53,7 +53,7 @@ public class MusketTargetingContractTest { @Test public void targetingUsesThePortableSixCoordinateAabbConstructor() throws Exception { ClassNode node = new ClassNode(); - try (InputStream input = getClass().getResourceAsStream("/com/mcmoddev/steamadvantage/items/MusketItem.class")) { + try (InputStream input = getClass().getResourceAsStream("/zone/moddev/mc/basesteam/items/MusketItem.class")) { assertNotNull(input); new ClassReader(input).accept(node, 0); } @@ -79,7 +79,7 @@ public class MusketTargetingContractTest { @Test public void targetingUsesLoadedServerEntitiesAndTerrainBeforeEntitySelection() throws Exception { ClassNode node = new ClassNode(); - try (InputStream input = getClass().getResourceAsStream("/com/mcmoddev/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/com/mcmoddev/steamadvantage/machines/CoalBoilerFillPersistenceTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/CoalBoilerFillPersistenceTest.java similarity index 98% rename from src/test/java/com/mcmoddev/steamadvantage/machines/CoalBoilerFillPersistenceTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/CoalBoilerFillPersistenceTest.java index dba70ba..8b5e95c 100644 --- a/src/test/java/com/mcmoddev/steamadvantage/machines/CoalBoilerFillPersistenceTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/CoalBoilerFillPersistenceTest.java @@ -1,9 +1,9 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import static org.junit.Assert.*; import cyano.poweradvantage.api.ConduitType; -import com.mcmoddev.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.init.Fluids; import net.minecraft.init.Bootstrap; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.block.state.IBlockState; diff --git a/src/test/java/com/mcmoddev/steamadvantage/machines/RockCrusherComparatorTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/RockCrusherComparatorTest.java similarity index 95% rename from src/test/java/com/mcmoddev/steamadvantage/machines/RockCrusherComparatorTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/RockCrusherComparatorTest.java index edb8a48..f57f760 100644 --- a/src/test/java/com/mcmoddev/steamadvantage/machines/RockCrusherComparatorTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/RockCrusherComparatorTest.java @@ -1,4 +1,4 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import static org.junit.Assert.assertEquals; import net.minecraft.item.ItemStack; diff --git a/src/test/java/com/mcmoddev/steamadvantage/machines/RockCrusherReloadRedstoneTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/RockCrusherReloadRedstoneTest.java similarity index 98% rename from src/test/java/com/mcmoddev/steamadvantage/machines/RockCrusherReloadRedstoneTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/RockCrusherReloadRedstoneTest.java index 5b9eb8b..4c63f90 100644 --- a/src/test/java/com/mcmoddev/steamadvantage/machines/RockCrusherReloadRedstoneTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/RockCrusherReloadRedstoneTest.java @@ -1,4 +1,4 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import static org.junit.Assert.*; diff --git a/src/test/java/com/mcmoddev/steamadvantage/machines/SteamDrillPersistenceTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/SteamDrillPersistenceTest.java similarity index 96% rename from src/test/java/com/mcmoddev/steamadvantage/machines/SteamDrillPersistenceTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/SteamDrillPersistenceTest.java index d608986..4a6bf89 100644 --- a/src/test/java/com/mcmoddev/steamadvantage/machines/SteamDrillPersistenceTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/SteamDrillPersistenceTest.java @@ -1,4 +1,4 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import net.minecraft.nbt.NBTTagCompound; import org.junit.Test; diff --git a/src/test/java/com/mcmoddev/steamadvantage/machines/SteamOperationalPumpSourceTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/SteamOperationalPumpSourceTest.java similarity index 98% rename from src/test/java/com/mcmoddev/steamadvantage/machines/SteamOperationalPumpSourceTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/SteamOperationalPumpSourceTest.java index 89ad3c5..8a463c4 100644 --- a/src/test/java/com/mcmoddev/steamadvantage/machines/SteamOperationalPumpSourceTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/SteamOperationalPumpSourceTest.java @@ -1,4 +1,4 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import java.io.InputStream; import java.lang.reflect.Method; @@ -134,7 +134,7 @@ private static FluidStack pickup(IBlockState state) { private static ClassNode pump() throws Exception { ClassNode node = new ClassNode(); try (InputStream input = SteamOperationalPumpSourceTest.class.getResourceAsStream( - "/com/mcmoddev/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/com/mcmoddev/steamadvantage/machines/SteamOperationalStillCapacityTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/SteamOperationalStillCapacityTest.java similarity index 94% rename from src/test/java/com/mcmoddev/steamadvantage/machines/SteamOperationalStillCapacityTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/SteamOperationalStillCapacityTest.java index 74993fe..997655e 100644 --- a/src/test/java/com/mcmoddev/steamadvantage/machines/SteamOperationalStillCapacityTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/SteamOperationalStillCapacityTest.java @@ -1,12 +1,12 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import net.minecraftforge.fluids.FluidStack; import java.lang.reflect.Method; import net.minecraftforge.fluids.FluidRegistry; import org.junit.BeforeClass; import org.junit.Test; -import com.mcmoddev.poweradvantage.registry.still.recipe.DistillationRecipe; -import com.mcmoddev.poweradvantage.registry.still.recipe.ExplicitFluidReference; +import zone.moddev.mc.basepower.registry.still.recipe.DistillationRecipe; +import zone.moddev.mc.basepower.registry.still.recipe.ExplicitFluidReference; import static org.junit.Assert.*; /** Pure capacity planning; native operating regressions live in SteamOperationalCases. */ diff --git a/src/test/java/com/mcmoddev/steamadvantage/machines/SteamRedstoneInitializationTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/SteamRedstoneInitializationTest.java similarity index 99% rename from src/test/java/com/mcmoddev/steamadvantage/machines/SteamRedstoneInitializationTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/SteamRedstoneInitializationTest.java index fa03da7..47c25cd 100644 --- a/src/test/java/com/mcmoddev/steamadvantage/machines/SteamRedstoneInitializationTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/SteamRedstoneInitializationTest.java @@ -1,4 +1,4 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import static org.junit.Assert.*; diff --git a/src/test/java/com/mcmoddev/steamadvantage/machines/WaterBoilerFluidBoundaryTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/WaterBoilerFluidBoundaryTest.java similarity index 99% rename from src/test/java/com/mcmoddev/steamadvantage/machines/WaterBoilerFluidBoundaryTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/WaterBoilerFluidBoundaryTest.java index 8e73b8f..3fa5897 100644 --- a/src/test/java/com/mcmoddev/steamadvantage/machines/WaterBoilerFluidBoundaryTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/WaterBoilerFluidBoundaryTest.java @@ -1,4 +1,4 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import static org.junit.Assert.*; import java.lang.reflect.Method; diff --git a/src/test/java/com/mcmoddev/steamadvantage/machines/WaterBoilerTankNotificationTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/WaterBoilerTankNotificationTest.java similarity index 98% rename from src/test/java/com/mcmoddev/steamadvantage/machines/WaterBoilerTankNotificationTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/WaterBoilerTankNotificationTest.java index 72e656d..d4b0890 100644 --- a/src/test/java/com/mcmoddev/steamadvantage/machines/WaterBoilerTankNotificationTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/WaterBoilerTankNotificationTest.java @@ -1,8 +1,8 @@ -package com.mcmoddev.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import static org.junit.Assert.*; import cyano.poweradvantage.api.IPowerMachine; -import com.mcmoddev.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.init.Fluids; import java.util.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/test/java/com/mcmoddev/steamadvantage/util/SoundHelperLoadedPlayersTest.java b/src/test/java/zone/moddev/mc/basesteam/util/SoundHelperLoadedPlayersTest.java similarity index 98% rename from src/test/java/com/mcmoddev/steamadvantage/util/SoundHelperLoadedPlayersTest.java rename to src/test/java/zone/moddev/mc/basesteam/util/SoundHelperLoadedPlayersTest.java index f0ec2c2..bc931cf 100644 --- a/src/test/java/com/mcmoddev/steamadvantage/util/SoundHelperLoadedPlayersTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/util/SoundHelperLoadedPlayersTest.java @@ -1,4 +1,4 @@ -package com.mcmoddev.steamadvantage.util; +package zone.moddev.mc.basesteam.util; import java.io.InputStream; import net.minecraft.util.math.AxisAlignedBB; @@ -125,7 +125,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( - "/com/mcmoddev/steamadvantage/util/SoundHelper.class")) { + "/zone/moddev/mc/basesteam/util/SoundHelper.class")) { assertNotNull("Compiled SoundHelper is available", input); new ClassReader(input).accept(node, 0); } From e57048568043e9251ca29565942633d15fa3ba12 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Wed, 4 Nov 2026 23:39:12 +0000 Subject: [PATCH 2/5] Let the oil boiler burn Mineralogy crude Use the same default as basePower crude, and keep explicit fuel settings ahead of the default. --- CHANGELOG.txt | 1 + .../machines/OilBoilerTileEntity.java | 8 +++- .../machines/OilBoilerCrudeFuelTest.java | 46 +++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 src/test/java/zone/moddev/mc/basesteam/machines/OilBoilerCrudeFuelTest.java diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 65ba402..0f2d47a 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -2,6 +2,7 @@ - Continue Steam Advantage as baseSteam. Read saved tiles from both the original 1.10.2 mod and baseSteam 1.10.2. - Map the four saved musket enchantments to their baseSteam names and retain the old oil fuel configuration overrides. +- Burn Mineralogy crude at the same default rate as basePower crude. Explicit fuel settings still take precedence. - Use matching basePower 1.12.2 and keep the earlier drill, pump, still and boiler fixes. Earlier 1.12.2 test-coverage repairs diff --git a/src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerTileEntity.java index ef4b52a..b625e87 100644 --- a/src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerTileEntity.java @@ -5,6 +5,7 @@ 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.basepower.init.Fluids; @@ -103,7 +104,7 @@ private int getFuelBurnTime(Fluid fluid, int amount) { return (int)(getBurnTimePerBucketFor(fluid) * amount / Fluid.BUCKET_VOLUME); } - private static Float getBurnTimePerBucketFor(Fluid fluid){ + static Float getBurnTimePerBucketFor(Fluid fluid){ if(fluid == null) return 0f; if(flammibilityCache.containsKey(fluid)){ return flammibilityCache.get(fluid)*1000; @@ -114,6 +115,11 @@ private static Float getBurnTimePerBucketFor(Fluid fluid){ flammibilityCache.put(fluid,0.001F*fuelPerBucket); return fuelPerBucket; } + if (FluidCategoryRegistry.matches(FluidCategoryRegistry.CRUDE_OIL, fluid)) { + float ticksPerUnit = zone.moddev.mc.basepower.init.Fuels.CRUDE_OIL_FUEL_PER_FLUID_UNIT; + flammibilityCache.put(fluid, ticksPerUnit); + return ticksPerUnit * Fluid.BUCKET_VOLUME; + } // second, check universal bucket fuel registry int vol = ForgeModContainer.getInstance().universalBucket.getCapacity(); ItemStack bucket = FluidUtil.getFilledBucket(new FluidStack(fluid, vol)); diff --git a/src/test/java/zone/moddev/mc/basesteam/machines/OilBoilerCrudeFuelTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/OilBoilerCrudeFuelTest.java new file mode 100644 index 0000000..a524bde --- /dev/null +++ b/src/test/java/zone/moddev/mc/basesteam/machines/OilBoilerCrudeFuelTest.java @@ -0,0 +1,46 @@ +package zone.moddev.mc.basesteam.machines; + +import java.util.HashMap; +import java.util.Map; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.Fluid; +import org.junit.Test; +import zone.moddev.mc.basesteam.SteamAdvantage; + +import static org.junit.Assert.assertEquals; + +public class OilBoilerCrudeFuelTest { + @Test + public void bothCrudeOilsUseTheSameDefault() { + withFuelOverrides(() -> { + assertEquals(5000.0F, OilBoilerTileEntity.getBurnTimePerBucketFor(oil("crude_oil")), 0.0F); + assertEquals(5000.0F, OilBoilerTileEntity.getBurnTimePerBucketFor(oil("mineralogy_crude_oil")), 0.0F); + }); + } + + @Test + public void explicitFuelOverridesStillWin() { + withFuelOverrides(() -> { + SteamAdvantage.fluidBurnValues.put("mineralogy_crude_oil", 0.0F); + SteamAdvantage.fluidBurnValues.put("fluid.poweradvantage.crude_oil", 1234.0F); + assertEquals(0.0F, OilBoilerTileEntity.getBurnTimePerBucketFor(oil("mineralogy_crude_oil")), 0.0F); + assertEquals(1234.0F, OilBoilerTileEntity.getBurnTimePerBucketFor(oil("crude_oil")), 0.0F); + }); + } + + private static Fluid oil(String name) { + ResourceLocation sprite = new ResourceLocation("minecraft", "blocks/water_still"); + return new Fluid(name, sprite, sprite); + } + + private static void withFuelOverrides(Runnable check) { + Map before = new HashMap<>(SteamAdvantage.fluidBurnValues); + try { + SteamAdvantage.fluidBurnValues.clear(); + check.run(); + } finally { + SteamAdvantage.fluidBurnValues.clear(); + SteamAdvantage.fluidBurnValues.putAll(before); + } + } +} From 7faaa28243fcaf0832d898929e2497956f06ca94 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Thu, 5 Nov 2026 09:24:15 +0000 Subject: [PATCH 3/5] Build against the basePower crusher registry fix --- .github/workflows/ci.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- build.gradle | 4 ++-- gradle.properties | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4007a08..daa19fc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: repository: MinecraftModDevelopmentMods/basePower - ref: 7b375587dd9e6ca57ea51473fa9892531ac73c75 + ref: 2913aba3d3f4f3b40594dfad8fcdef6bf61f6bcb path: .ci-dependencies/PowerAdvantage - name: Check out pinned OreSpawn diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f859ff2..c9371d3 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: repository: MinecraftModDevelopmentMods/basePower - ref: 7b375587dd9e6ca57ea51473fa9892531ac73c75 + ref: 2913aba3d3f4f3b40594dfad8fcdef6bf61f6bcb path: .ci-dependencies/PowerAdvantage - name: Check out pinned OreSpawn diff --git a/build.gradle b/build.gradle index 2d250c4..0a66749 100644 --- a/build.gradle +++ b/build.gradle @@ -332,8 +332,8 @@ tasks.register('verifyReleaseConfiguration') { } if (project.poweradvantage_version != '2.4.4.112021' || project.poweradvantage_source_repository != 'MinecraftModDevelopmentMods/basePower' - || project.poweradvantage_source_ref != '7b375587dd9e6ca57ea51473fa9892531ac73c75' - || project.poweradvantage_deobf_sha256 != '66FBC92F8A14B54ED9A33482A99AF21B1FDA23CCFC9E817AF4D2BD8DE0EB0A78') { + || project.poweradvantage_source_ref != '2913aba3d3f4f3b40594dfad8fcdef6bf61f6bcb' + || project.poweradvantage_deobf_sha256 != '592469C64AA34BDDF7537FADD107639EEB604B570B2EAB080F711DD6CBB385F3') { throw new GradleException('Unexpected PowerAdvantage compile dependency identity') } ['.github/workflows/ci.yml', '.github/workflows/codeql-analysis.yml'].each { workflowPath -> diff --git a/gradle.properties b/gradle.properties index 026b020..76abb86 100644 --- a/gradle.properties +++ b/gradle.properties @@ -35,7 +35,7 @@ cf_versions=1.12.2 poweradvantage_version=2.4.4.112021 poweradvantage_source_repository=MinecraftModDevelopmentMods/basePower -poweradvantage_source_ref=7b375587dd9e6ca57ea51473fa9892531ac73c75 -poweradvantage_deobf_sha256=66FBC92F8A14B54ED9A33482A99AF21B1FDA23CCFC9E817AF4D2BD8DE0EB0A78 +poweradvantage_source_ref=2913aba3d3f4f3b40594dfad8fcdef6bf61f6bcb +poweradvantage_deobf_sha256=592469C64AA34BDDF7537FADD107639EEB604B570B2EAB080F711DD6CBB385F3 orespawn_version=4.1.3.112021 orespawn_deobf_sha256=E10D9D0409784F3D4260889186A2483E72D1EC838F2BEAD78BE69149B6975198 From f6e3900a2842fdfcf0fc50a5661c4b19bd3bea00 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Thu, 5 Nov 2026 09:28:26 +0000 Subject: [PATCH 4/5] Use the guarded basePower migration build --- .github/workflows/ci.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- build.gradle | 4 ++-- gradle.properties | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index daa19fc..3362e4b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: repository: MinecraftModDevelopmentMods/basePower - ref: 2913aba3d3f4f3b40594dfad8fcdef6bf61f6bcb + ref: 6da980e7ef3bba6d3c289e85c8dee3cc70474f71 path: .ci-dependencies/PowerAdvantage - name: Check out pinned OreSpawn diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c9371d3..86b59d7 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: repository: MinecraftModDevelopmentMods/basePower - ref: 2913aba3d3f4f3b40594dfad8fcdef6bf61f6bcb + ref: 6da980e7ef3bba6d3c289e85c8dee3cc70474f71 path: .ci-dependencies/PowerAdvantage - name: Check out pinned OreSpawn diff --git a/build.gradle b/build.gradle index 0a66749..51ae2d3 100644 --- a/build.gradle +++ b/build.gradle @@ -332,8 +332,8 @@ tasks.register('verifyReleaseConfiguration') { } if (project.poweradvantage_version != '2.4.4.112021' || project.poweradvantage_source_repository != 'MinecraftModDevelopmentMods/basePower' - || project.poweradvantage_source_ref != '2913aba3d3f4f3b40594dfad8fcdef6bf61f6bcb' - || project.poweradvantage_deobf_sha256 != '592469C64AA34BDDF7537FADD107639EEB604B570B2EAB080F711DD6CBB385F3') { + || project.poweradvantage_source_ref != '6da980e7ef3bba6d3c289e85c8dee3cc70474f71' + || project.poweradvantage_deobf_sha256 != '3E46BBF2ADEC22C9B119F5E8FEA8CCA56B16969187850B3A067C7FC0C181700B') { throw new GradleException('Unexpected PowerAdvantage compile dependency identity') } ['.github/workflows/ci.yml', '.github/workflows/codeql-analysis.yml'].each { workflowPath -> diff --git a/gradle.properties b/gradle.properties index 76abb86..959cae5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -35,7 +35,7 @@ cf_versions=1.12.2 poweradvantage_version=2.4.4.112021 poweradvantage_source_repository=MinecraftModDevelopmentMods/basePower -poweradvantage_source_ref=2913aba3d3f4f3b40594dfad8fcdef6bf61f6bcb -poweradvantage_deobf_sha256=592469C64AA34BDDF7537FADD107639EEB604B570B2EAB080F711DD6CBB385F3 +poweradvantage_source_ref=6da980e7ef3bba6d3c289e85c8dee3cc70474f71 +poweradvantage_deobf_sha256=3E46BBF2ADEC22C9B119F5E8FEA8CCA56B16969187850B3A067C7FC0C181700B orespawn_version=4.1.3.112021 orespawn_deobf_sha256=E10D9D0409784F3D4260889186A2483E72D1EC838F2BEAD78BE69149B6975198 From 72eb50b518f4d40487dd535b4717b12b4d464b18 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Thu, 5 Nov 2026 10:15:21 +0000 Subject: [PATCH 5/5] Build baseSteam against the released basePower --- .github/workflows/ci.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- CHANGELOG.txt | 9 +++++---- README.md | 4 +++- build.gradle | 2 +- gradle.properties | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3362e4b..f1583f5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: repository: MinecraftModDevelopmentMods/basePower - ref: 6da980e7ef3bba6d3c289e85c8dee3cc70474f71 + ref: 1fc2fb3a409a5cf86a4133ee4d313002a5b8611e path: .ci-dependencies/PowerAdvantage - name: Check out pinned OreSpawn diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 86b59d7..57acc9f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: repository: MinecraftModDevelopmentMods/basePower - ref: 6da980e7ef3bba6d3c289e85c8dee3cc70474f71 + ref: 1fc2fb3a409a5cf86a4133ee4d313002a5b8611e path: .ci-dependencies/PowerAdvantage - name: Check out pinned OreSpawn diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 0f2d47a..78493b0 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,9 +1,10 @@ 2.2.6.112021 - baseSteam for Minecraft 1.12.2 -- Continue Steam Advantage as baseSteam. Read saved tiles from both the original 1.10.2 mod and baseSteam 1.10.2. -- Map the four saved musket enchantments to their baseSteam names and retain the old oil fuel configuration overrides. -- Burn Mineralogy crude at the same default rate as basePower crude. Explicit fuel settings still take precedence. -- Use matching basePower 1.12.2 and keep the earlier drill, pump, still and boiler fixes. +- Build against the released basePower 2.4.4.112021. +- Bring baseSteam to Forge 1.12.2. Move worlds from Steam Advantage or baseSteam 1.10.2 without rebuilding your steam workshop. +- Keep your musket enchantments and existing oil fuel settings when you upgrade. +- Let the oil boiler burn Mineralogy crude at the same default rate as basePower crude. Your own fuel settings still take precedence. +- Keep the fixes for saved drill progress, pump contents, boiler heat and still output. Earlier 1.12.2 test-coverage repairs diff --git a/README.md b/README.md index f144d3f..e257f73 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,9 @@ baseSteam continues DrCyano's Steam Advantage, adding boilers, brass pipework, s ## Upgrading a world -Replace the installed Advantage family together. baseSteam `2.2.6.112021` reads the original Steam Advantage and released baseSteam 1.10.2 tile IDs. Back up your save, then check inventories, drill directions, pressure and unfinished work on a copy before and after a full restart. +Install [basePower 2.4.4 for Forge 1.12.2](https://www.curseforge.com/minecraft/mc-mods/basepower/files/9452029) and Base Metals. Use the 1.12.2 builds of all mods in your workshop. + +baseSteam replaces Steam Advantage on 1.12.2 and can read worlds from Steam Advantage or baseSteam on 1.10.2. Back up your world and config, then replace the old Advantage mods together on a copy of the world. Check your machine inventories, drill directions, steam pressure and unfinished work. Save, close Minecraft completely, and check again after reopening the copy. [World upgrade guide](https://github.com/MinecraftModDevelopmentMods/basePower/blob/master-1.12.2/docs/1.12-upgrade.md) | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/basesteam) diff --git a/build.gradle b/build.gradle index 51ae2d3..91227ba 100644 --- a/build.gradle +++ b/build.gradle @@ -332,7 +332,7 @@ tasks.register('verifyReleaseConfiguration') { } if (project.poweradvantage_version != '2.4.4.112021' || project.poweradvantage_source_repository != 'MinecraftModDevelopmentMods/basePower' - || project.poweradvantage_source_ref != '6da980e7ef3bba6d3c289e85c8dee3cc70474f71' + || project.poweradvantage_source_ref != '1fc2fb3a409a5cf86a4133ee4d313002a5b8611e' || project.poweradvantage_deobf_sha256 != '3E46BBF2ADEC22C9B119F5E8FEA8CCA56B16969187850B3A067C7FC0C181700B') { throw new GradleException('Unexpected PowerAdvantage compile dependency identity') } diff --git a/gradle.properties b/gradle.properties index 959cae5..31fa862 100644 --- a/gradle.properties +++ b/gradle.properties @@ -35,7 +35,7 @@ cf_versions=1.12.2 poweradvantage_version=2.4.4.112021 poweradvantage_source_repository=MinecraftModDevelopmentMods/basePower -poweradvantage_source_ref=6da980e7ef3bba6d3c289e85c8dee3cc70474f71 +poweradvantage_source_ref=1fc2fb3a409a5cf86a4133ee4d313002a5b8611e poweradvantage_deobf_sha256=3E46BBF2ADEC22C9B119F5E8FEA8CCA56B16969187850B3A067C7FC0C181700B orespawn_version=4.1.3.112021 orespawn_deobf_sha256=E10D9D0409784F3D4260889186A2483E72D1EC838F2BEAD78BE69149B6975198