From 7c51b75479c13fad1cb5b6557bfedcf6d84c1f51 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Mon, 2 Nov 2026 16:35:39 +0000 Subject: [PATCH 1/2] Continue Steam Advantage as baseSteam for 1.10.2 Preserve released Cyano machines, contents, musket enchantments and custom configuration under the new name. Keep the pump, boiler, drill and processing fixes covered by the regression rig. Pin the tested basePower source and jar checksum, update the README and changelog, and keep publication blocked until the new CurseForge project is assigned. --- .github/workflows/ci.yml | 33 ++-- .github/workflows/codeql-analysis.yml | 19 +- .github/workflows/release-on-tag.yml | 11 +- CHANGELOG.txt | 15 +- README.md | 52 ++++- build.gradle | 123 +++++++----- docs/1.10-identity-migration.md | 98 ++++++++++ gradle.properties | 23 +-- settings.gradle | 2 +- .../SteamAdvantage.java | 25 ++- .../blocks/DrillBitBlock.java | 4 +- .../blocks/DrillBitTileEntity.java | 6 +- .../blocks/PlatformBlock.java | 4 +- .../blocks/PumpPipeBlock.java | 2 +- .../blocks/SteamPipeBlock.java | 4 +- .../blocks/SteamTrackBlock.java | 4 +- .../compat/BaseMetalsCompat.java | 4 +- .../HighExplosiveEnchantment.java | 4 +- .../enchantments/PowderlessEnchantment.java | 4 +- .../enchantments/RapidReloadEnchantment.java | 4 +- .../enchantments/RecoilEnchantment.java | 4 +- .../graphics/DrillBitRenderer.java | 6 +- .../gui/BlastFurnaceGUI.java | 8 +- .../gui/CoalBoilerGUI.java | 8 +- .../gui/ElectricBoilerGUI.java | 8 +- .../gui/GUIHelper.java | 4 +- .../gui/GeothermalBoilerGUI.java | 8 +- .../gui/OilBoilerGUI.java | 8 +- .../gui/RockCrusherGUI.java | 8 +- .../gui/SteamDrillGUI.java | 8 +- .../gui/SteamPumpGUI.java | 8 +- .../gui/SteamStillGUI.java | 8 +- .../gui/SteamTankGUI.java | 8 +- .../init/Blocks.java | 12 +- .../init/Enchantments.java | 21 +- .../moddev/mc/basesteam/init/Entities.java | 47 +++++ .../init/GUI.java | 8 +- .../init/Items.java | 8 +- .../init/Power.java | 2 +- .../init/Recipes.java | 14 +- .../init/TreasureChests.java | 24 ++- .../init/Villages.java | 2 +- .../items/MusketItem.java | 14 +- .../machines/BlastFurnaceBlock.java | 4 +- .../machines/BlastFurnaceTileEntity.java | 8 +- .../machines/CoalBoilerBlock.java | 10 +- .../machines/CoalBoilerTileEntity.java | 10 +- .../machines/ElectricBoilerBlock.java | 10 +- .../machines/ElectricBoilerTileEntity.java | 10 +- .../machines/GeothermalBoilerBlock.java | 10 +- .../machines/GeothermalBoilerTileEntity.java | 10 +- .../machines/OilBoilerBlock.java | 10 +- .../machines/OilBoilerTileEntity.java | 29 +-- .../machines/RockCrusherBlock.java | 4 +- .../machines/RockCrusherTileEntity.java | 10 +- .../machines/SteamDrillBlock.java | 8 +- .../machines/SteamDrillTileEntity.java | 24 +-- .../machines/SteamElevatorBlock.java | 4 +- .../machines/SteamElevatorTileEntity.java | 10 +- .../machines/SteamPumpBlock.java | 12 +- .../machines/SteamPumpTileEntity.java | 20 +- .../machines/SteamStillBlock.java | 10 +- .../machines/SteamStillTileEntity.java | 18 +- .../machines/SteamTankBlock.java | 4 +- .../machines/SteamTankTileEntity.java | 6 +- .../util/SoundHelper.java | 2 +- .../mc/steamadvantage/init/Entities.java | 41 ---- .../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 + .../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 - src/main/resources/mcmod.info | 6 +- src/main/resources/pack.mcmeta | 4 +- .../gui/GUIHelperTest.java | 2 +- .../init/SteamAssetIdentityTest.java | 91 +++++++++ .../init/SteamConfigurationMigrationTest.java | 105 ++++++++++ .../init/SteamIdentityMigrationTest.java | 179 ++++++++++++++++++ .../items/MusketLoadedCartridgeTest.java | 6 +- .../items/MusketTargetingContractTest.java | 6 +- .../CoalBoilerFillPersistenceTest.java | 4 +- .../OilBoilerLegacyFuelOverrideTest.java | 150 +++++++++++++++ .../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 +- .../migration/steamadvantage-loot.json | 13 ++ 295 files changed, 2441 insertions(+), 1698 deletions(-) create mode 100644 docs/1.10-identity-migration.md rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/SteamAdvantage.java (84%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/blocks/DrillBitBlock.java (97%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/blocks/DrillBitTileEntity.java (94%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/blocks/PlatformBlock.java (97%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/blocks/PumpPipeBlock.java (98%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/blocks/SteamPipeBlock.java (71%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/blocks/SteamTrackBlock.java (93%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/compat/BaseMetalsCompat.java (98%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/enchantments/HighExplosiveEnchantment.java (89%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/enchantments/PowderlessEnchantment.java (89%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/enchantments/RapidReloadEnchantment.java (89%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/enchantments/RecoilEnchantment.java (89%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/graphics/DrillBitRenderer.java (96%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/BlastFurnaceGUI.java (93%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/CoalBoilerGUI.java (91%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/ElectricBoilerGUI.java (91%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/GUIHelper.java (97%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/GeothermalBoilerGUI.java (91%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/OilBoilerGUI.java (92%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/RockCrusherGUI.java (91%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/SteamDrillGUI.java (91%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/SteamPumpGUI.java (91%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/SteamStillGUI.java (92%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/SteamTankGUI.java (90%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/init/Blocks.java (91%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/init/Enchantments.java (64%) create mode 100644 src/main/java/zone/moddev/mc/basesteam/init/Entities.java rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/init/GUI.java (86%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/init/Items.java (90%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/init/Power.java (90%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/init/Recipes.java (92%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/init/TreasureChests.java (82%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/init/Villages.java (98%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/items/MusketItem.java (97%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/BlastFurnaceBlock.java (92%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/BlastFurnaceTileEntity.java (97%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/CoalBoilerBlock.java (89%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/CoalBoilerTileEntity.java (97%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/ElectricBoilerBlock.java (90%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/ElectricBoilerTileEntity.java (97%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/GeothermalBoilerBlock.java (88%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/GeothermalBoilerTileEntity.java (97%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/OilBoilerBlock.java (88%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/OilBoilerTileEntity.java (94%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/RockCrusherBlock.java (92%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/RockCrusherTileEntity.java (95%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamDrillBlock.java (97%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamDrillTileEntity.java (95%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamElevatorBlock.java (92%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamElevatorTileEntity.java (93%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamPumpBlock.java (88%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamPumpTileEntity.java (95%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamStillBlock.java (88%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamStillTileEntity.java (95%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamTankBlock.java (92%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamTankTileEntity.java (95%) rename src/main/java/zone/moddev/mc/{steamadvantage => basesteam}/util/SoundHelper.java (98%) delete mode 100644 src/main/java/zone/moddev/mc/steamadvantage/init/Entities.java 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 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 rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/gui/GUIHelperTest.java (96%) create mode 100644 src/test/java/zone/moddev/mc/basesteam/init/SteamAssetIdentityTest.java create mode 100644 src/test/java/zone/moddev/mc/basesteam/init/SteamConfigurationMigrationTest.java create mode 100644 src/test/java/zone/moddev/mc/basesteam/init/SteamIdentityMigrationTest.java rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/items/MusketLoadedCartridgeTest.java (96%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/items/MusketTargetingContractTest.java (97%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/CoalBoilerFillPersistenceTest.java (98%) create mode 100644 src/test/java/zone/moddev/mc/basesteam/machines/OilBoilerLegacyFuelOverrideTest.java rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/RockCrusherComparatorTest.java (95%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/RockCrusherReloadRedstoneTest.java (98%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamDrillPersistenceTest.java (96%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamOperationalPumpSourceTest.java (98%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamOperationalStillCapacityTest.java (94%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/SteamRedstoneInitializationTest.java (98%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/WaterBoilerFluidBoundaryTest.java (99%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/machines/WaterBoilerTankNotificationTest.java (98%) rename src/test/java/zone/moddev/mc/{steamadvantage => basesteam}/util/SoundHelperLoadedPlayersTest.java (98%) create mode 100644 src/test/resources/migration/steamadvantage-loot.json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6aec5cf..802f260 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: Steam Advantage 1.10 CI +name: baseSteam 1.10 CI on: push: @@ -13,7 +13,7 @@ permissions: contents: read concurrency: - group: steamadvantage-1.10-${{ github.workflow }}-${{ github.ref }} + group: basesteam-1.10-${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: @@ -23,7 +23,7 @@ jobs: timeout-minutes: 75 steps: - - name: Check out SteamAdvantage + - name: Check out baseSteam uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 - name: Check out pinned OreSpawn @@ -33,12 +33,12 @@ jobs: ref: 5a50df1158e948c8db55814e819090b34c12d765 path: .ci-dependencies/OreSpawn - - name: Check out pinned PowerAdvantage + - name: Check out pinned basePower uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: - repository: MinecraftModDevelopmentMods/PowerAdvantage - ref: 2443eaae7c666b8d54a5c9c30091892b79e80994 - path: .ci-dependencies/PowerAdvantage + repository: MinecraftModDevelopmentMods/basePower + ref: 79fb16437615df98b6c6298fe8d98643a0e7140b + path: .ci-dependencies/basePower - name: Install Java 8 toolchain uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 @@ -70,12 +70,12 @@ jobs: test -f "$jar" echo "jar=$jar" >> "$GITHUB_OUTPUT" - - name: Build pinned PowerAdvantage development jar + - name: Build pinned basePower development jar id: poweradvantage shell: bash run: | set -euo pipefail - dependency="$GITHUB_WORKSPACE/.ci-dependencies/PowerAdvantage" + dependency="$GITHUB_WORKSPACE/.ci-dependencies/basePower" mirror="$RUNNER_TEMP/reborncore-mirror" chmod +x "$dependency/gradlew" ( @@ -86,8 +86,9 @@ jobs: -PoreSpawnDeobfJar="${{ steps.orespawn.outputs.jar }}" \ --no-daemon --stacktrace ) - jar="$dependency/build/libs-dev/PowerAdvantage-2.4.3.110021-deobf.jar" + jar="$dependency/build/libs-dev/basePower-2.4.4.110021-deobf.jar" test -f "$jar" + printf '%s %s\n' '2992F2CADC30D8F61A17216DF9AB02BDF8E8211BB8B494A6CCED70A3267F69FE' "$jar" | sha256sum --check --strict echo "jar=$jar" >> "$GITHUB_OUTPUT" - name: Make the wrapper executable @@ -104,13 +105,13 @@ jobs: - name: Upload audited release candidate uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: SteamAdvantage-1.10.2-${{ github.sha }} + name: baseSteam-1.10.2-${{ github.sha }} if-no-files-found: error retention-days: 30 path: | - build/libs/SteamAdvantage-2.2.5.110021.jar - build/libs/SteamAdvantage-2.2.5.110021-sources.jar - build/libs/SteamAdvantage-2.2.5.110021-javadoc.jar + build/libs/baseSteam-2.2.6.110021.jar + build/libs/baseSteam-2.2.6.110021-sources.jar + build/libs/baseSteam-2.2.6.110021-javadoc.jar build/release/SHA256SUMS CHANGELOG.txt @@ -118,7 +119,7 @@ jobs: if: failure() uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: SteamAdvantage-1.10.2-diagnostics-${{ github.sha }} + name: baseSteam-1.10.2-diagnostics-${{ github.sha }} if-no-files-found: ignore retention-days: 14 path: | @@ -127,4 +128,4 @@ jobs: build/*-run/logs/** build/problems/** .ci-dependencies/OreSpawn/build/reports/** - .ci-dependencies/PowerAdvantage/build/reports/** + .ci-dependencies/basePower/build/reports/** diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 43b1f64..b576087 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -23,7 +23,7 @@ jobs: timeout-minutes: 60 steps: - - name: Check out SteamAdvantage + - name: Check out baseSteam uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 - name: Check out pinned OreSpawn @@ -33,12 +33,12 @@ jobs: ref: 5a50df1158e948c8db55814e819090b34c12d765 path: .ci-dependencies/OreSpawn - - name: Check out pinned PowerAdvantage + - name: Check out pinned basePower uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: - repository: MinecraftModDevelopmentMods/PowerAdvantage - ref: 2443eaae7c666b8d54a5c9c30091892b79e80994 - path: .ci-dependencies/PowerAdvantage + repository: MinecraftModDevelopmentMods/basePower + ref: 79fb16437615df98b6c6298fe8d98643a0e7140b + path: .ci-dependencies/basePower - name: Install Java 8 toolchain uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 @@ -70,12 +70,12 @@ jobs: test -f "$jar" echo "jar=$jar" >> "$GITHUB_OUTPUT" - - name: Build pinned PowerAdvantage development jar + - name: Build pinned basePower development jar id: poweradvantage shell: bash run: | set -euo pipefail - dependency="$GITHUB_WORKSPACE/.ci-dependencies/PowerAdvantage" + dependency="$GITHUB_WORKSPACE/.ci-dependencies/basePower" mirror="$RUNNER_TEMP/reborncore-mirror" chmod +x "$dependency/gradlew" ( @@ -86,8 +86,9 @@ jobs: -PoreSpawnDeobfJar="${{ steps.orespawn.outputs.jar }}" \ --no-daemon --stacktrace ) - jar="$dependency/build/libs-dev/PowerAdvantage-2.4.3.110021-deobf.jar" + jar="$dependency/build/libs-dev/basePower-2.4.4.110021-deobf.jar" test -f "$jar" + printf '%s %s\n' '2992F2CADC30D8F61A17216DF9AB02BDF8E8211BB8B494A6CCED70A3267F69FE' "$jar" | sha256sum --check --strict echo "jar=$jar" >> "$GITHUB_OUTPUT" - name: Initialize CodeQL @@ -95,7 +96,7 @@ jobs: with: languages: java-kotlin - - name: Compile SteamAdvantage production code + - name: Compile baseSteam production code run: | chmod +x ./gradlew ./gradlew clean classes --rerun-tasks --no-build-cache --no-daemon --stacktrace \ diff --git a/.github/workflows/release-on-tag.yml b/.github/workflows/release-on-tag.yml index 42fd0e3..780592f 100644 --- a/.github/workflows/release-on-tag.yml +++ b/.github/workflows/release-on-tag.yml @@ -1,4 +1,4 @@ -name: Validate Steam Advantage release tag +name: Validate baseSteam release tag on: push: @@ -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 @@ -37,6 +37,11 @@ jobs: minecraft_version="$(value minecraft_version)" loader_name="$(value loader_name)" loader_code="$(value loader_code)" + project_id="$(value curseforge_project_id)" + if [[ ! "$project_id" =~ ^[1-9][0-9]*$ || "$project_id" == '240984' ]]; then + echo "baseSteam has no assigned CurseForge project; release validation is disabled" >&2 + exit 1 + fi IFS=. read -r mc_major mc_minor mc_patch extra <<<"$minecraft_version" if [[ -n "${extra:-}" || -z "${mc_major:-}" || -z "${mc_minor:-}" ]]; then diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d0f86ff..02acc06 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,17 @@ -Unreleased - Minecraft 1.10.2 +baseSteam 2.2.6.110021 + +- Rename Steam Advantage to baseSteam, using the basesteam mod and asset namespace. +- Move implementation code to zone.moddev.mc.basesteam and require basePower 2.4.4.110021 or newer. +- Read original steamadvantage block, item and tile identities; write new tile saves with basesteam IDs. +- Import the old configuration and additional loot rules without replacing current administrator settings; retain the original bytes. +- Honour old Power oil fuel-setting keys after the rename, with raw fluid names and current keys taking priority. +- Keep the four original enchantment registry keys and numeric allocation order for 1.10 compatibility. +- Preserve hitscan musket behavior, recipes, machine ratings, fuel settings, and the stable Power API. +- Use basepower and base-metals CurseForge relations; leave the new project unassigned and block publication. +- Pin the exact basePower source commit and development-jar checksum in the build and CI. +- Document the copied-world, operating and restart checks without treating them as a guarantee for every third-party add-on. + +Also included: - 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 70d8022..fe14e6e 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,34 @@ -# SteamAdvantage +# baseSteam -Steam Advantage adds steam-powered machines and infrastructure to Power Advantage for Minecraft 1.10.2. +baseSteam continues DrCyano's Steam Advantage, adding boilers, steam networks and steam-powered machines to basePower for Minecraft 1.10.2. -The maintained implementation namespace is `zone.moddev.mc.steamadvantage`. This coordinated release -requires Power Advantage `2.4.3.110021` or newer; update the two mods together. Runtime registry, -tile-entity, asset, configuration, and saved-world identities are unchanged. +Version `2.2.6.110021` renames Steam Advantage to baseSteam, with mod ID `basesteam` and +implementation namespace `zone.moddev.mc.basesteam`. It requires basePower `2.4.4.110021` or newer. +Replace both old jars together; do not install the old and new mods side by side. +The rename changes no recipes, machine ratings, fuel values, or musket balance. -The cross-mod [Advantage Works 1.10.2 Handbook](https://github.com/MinecraftModDevelopmentMods/PowerAdvantage/blob/master-1.10.2/docs/1.10/README.md) includes the Steam Engineer's Handbook, rated figures, commissioning layouts, and persistence tests. The [MMD material and fluid compatibility specification](https://github.com/MinecraftModDevelopmentMods/PowerAdvantage/blob/master-1.10.2/docs/1.10/mmd-material-fluid-compatibility.md) defines crude-oil aliases and OreSpawn ownership. +## Release Status + +This version is not published. The local checks include 135 Steam unit tests, original-release +migration fixtures, operating and full-restart checks, and finite-supply Steam endurance runs. +The [cross-mod qualification notes](https://github.com/MinecraftModDevelopmentMods/basePower/blob/master-1.10.2/docs/1.10/base-qualification.md) +record the tested jar checksums and limits. These checks do not replace manual gameplay acceptance. + +The cross-mod [1.10.2 Handbook](https://github.com/MinecraftModDevelopmentMods/basePower/blob/master-1.10.2/docs/1.10/README.md) includes the Steam Engineer's Handbook, rated figures, commissioning layouts, and persistence tests. The [MMD material and fluid compatibility specification](https://github.com/MinecraftModDevelopmentMods/basePower/blob/master-1.10.2/docs/1.10/mmd-material-fluid-compatibility.md) defines crude-oil aliases and OreSpawn ownership. + +## Existing Worlds + +Back up worlds and configuration before migration, and test a copy first. +Original `steamadvantage` blocks, items, and tile IDs are accepted; new tile saves use `basesteam`. +`steamadvantage.cfg` is copied to `basesteam.cfg` only when the latter is absent; the original is retained. +Old Power oil fuel-setting keys still work, with raw fluid names and current keys taking priority. +Custom additional-loot-table files are imported without replacing existing baseSteam files, and the old +bytes are retained as inactive `*.json.before-basesteam` backups. Existing loot files are never replaced by defaults. + +The four enchantment registry keys deliberately remain `steamadvantage:*`, preserving the original +numeric allocation order and Forge's saved enchantment-registry snapshot. This is a persistence +exception, not a second legacy mod container. This 1.10 version uses hitscan muskets, not saved projectile entities. +See [migration details and test coverage](docs/1.10-identity-migration.md). ## Drill Reload Fix @@ -18,7 +40,7 @@ The regression tests cover resumed progress and full server restarts. The `master-1.10.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. -Build the pinned OreSpawn commit `5a50df1158e948c8db55814e819090b34c12d765` first. Then build the pinned sibling PowerAdvantage development jar: +Build the pinned OreSpawn commit `5a50df1158e948c8db55814e819090b34c12d765` first. Then build the pinned sibling basePower development jar (the local checkout directory remains `PowerAdvantage`): ```text cd ..\..\PowerAdvantage @@ -27,7 +49,7 @@ gradlew.bat deobfJar The dependency locations can be overridden with `-PoreSpawnDeobfJar=` and `-PpowerAdvantageDeobfJar=`. -Then build and audit SteamAdvantage: +Then build and audit baseSteam: ```text gradlew.bat clean check build javadoc verifyReleaseDependencies verifyReleaseArtifacts writeReleaseChecksums @@ -41,4 +63,16 @@ For Eclipse, import this repository as an existing Gradle project and run: gradlew.bat cleanEclipse verifyEclipseProductionClasspath ``` -Power Advantage `2.4.3.110021` or newer is required at compile time and runtime but is never bundled. OreSpawn is required transitively by Power Advantage. Base Metals remains a required distribution dependency while its integrations stay reflection-based and absent from the compile classpath. +The expected development artifact is `basePower-2.4.4.110021-deobf.jar`. Its SHA-256 is pinned in +`gradle.properties`, the build audit, CI and CodeQL, together with source commit +`79fb16437615df98b6c6298fe8d98643a0e7140b` from the MMD basePower repository. +The build checks both pins. Do not substitute the old Power Advantage jar or a moving branch. + +basePower is required at compile time and runtime but is never bundled. OreSpawn is required transitively +by basePower. Base Metals remains a required distribution dependency while its integrations stay reflection-based +and absent from the compile classpath. The stable `cyano.poweradvantage.api` and required `com.mcmoddev` +compatibility types are not renamed. + +CurseForge relations are `basepower` and `base-metals`. No new CurseForge project is assigned: +`curseforge_project_id=0` deliberately blocks publication and release validation until +a new project is assigned and the identity audit is updated. The former project ID must not be reused. diff --git a/build.gradle b/build.gradle index 3059b82..f208f20 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+/ }) { @@ -144,22 +144,22 @@ repositories { } } -// SteamAdvantage needs the full PowerAdvantage implementation in development, +// baseSteam needs the full basePower implementation in development, // but the retired MMD Maven cannot provide a dependable deobfuscated artifact. // 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) if (!powerAdvantageDeobfJar.isFile()) { - throw new GradleException("Missing PowerAdvantage deobf jar at ${powerAdvantageDeobfJar}. " + throw new GradleException("Missing basePower deobf jar at ${powerAdvantageDeobfJar}. " + "Run gradlew.bat deobfJar in ../../PowerAdvantage first, or pass " + "-PpowerAdvantageDeobfJar=.") } -// PowerAdvantage requires OreSpawn 4. Keep it on development runtime only; -// SteamAdvantage does not compile against OreSpawn or bundle its classes. +// basePower requires OreSpawn 4. Keep it on development runtime only; +// baseSteam does not compile against OreSpawn or bundle its classes. def defaultOreSpawnDeobfJar = file("../../../../MinecraftMineralogy/OS110/OreSpawn/build/libs-dev/" \ + "OreSpawn-${project.orespawn_version}-deobf.jar") def oreSpawnDeobfJar = providers.gradleProperty('oreSpawnDeobfJar') @@ -177,7 +177,7 @@ dependencies { // Mavenizer's legacy metadata omits this compile-time Minecraft library. compileOnly 'org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209' - // PowerAdvantage is required at runtime but remains a separate mod jar. + // basePower is required at runtime but remains a separate mod jar. compileOnly files(powerAdvantageDeobfJar) runtimeOnly files(powerAdvantageDeobfJar) runtimeOnly files(oreSpawnDeobfJar) @@ -284,8 +284,8 @@ tasks.register('verifyReleaseConfiguration') { group = 'verification' description = 'Validates release identity, target metadata, and dependency policy.' doLast { - if (project.mod_version != '2.2.5.110021') { - throw new GradleException("Unexpected SteamAdvantage release version: ${project.mod_version}") + if (project.mod_version != '2.2.6.110021') { + throw new GradleException("Unexpected baseSteam release version: ${project.mod_version}") } if (project.minecraft_version != '1.10.2' || project.forge_version != '12.18.3.2511' @@ -299,23 +299,27 @@ tasks.register('verifyReleaseConfiguration') { || project.gradle_java_version != '17') { throw new GradleException('Unexpected release dispatcher target metadata') } - if (project.mod_id != 'steamadvantage' - || project.group.toString() != 'zone.moddev.mc.steamadvantage' - || base.archivesName.get() != 'SteamAdvantage' + if (project.mod_id != 'basesteam' || project.mod_name != '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 != '0') { 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.10.2') { throw new GradleException('Unexpected CurseForge dependency or game-version metadata') } - if (project.poweradvantage_version != '2.4.3.110021' - || project.poweradvantage_source_repository != 'MinecraftModDevelopmentMods/PowerAdvantage' - || project.poweradvantage_source_ref != '2443eaae7c666b8d54a5c9c30091892b79e80994' - || project.poweradvantage_deobf_sha256 != '316262B51DDF4BD4258E19CC45221959E20133855B37E2367686F752A48C07C5') { - throw new GradleException('Unexpected PowerAdvantage compile dependency identity') + if (project.poweradvantage_version != '2.4.4.110021' + || project.poweradvantage_source_repository != 'MinecraftModDevelopmentMods/basePower' + || project.poweradvantage_source_ref != '79fb16437615df98b6c6298fe8d98643a0e7140b' + || project.poweradvantage_deobf_sha256 != '2992F2CADC30D8F61A17216DF9AB02BDF8E8211BB8B494A6CCED70A3267F69FE') { + throw new GradleException('Unexpected basePower compile dependency identity') + } + if (!(project.poweradvantage_source_ref ==~ /[a-f0-9]{40}/) + || !(project.poweradvantage_deobf_sha256 ==~ /[A-F0-9]{64}/)) { + throw new GradleException('Exact basePower source and artifact checksum pins are required') } if (project.orespawn_version != '4.0.8.110021' || project.orespawn_source_repository != 'MinecraftModDevelopmentMods/OreSpawn' @@ -327,50 +331,53 @@ tasks.register('verifyReleaseConfiguration') { String workflow = file(workflowPath).getText('UTF-8') if (!workflow.contains('repository: ' + project.poweradvantage_source_repository) || !workflow.contains('ref: ' + project.poweradvantage_source_ref) + || !workflow.contains(project.poweradvantage_deobf_sha256) + || !workflow.contains('sha256sum --check --strict') || !workflow.contains('repository: ' + project.orespawn_source_repository) || !workflow.contains('ref: ' + project.orespawn_source_commit)) { throw new GradleException("${workflowPath} does not build the pinned Advantage dependencies") } } String mainSource = file( - 'src/main/java/zone/moddev/mc/steamadvantage/SteamAdvantage.java').getText('UTF-8') - if (!mainSource.contains('MODID = "steamadvantage"') - || !mainSource.contains('VERSION = "2.2.5.110021"') - || !mainSource.contains('dependencies = "required-after:poweradvantage@[2.4.3.110021,);after:basemetals"')) { - throw new GradleException('SteamAdvantage source identity or dependency policy changed') + 'src/main/java/zone/moddev/mc/basesteam/SteamAdvantage.java').getText('UTF-8') + if (!mainSource.contains('MODID = "basesteam"') || !mainSource.contains('NAME = "baseSteam"') + || !mainSource.contains('VERSION = "2.2.6.110021"') + || !mainSource.contains('dependencies = "required-after:basepower@[2.4.4.110021,);after:basemetals"')) { + throw new GradleException('baseSteam 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' || mod.name != 'baseSteam') { + throw new GradleException('Source mcmod.info does not use the baseSteam identity') } } } tasks.register('verifyReleaseDependencies') { group = 'verification' - description = 'Resolves Forge and audits the exact required PowerAdvantage development jar.' + description = 'Resolves Forge and audits the exact required basePower development jar.' dependsOn tasks.named('verifyReleaseConfiguration') doLast { String actualHash = MessageDigest.getInstance('SHA-256') .digest(powerAdvantageDeobfJar.bytes).encodeHex().toString().toUpperCase() if (actualHash != project.poweradvantage_deobf_sha256) { - throw new GradleException("PowerAdvantage SHA-256 is ${actualHash}, expected " + throw new GradleException("basePower SHA-256 is ${actualHash}, expected " + project.poweradvantage_deobf_sha256) } new ZipFile(powerAdvantageDeobfJar).withCloseable { zip -> ['cyano/poweradvantage/api/PoweredEntity.class', 'cyano/poweradvantage/api/GUIBlock.class', 'cyano/poweradvantage/api/FluidCategoryRegistry.class', - 'zone/moddev/mc/poweradvantage/conduitnetwork/ConduitRegistry.class', - 'zone/moddev/mc/poweradvantage/init/Fluids.class'].each { required -> + 'zone/moddev/mc/basepower/compat/LegacyIdentity.class', + '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}") + throw new GradleException("basePower dependency is missing ${required}") } } def manifest = new Manifest(zip.getInputStream(zip.getEntry('META-INF/MANIFEST.MF'))).mainAttributes if (manifest.getValue('Implementation-Version') != project.poweradvantage_version) { - throw new GradleException('PowerAdvantage dependency manifest has the wrong version') + throw new GradleException('basePower dependency manifest has the wrong version') } } @@ -388,17 +395,17 @@ tasks.register('verifyReleaseDependencies') { Set compileFiles = configurations.compileClasspath.files.collect { it.canonicalFile } as Set if (!compileFiles.contains(powerAdvantageDeobfJar.canonicalFile)) { - throw new GradleException('PowerAdvantage is missing from compileClasspath') + throw new GradleException('basePower is missing from compileClasspath') } Set runtimeFiles = configurations.runtimeClasspath.files.collect { it.canonicalFile } as Set if (!runtimeFiles.contains(powerAdvantageDeobfJar.canonicalFile)) { - throw new GradleException('PowerAdvantage is missing from runtimeClasspath') + throw new GradleException('basePower is missing from runtimeClasspath') } if (!runtimeFiles.contains(oreSpawnDeobfJar.canonicalFile)) { - throw new GradleException('PowerAdvantage runtime dependency OreSpawn is missing from runtimeClasspath') + throw new GradleException('basePower runtime dependency OreSpawn is missing from runtimeClasspath') } if (compileFiles.contains(oreSpawnDeobfJar.canonicalFile)) { - throw new GradleException('SteamAdvantage must not compile against OreSpawn') + throw new GradleException('baseSteam must not compile against OreSpawn') } List forbiddenRuntimeMods = runtimeFiles.collect { it.name.toLowerCase(Locale.ROOT) } .findAll { name -> @@ -449,16 +456,18 @@ tasks.register('verifyReleaseArtifacts') { new ZipFile(mainJar).withCloseable { zip -> List names = zip.entries().collect { it.name } ['mcmod.info', 'pack.mcmeta', - 'zone/moddev/mc/steamadvantage/SteamAdvantage.class', - 'zone/moddev/mc/steamadvantage/machines/SteamDrillTileEntity.class', - 'assets/steamadvantage/lang/en_US.lang'].each { required -> + 'zone/moddev/mc/basesteam/SteamAdvantage.class', + 'zone/moddev/mc/basesteam/machines/SteamDrillTileEntity.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/', 'cyano/poweradvantage/', 'com/mcmoddev/steamadvantage/', 'com/mcmoddev/poweradvantage/', - 'zone/moddev/mc/poweradvantage/', 'cyano/basemetals/', 'com/mcmoddev/lib/', + 'zone/moddev/mc/basepower/', 'zone/moddev/mc/poweradvantage/', + 'zone/moddev/mc/steamadvantage/', 'assets/steamadvantage/', + 'cyano/basemetals/', 'com/mcmoddev/lib/', 'zone/moddev/mc/orespawn/', 'com/mcmoddev/orespawn/', 'net/minecraft/', 'net/minecraftforge/'].each { forbidden -> if (names.any { it.contains(forbidden) }) { @@ -468,12 +477,14 @@ tasks.register('verifyReleaseArtifacts') { def metadata = new JsonSlurper().parseText(zip.getInputStream(zip.getEntry('mcmod.info')) .getText(StandardCharsets.UTF_8.name())) def mod = metadata instanceof List ? metadata.first() : metadata - if (mod.modid != project.mod_id || mod.version != project.mod_version + if (mod.modid != project.mod_id || mod.name != project.mod_name || mod.version != project.mod_version || mod.mcversion != project.minecraft_version) { throw new GradleException('Packaged mcmod.info identity, version, or target is incorrect') } def manifest = new Manifest(zip.getInputStream(zip.getEntry('META-INF/MANIFEST.MF'))).mainAttributes if (manifest.getValue('Implementation-Version') != project.mod_version + || manifest.getValue('Implementation-Title') != base.archivesName.get() + || manifest.getValue('Maven-Artifact') != "${project.group}:${base.archivesName.get()}:${project.version}" || manifest.getValue('Built-On-Java') != project.java_version || manifest.getValue('Implementation-Timestamp') != null || manifest.getValue('Timestamp') != null) { @@ -494,9 +505,9 @@ tasks.register('verifyReleaseArtifacts') { } new ZipFile(new File(libs, expectedReleaseFiles.get()[1])).withCloseable { sourceZip -> - if (sourceZip.getEntry('zone/moddev/mc/steamadvantage/SteamAdvantage.java') == null - || sourceZip.getEntry('zone/moddev/mc/steamadvantage/machines/SteamDrillTileEntity.java') == null) { - throw new GradleException('Sources jar is missing required SteamAdvantage sources') + 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 baseSteam sources') } } new ZipFile(new File(libs, expectedReleaseFiles.get()[2])).withCloseable { javadocZip -> @@ -591,9 +602,9 @@ publishing { artifact(tasks.named('javadocJar')) } pom { - name = 'Steam Advantage' + name = project.mod_name 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' @@ -601,9 +612,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' } } } @@ -620,9 +631,21 @@ publishing { } } +tasks.register('validatePublicationIdentity') { + group = 'publishing' + description = 'Blocks publication until a new baseSteam CurseForge project is assigned.' + doLast { + String projectId = project.curseforge_project_id.toString() + if (!(projectId ==~ /[1-9][0-9]*/) || projectId == '240984') { + throw new GradleException('baseSteam has no assigned CurseForge project; publication is disabled') + } + } +} + tasks.register('validateMavenReleaseCredentials') { group = 'publishing' description = 'Prevents Maven publication from using a local or incomplete destination.' + dependsOn tasks.named('validatePublicationIdentity') doLast { if (!providers.environmentVariable('MAVEN_UPLOAD_URL').isPresent() || !mavenUploadUsername.isPresent() || !mavenUploadPassword.isPresent()) { @@ -773,7 +796,7 @@ tasks.register('verifyEclipseProductionClasspath') { || contents.contains('src/test') || contents.contains('bin/test')) { throw new GradleException("${name} does not isolate production code") } - if (!contents.contains('PROJECT_ATTR" value="SteamAdvantage"')) { + if (!contents.contains('PROJECT_ATTR" value="baseSteam"')) { throw new GradleException("${name} targets the wrong Eclipse project") } } diff --git a/docs/1.10-identity-migration.md b/docs/1.10-identity-migration.md new file mode 100644 index 0000000..aed4382 --- /dev/null +++ b/docs/1.10-identity-migration.md @@ -0,0 +1,98 @@ +# baseSteam 1.10.2 Identity Migration + +Version `2.2.6.110021` is based on Steam Advantage commit +`1b879c4da9f39a87aea17b90dc692356ef288861`. It has not been published. +Automated checks do not replace manual gameplay testing. + +## New Identity + +| Surface | Value | +| --- | --- | +| Display and artifact name | `baseSteam` | +| Mod and asset namespace | `basesteam` | +| Implementation package | `zone.moddev.mc.basesteam` | +| Version | `2.2.6.110021` | +| Runtime dependencies | `required-after:basepower@[2.4.4.110021,);after:basemetals` | +| CurseForge required relations | `basepower,base-metals` | +| CurseForge project | `0`, unassigned; publication blocked | + +The main class keeps its Java name `SteamAdvantage` inside the new package. Build overrides +`powerAdvantageDeobfJar` and `steamAdvantageRunDirectory` retain their existing names so local tooling +can continue to pass them. Local checkout directory names do not determine the artifact identity. + +## Saved Data + +The shared `zone.moddev.mc.basepower.compat.LegacyIdentity` helper handles missing mappings through +Forge 1.10's `event.getAll()`. Both blocks and items, including block items, are remapped from +`steamadvantage:` to `basesteam:`. Unsupported owned mappings fail instead of being discarded. +Other mods' namespaces are not remapped by Steam's event handler. + +All twelve original tile IDs `steamadvantage.` are load alternatives for new canonical IDs +`basesteam.`. Forge's `registerTileEntityWithAlternatives` preserves the canonical write ID. +The tile names are `steam_boiler_coal`, `steam_boiler_electric`, `steam_boiler_geothermal`, `steam_tank`, +`steam_furnace`, `steam_crusher`, `steam_drill`, `steam_elevator`, `drillbit`, `steam_still`, `steam_pump`, +and `steam_boiler_oil`. Existing machine NBT fields, inventories, energy, progress and direction formats +are not changed by this rename. + +The original 1.10 source registers no non-tile custom entities. Muskets resolve hits directly through a +ray trace, without spawning a projectile. There is therefore no historical musket projectile save ID to +alias in this target. No new entity or projectile behavior is introduced. + +### Deliberate Enchantment Exception + +The registry keys `steamadvantage:high_explosive`, `steamadvantage:powderless`, +`steamadvantage:rapid_reload`, and `steamadvantage:recoil` are retained. Registration order and dynamic +numeric allocation are unchanged. Forge 1.10 missing mappings cover only blocks and items; +`PersistentRegistryManager` restores enchantments through its saved registry snapshot. Enchanted item +NBT stores numeric short IDs. Retaining the original keys matches that snapshot; aliases alone would +load the old canonical keys again, and registering a second renamed set is not a safe substitute. +This is a scoped persistence exception under the new `basesteam` mod, not a legacy `ModContainer`. +The regression test checks the actual saved `tag.ench[].id` short, its registry target, and the same +numeric ID after loading and resaving the item. +This rename does not repair pre-existing enchantment-ID differences caused by unrelated mod-list changes. +Custom loot rules referring to these enchantments must retain their old keys. + +The public `cyano.poweradvantage.api` package, required `com.mcmoddev` compatibility types, and +external Base Metals and OreSpawn packages remain unchanged. Steam implementation references to +`zone.moddev.mc.poweradvantage` and Power-owned model textures now point to `basepower`. +Unnamespaced steam conduit and damage-source names remain unchanged. + +## Configuration And Loot + +`steamadvantage.cfg` is copied byte-for-byte to `basesteam.cfg` only when the latter does not exist. +The original is retained and an existing new configuration wins. Fuel-setting values and files are +not rewritten. For the two basePower-owned oils, the boiler checks the raw fluid name first, then the +current `fluid.basepower.crude_oil` or `fluid.basepower.refined_oil` key, then the corresponding old +`fluid.poweradvantage.*` key. Explicit zero values still disable burning. The legacy fallback applies +only to these exact two basePower fluid identities, not foreign fluids or other names. + +Before generating loot defaults, the shared helper imports JSON from +`config/additional-loot-tables/steamadvantage` into the corresponding `basesteam` paths. Owned item +identifiers change, custom numbers and foreign namespaces remain, and existing canonical files win. +Original files become `*.json.before-basesteam`, preserving their bytes without leaving two active +`*.json` pools. Missing defaults are created with `CREATE_NEW`; existing migrated or administrator +rules are not overwritten. Migration errors stop initialization and require inspection of the retained +files before retrying. Do not rename inactive backups back to `.json` alongside the new files. + +## Build And Test Status + +The local JUnit reports contain 135 tests, with no failures, errors or skipped tests. The full +build, dependency, archive, checksum and Eclipse checks also pass with the exact basePower pin. +The main jar remains SHA-256 +`728E37A1A0551596D8167976A7022E31EF075A383640BB385470160DD9A8F07D`. + +The build pins basePower source commit `79fb16437615df98b6c6298fe8d98643a0e7140b` and development-jar +SHA-256 `2992F2CADC30D8F61A17216DF9AB02BDF8E8211BB8B494A6CCED70A3267F69FE` in properties, +the fixed audit, CI and CodeQL. Neither an old Power artifact nor a moving branch is an acceptable substitute. + +Added tests cover original tile reads and canonical resaves, the missing-mapping event contract, +numeric enchantment round-trips, hitscan behavior, configuration copying, custom loot import, +inactive backups, existing-new precedence, invalid JSON, and default-file non-overwrite behavior. +Existing regression tests are relocated with their implementation package, without changing their +behavioral assertions or replacing historical fixtures. + +The [cross-mod qualification notes](https://github.com/MinecraftModDevelopmentMods/basePower/blob/master-1.10.2/docs/1.10/base-qualification.md) +record the exact-artifact original-world, operating, restart and finite-supply endurance checks. +Those results are separate from hosted CI and manual client acceptance. Generated worlds and raw +reports stay outside source control. Project ID `0` deliberately prevents publication until a new +CurseForge project is assigned; the former Steam Advantage project must not be reused. diff --git a/gradle.properties b/gradle.properties index 8ebcf2d..2853255 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,24 +19,25 @@ 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=0 -mod_id=steamadvantage -mod_name=Steam Advantage +mod_id=basesteam +mod_name=baseSteam mod_license=GPL-3.0-only -mod_version=2.2.5.110021 -mod_group=zone.moddev.mc.steamadvantage +mod_version=2.2.6.110021 +mod_group=zone.moddev.mc.basesteam mod_authors=DrCyano -mod_description=Steam-powered machines and infrastructure for the Power Advantage platform. +mod_description=Steam-powered machines and infrastructure for the basePower platform. -cf_requirements=power-advantage,base-metals +cf_requirements=basepower,base-metals cf_optionals= cf_versions=1.10.2 -poweradvantage_version=2.4.3.110021 -poweradvantage_source_repository=MinecraftModDevelopmentMods/PowerAdvantage -poweradvantage_source_ref=2443eaae7c666b8d54a5c9c30091892b79e80994 -poweradvantage_deobf_sha256=316262B51DDF4BD4258E19CC45221959E20133855B37E2367686F752A48C07C5 +poweradvantage_version=2.4.4.110021 +poweradvantage_source_repository=MinecraftModDevelopmentMods/basePower +# Keep the source commit and its reproducible development-jar checksum together. +poweradvantage_source_ref=79fb16437615df98b6c6298fe8d98643a0e7140b +poweradvantage_deobf_sha256=2992F2CADC30D8F61A17216DF9AB02BDF8E8211BB8B494A6CCED70A3267F69FE orespawn_version=4.0.8.110021 orespawn_source_repository=MinecraftModDevelopmentMods/OreSpawn orespawn_source_commit=5a50df1158e948c8db55814e819090b34c12d765 diff --git a/settings.gradle b/settings.gradle index 8591a7e..ae61531 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,4 +2,4 @@ plugins { id('org.gradle.toolchains.foojay-resolver-convention') version '1.0.0' } -rootProject.name = 'SteamAdvantage' +rootProject.name = 'baseSteam' diff --git a/src/main/java/zone/moddev/mc/steamadvantage/SteamAdvantage.java b/src/main/java/zone/moddev/mc/basesteam/SteamAdvantage.java similarity index 84% rename from src/main/java/zone/moddev/mc/steamadvantage/SteamAdvantage.java rename to src/main/java/zone/moddev/mc/basesteam/SteamAdvantage.java index 3693ae7..cc4f4f7 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/SteamAdvantage.java +++ b/src/main/java/zone/moddev/mc/basesteam/SteamAdvantage.java @@ -1,6 +1,7 @@ -package zone.moddev.mc.steamadvantage; +package zone.moddev.mc.basesteam; -import zone.moddev.mc.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; @@ -8,6 +9,7 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -35,14 +37,16 @@ * - Bioreactor (slowly makes liquid fuel from organic matter) */ @Mod(modid = SteamAdvantage.MODID, version = SteamAdvantage.VERSION, name=SteamAdvantage.NAME, - dependencies = "required-after:poweradvantage@[2.4.3.110021,);after:basemetals") + dependencies = "required-after:basepower@[2.4.4.110021,);after:basemetals") public class SteamAdvantage {/** The identifier for this mod */ - public static final String MODID = "steamadvantage"; + public static final String MODID = "basesteam"; + /** Original persisted identity, retained only for migration and enchantments. */ + 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 target-qualified release version of this mod. */ - public static final String VERSION = "2.2.5.110021"; + public static final String VERSION = "2.2.6.110021"; public static float MUSKET_DAMAGE = 20; public static int MUSKET_RELOAD = 20*5; @@ -57,7 +61,8 @@ public class SteamAdvantage @EventHandler public void preInit(FMLPreInitializationEvent event) { - 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, @@ -93,6 +98,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()); @@ -158,6 +164,11 @@ public void postInit(FMLPostInitializationEvent event) } + @EventHandler + public void missingMappings(FMLMissingMappingsEvent event) { + LegacyIdentity.remapMissingMappings(event, LEGACY_MODID, MODID); + } + @SideOnly(Side.CLIENT) private void clientPostInit(FMLPostInitializationEvent event){ diff --git a/src/main/java/zone/moddev/mc/steamadvantage/blocks/DrillBitBlock.java b/src/main/java/zone/moddev/mc/basesteam/blocks/DrillBitBlock.java similarity index 97% rename from src/main/java/zone/moddev/mc/steamadvantage/blocks/DrillBitBlock.java rename to src/main/java/zone/moddev/mc/basesteam/blocks/DrillBitBlock.java index e676e1c..c38d925 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/blocks/DrillBitBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/blocks/DrillBitBlock.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.steamadvantage.blocks; +package zone.moddev.mc.basesteam.blocks; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/blocks/DrillBitTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/blocks/DrillBitTileEntity.java similarity index 94% rename from src/main/java/zone/moddev/mc/steamadvantage/blocks/DrillBitTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/blocks/DrillBitTileEntity.java index b30ccc8..52ce8ae 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/blocks/DrillBitTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/blocks/DrillBitTileEntity.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.steamadvantage.blocks; +package zone.moddev.mc.basesteam.blocks; -import zone.moddev.mc.steamadvantage.init.Blocks; +import zone.moddev.mc.basesteam.init.Blocks; import net.minecraft.block.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, zone.moddev.mc.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/zone/moddev/mc/steamadvantage/blocks/PlatformBlock.java b/src/main/java/zone/moddev/mc/basesteam/blocks/PlatformBlock.java similarity index 97% rename from src/main/java/zone/moddev/mc/steamadvantage/blocks/PlatformBlock.java rename to src/main/java/zone/moddev/mc/basesteam/blocks/PlatformBlock.java index ec16054..8b25f73 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/blocks/PlatformBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/blocks/PlatformBlock.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.steamadvantage.blocks; +package zone.moddev.mc.basesteam.blocks; -import zone.moddev.mc.steamadvantage.init.Blocks; +import zone.moddev.mc.basesteam.init.Blocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/blocks/PumpPipeBlock.java b/src/main/java/zone/moddev/mc/basesteam/blocks/PumpPipeBlock.java similarity index 98% rename from src/main/java/zone/moddev/mc/steamadvantage/blocks/PumpPipeBlock.java rename to src/main/java/zone/moddev/mc/basesteam/blocks/PumpPipeBlock.java index efbde25..8c9a118 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/blocks/PumpPipeBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/blocks/PumpPipeBlock.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.blocks; +package zone.moddev.mc.basesteam.blocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/blocks/SteamPipeBlock.java b/src/main/java/zone/moddev/mc/basesteam/blocks/SteamPipeBlock.java similarity index 71% rename from src/main/java/zone/moddev/mc/steamadvantage/blocks/SteamPipeBlock.java rename to src/main/java/zone/moddev/mc/basesteam/blocks/SteamPipeBlock.java index 1926307..78681ff 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/blocks/SteamPipeBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/blocks/SteamPipeBlock.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.steamadvantage.blocks; +package zone.moddev.mc.basesteam.blocks; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; public class SteamPipeBlock extends cyano.poweradvantage.api.simple.BlockSimplePowerConduit{ diff --git a/src/main/java/zone/moddev/mc/steamadvantage/blocks/SteamTrackBlock.java b/src/main/java/zone/moddev/mc/basesteam/blocks/SteamTrackBlock.java similarity index 93% rename from src/main/java/zone/moddev/mc/steamadvantage/blocks/SteamTrackBlock.java rename to src/main/java/zone/moddev/mc/basesteam/blocks/SteamTrackBlock.java index 9b05431..785dfbd 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/blocks/SteamTrackBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/blocks/SteamTrackBlock.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.steamadvantage.blocks; +package zone.moddev.mc.basesteam.blocks; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/compat/BaseMetalsCompat.java b/src/main/java/zone/moddev/mc/basesteam/compat/BaseMetalsCompat.java similarity index 98% rename from src/main/java/zone/moddev/mc/steamadvantage/compat/BaseMetalsCompat.java rename to src/main/java/zone/moddev/mc/basesteam/compat/BaseMetalsCompat.java index 9109b8f..c4245a1 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/compat/BaseMetalsCompat.java +++ b/src/main/java/zone/moddev/mc/basesteam/compat/BaseMetalsCompat.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.steamadvantage.compat; +package zone.moddev.mc.basesteam.compat; -import zone.moddev.mc.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/zone/moddev/mc/steamadvantage/enchantments/HighExplosiveEnchantment.java b/src/main/java/zone/moddev/mc/basesteam/enchantments/HighExplosiveEnchantment.java similarity index 89% rename from src/main/java/zone/moddev/mc/steamadvantage/enchantments/HighExplosiveEnchantment.java rename to src/main/java/zone/moddev/mc/basesteam/enchantments/HighExplosiveEnchantment.java index 86f5b8d..4f40b20 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/enchantments/HighExplosiveEnchantment.java +++ b/src/main/java/zone/moddev/mc/basesteam/enchantments/HighExplosiveEnchantment.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.steamadvantage.enchantments; +package zone.moddev.mc.basesteam.enchantments; -import zone.moddev.mc.steamadvantage.init.Items; +import zone.moddev.mc.basesteam.init.Items; import net.minecraft.enchantment.EnumEnchantmentType; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/enchantments/PowderlessEnchantment.java b/src/main/java/zone/moddev/mc/basesteam/enchantments/PowderlessEnchantment.java similarity index 89% rename from src/main/java/zone/moddev/mc/steamadvantage/enchantments/PowderlessEnchantment.java rename to src/main/java/zone/moddev/mc/basesteam/enchantments/PowderlessEnchantment.java index f5c298b..895d017 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/enchantments/PowderlessEnchantment.java +++ b/src/main/java/zone/moddev/mc/basesteam/enchantments/PowderlessEnchantment.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.steamadvantage.enchantments; +package zone.moddev.mc.basesteam.enchantments; -import zone.moddev.mc.steamadvantage.init.Items; +import zone.moddev.mc.basesteam.init.Items; import net.minecraft.enchantment.EnumEnchantmentType; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/enchantments/RapidReloadEnchantment.java b/src/main/java/zone/moddev/mc/basesteam/enchantments/RapidReloadEnchantment.java similarity index 89% rename from src/main/java/zone/moddev/mc/steamadvantage/enchantments/RapidReloadEnchantment.java rename to src/main/java/zone/moddev/mc/basesteam/enchantments/RapidReloadEnchantment.java index e8d7c45..247629b 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/enchantments/RapidReloadEnchantment.java +++ b/src/main/java/zone/moddev/mc/basesteam/enchantments/RapidReloadEnchantment.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.steamadvantage.enchantments; +package zone.moddev.mc.basesteam.enchantments; -import zone.moddev.mc.steamadvantage.init.Items; +import zone.moddev.mc.basesteam.init.Items; import net.minecraft.enchantment.EnumEnchantmentType; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/enchantments/RecoilEnchantment.java b/src/main/java/zone/moddev/mc/basesteam/enchantments/RecoilEnchantment.java similarity index 89% rename from src/main/java/zone/moddev/mc/steamadvantage/enchantments/RecoilEnchantment.java rename to src/main/java/zone/moddev/mc/basesteam/enchantments/RecoilEnchantment.java index 2792db1..e59f9e6 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/enchantments/RecoilEnchantment.java +++ b/src/main/java/zone/moddev/mc/basesteam/enchantments/RecoilEnchantment.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.steamadvantage.enchantments; +package zone.moddev.mc.basesteam.enchantments; -import zone.moddev.mc.steamadvantage.init.Items; +import zone.moddev.mc.basesteam.init.Items; import net.minecraft.enchantment.EnumEnchantmentType; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/graphics/DrillBitRenderer.java b/src/main/java/zone/moddev/mc/basesteam/graphics/DrillBitRenderer.java similarity index 96% rename from src/main/java/zone/moddev/mc/steamadvantage/graphics/DrillBitRenderer.java rename to src/main/java/zone/moddev/mc/basesteam/graphics/DrillBitRenderer.java index 54ea12f..93958e7 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/graphics/DrillBitRenderer.java +++ b/src/main/java/zone/moddev/mc/basesteam/graphics/DrillBitRenderer.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.steamadvantage.graphics; +package zone.moddev.mc.basesteam.graphics; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.blocks.DrillBitTileEntity; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.blocks.DrillBitTileEntity; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/BlastFurnaceGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/BlastFurnaceGUI.java similarity index 93% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/BlastFurnaceGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/BlastFurnaceGUI.java index 9bcf6be..9e97bb6 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/BlastFurnaceGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/BlastFurnaceGUI.java @@ -1,13 +1,13 @@ -package zone.moddev.mc.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 zone.moddev.mc.poweradvantage.math.Integer2D; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.machines.BlastFurnaceTileEntity; +import zone.moddev.mc.basepower.math.Integer2D; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.machines.BlastFurnaceTileEntity; public class BlastFurnaceGUI extends SimpleMachineGUI{ diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/CoalBoilerGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/CoalBoilerGUI.java similarity index 91% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/CoalBoilerGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/CoalBoilerGUI.java index 3baa850..4c52898 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/CoalBoilerGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/CoalBoilerGUI.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.machines.CoalBoilerTileEntity; +import zone.moddev.mc.basepower.math.Integer2D; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.machines.CoalBoilerTileEntity; public class CoalBoilerGUI extends SimpleMachineGUI{ diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/ElectricBoilerGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/ElectricBoilerGUI.java similarity index 91% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/ElectricBoilerGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/ElectricBoilerGUI.java index 3ddcd3f..8d5bf51 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/ElectricBoilerGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/ElectricBoilerGUI.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.machines.ElectricBoilerTileEntity; +import zone.moddev.mc.basepower.math.Integer2D; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.machines.ElectricBoilerTileEntity; public class ElectricBoilerGUI extends SimpleMachineGUI{ diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/GUIHelper.java b/src/main/java/zone/moddev/mc/basesteam/gui/GUIHelper.java similarity index 97% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/GUIHelper.java rename to src/main/java/zone/moddev/mc/basesteam/gui/GUIHelper.java index e897bdd..2b35df5 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/GUIHelper.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/GUIHelper.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import cyano.poweradvantage.api.simple.SimpleMachineGUI.GUIContainer; -import zone.moddev.mc.poweradvantage.gui.FluidTankGUI; +import zone.moddev.mc.basepower.gui.FluidTankGUI; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/GeothermalBoilerGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/GeothermalBoilerGUI.java similarity index 91% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/GeothermalBoilerGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/GeothermalBoilerGUI.java index 370c777..de599c5 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/GeothermalBoilerGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/GeothermalBoilerGUI.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.machines.GeothermalBoilerTileEntity; +import zone.moddev.mc.basepower.math.Integer2D; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.machines.GeothermalBoilerTileEntity; public class GeothermalBoilerGUI extends SimpleMachineGUI{ diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/OilBoilerGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/OilBoilerGUI.java similarity index 92% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/OilBoilerGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/OilBoilerGUI.java index 8d90f39..f792099 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/OilBoilerGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/OilBoilerGUI.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.machines.OilBoilerTileEntity; +import zone.moddev.mc.basepower.math.Integer2D; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.machines.OilBoilerTileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/RockCrusherGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/RockCrusherGUI.java similarity index 91% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/RockCrusherGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/RockCrusherGUI.java index 017d2ac..5687661 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/RockCrusherGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/RockCrusherGUI.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.machines.RockCrusherTileEntity; +import zone.moddev.mc.basepower.math.Integer2D; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.machines.RockCrusherTileEntity; public class RockCrusherGUI extends SimpleMachineGUI{ diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/SteamDrillGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/SteamDrillGUI.java similarity index 91% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/SteamDrillGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/SteamDrillGUI.java index 49e5efe..b80698a 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/SteamDrillGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/SteamDrillGUI.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.machines.SteamDrillTileEntity; +import zone.moddev.mc.basepower.math.Integer2D; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.machines.SteamDrillTileEntity; public class SteamDrillGUI extends SimpleMachineGUI{ diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/SteamPumpGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/SteamPumpGUI.java similarity index 91% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/SteamPumpGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/SteamPumpGUI.java index e5d6c1a..6365a25 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/SteamPumpGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/SteamPumpGUI.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.machines.SteamPumpTileEntity; +import zone.moddev.mc.basepower.math.Integer2D; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.machines.SteamPumpTileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/SteamStillGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/SteamStillGUI.java similarity index 92% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/SteamStillGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/SteamStillGUI.java index 5e547c6..d7881f5 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/SteamStillGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/SteamStillGUI.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.machines.SteamStillTileEntity; +import zone.moddev.mc.basepower.math.Integer2D; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.machines.SteamStillTileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/gui/SteamTankGUI.java b/src/main/java/zone/moddev/mc/basesteam/gui/SteamTankGUI.java similarity index 90% rename from src/main/java/zone/moddev/mc/steamadvantage/gui/SteamTankGUI.java rename to src/main/java/zone/moddev/mc/basesteam/gui/SteamTankGUI.java index ed1a6b4..535175a 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/gui/SteamTankGUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/gui/SteamTankGUI.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import net.minecraft.util.ResourceLocation; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.machines.SteamTankTileEntity; +import zone.moddev.mc.basepower.math.Integer2D; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.machines.SteamTankTileEntity; public class SteamTankGUI extends SimpleMachineGUI{ diff --git a/src/main/java/zone/moddev/mc/steamadvantage/init/Blocks.java b/src/main/java/zone/moddev/mc/basesteam/init/Blocks.java similarity index 91% rename from src/main/java/zone/moddev/mc/steamadvantage/init/Blocks.java rename to src/main/java/zone/moddev/mc/basesteam/init/Blocks.java index fd63c0b..644db58 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/init/Blocks.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/Blocks.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.init; +package zone.moddev.mc.basesteam.init; import cyano.poweradvantage.api.GUIBlock; -import zone.moddev.mc.poweradvantage.blocks.BlockPowerSwitch; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.blocks.*; -import zone.moddev.mc.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; @@ -81,7 +81,7 @@ public static void init(){ private static Block addBlock(Block block, String name ){ block.setUnlocalizedName(SteamAdvantage.MODID+"."+name); GameRegistry.registerBlock(block, name); - block.setCreativeTab(zone.moddev.mc.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/zone/moddev/mc/steamadvantage/init/Enchantments.java b/src/main/java/zone/moddev/mc/basesteam/init/Enchantments.java similarity index 64% rename from src/main/java/zone/moddev/mc/steamadvantage/init/Enchantments.java rename to src/main/java/zone/moddev/mc/basesteam/init/Enchantments.java index 3ad553c..3baecb6 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/init/Enchantments.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/Enchantments.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.init; +package zone.moddev.mc.basesteam.init; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.enchantments.HighExplosiveEnchantment; -import zone.moddev.mc.steamadvantage.enchantments.PowderlessEnchantment; -import zone.moddev.mc.steamadvantage.enchantments.RapidReloadEnchantment; -import zone.moddev.mc.steamadvantage.enchantments.RecoilEnchantment; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.enchantments.HighExplosiveEnchantment; +import zone.moddev.mc.basesteam.enchantments.PowderlessEnchantment; +import zone.moddev.mc.basesteam.enchantments.RapidReloadEnchantment; +import zone.moddev.mc.basesteam.enchantments.RecoilEnchantment; import net.minecraft.enchantment.Enchantment; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.FMLLog; @@ -28,17 +28,18 @@ public static void init(){ rapid_reload = new RapidReloadEnchantment(); recoil = new RecoilEnchantment(); + // Match PersistentRegistryManager snapshots and numeric NBT; keep keys and allocation order. Enchantment.REGISTRY.register(getNextEnchantmentID(), - new ResourceLocation(SteamAdvantage.MODID+":"+"high_explosive"), + new ResourceLocation(SteamAdvantage.LEGACY_MODID+":"+"high_explosive"), high_explosive); Enchantment.REGISTRY.register(getNextEnchantmentID(), - new ResourceLocation(SteamAdvantage.MODID+":"+"powderless"), + new ResourceLocation(SteamAdvantage.LEGACY_MODID+":"+"powderless"), powderless); Enchantment.REGISTRY.register(getNextEnchantmentID(), - new ResourceLocation(SteamAdvantage.MODID+":"+"rapid_reload"), + new ResourceLocation(SteamAdvantage.LEGACY_MODID+":"+"rapid_reload"), rapid_reload); Enchantment.REGISTRY.register(getNextEnchantmentID(), - new ResourceLocation(SteamAdvantage.MODID+":"+"recoil"), + new ResourceLocation(SteamAdvantage.LEGACY_MODID+":"+"recoil"), recoil); diff --git a/src/main/java/zone/moddev/mc/basesteam/init/Entities.java b/src/main/java/zone/moddev/mc/basesteam/init/Entities.java new file mode 100644 index 0000000..cb27ab1 --- /dev/null +++ b/src/main/java/zone/moddev/mc/basesteam/init/Entities.java @@ -0,0 +1,47 @@ +package zone.moddev.mc.basesteam.init; + +import net.minecraftforge.fml.client.registry.ClientRegistry; +import net.minecraft.tileentity.TileEntity; +import zone.moddev.mc.basepower.compat.LegacyIdentity; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.blocks.DrillBitTileEntity; +import zone.moddev.mc.basesteam.machines.*; + +public class Entities { + + private static boolean initDone = false; + public static void init(){ + if(initDone) return; + + Blocks.init(); + + + registerTile(CoalBoilerTileEntity.class, "steam_boiler_coal"); + registerTile(ElectricBoilerTileEntity.class, "steam_boiler_electric"); + registerTile(GeothermalBoilerTileEntity.class, "steam_boiler_geothermal"); + registerTile(SteamTankTileEntity.class, "steam_tank"); + registerTile(BlastFurnaceTileEntity.class, "steam_furnace"); + registerTile(RockCrusherTileEntity.class, "steam_crusher"); + registerTile(SteamDrillTileEntity.class, "steam_drill"); + registerTile(SteamElevatorTileEntity.class, "steam_elevator"); + registerTile(DrillBitTileEntity.class, "drillbit"); + registerTile(SteamStillTileEntity.class, "steam_still"); + registerTile(SteamPumpTileEntity.class, "steam_pump"); + registerTile(OilBoilerTileEntity.class, "steam_boiler_oil"); + + + initDone = true; + } + + private static void registerTile(Class type, String name) { + LegacyIdentity.registerTileEntity(type, SteamAdvantage.MODID + "." + name, + SteamAdvantage.LEGACY_MODID + "." + name); + } + + @SideOnly(Side.CLIENT) + public static void registerRenderers(){ + ClientRegistry.bindTileEntitySpecialRenderer(DrillBitTileEntity.class, new zone.moddev.mc.basesteam.graphics.DrillBitRenderer()); + } +} diff --git a/src/main/java/zone/moddev/mc/steamadvantage/init/GUI.java b/src/main/java/zone/moddev/mc/basesteam/init/GUI.java similarity index 86% rename from src/main/java/zone/moddev/mc/steamadvantage/init/GUI.java rename to src/main/java/zone/moddev/mc/basesteam/init/GUI.java index d064e07..7699ef5 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/init/GUI.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/GUI.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.steamadvantage.init; +package zone.moddev.mc.basesteam.init; -import zone.moddev.mc.poweradvantage.PowerAdvantage; -import zone.moddev.mc.poweradvantage.registry.MachineGUIRegistry; -import zone.moddev.mc.steamadvantage.gui.*; +import zone.moddev.mc.basepower.PowerAdvantage; +import zone.moddev.mc.basepower.registry.MachineGUIRegistry; +import zone.moddev.mc.basesteam.gui.*; public class GUI { diff --git a/src/main/java/zone/moddev/mc/steamadvantage/init/Items.java b/src/main/java/zone/moddev/mc/basesteam/init/Items.java similarity index 90% rename from src/main/java/zone/moddev/mc/steamadvantage/init/Items.java rename to src/main/java/zone/moddev/mc/basesteam/init/Items.java index f3a59b8..e09c6c7 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/init/Items.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/Items.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.steamadvantage.init; +package zone.moddev.mc.basesteam.init; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.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; @@ -50,7 +50,7 @@ private static Item addItem(String unlocalizedName, Item i,String... oreDictName private static Item addItem(String unlocalizedName, Item i){ i.setUnlocalizedName(SteamAdvantage.MODID+"."+unlocalizedName); GameRegistry.registerItem(i, unlocalizedName); - i.setCreativeTab(zone.moddev.mc.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/zone/moddev/mc/steamadvantage/init/Power.java b/src/main/java/zone/moddev/mc/basesteam/init/Power.java similarity index 90% rename from src/main/java/zone/moddev/mc/steamadvantage/init/Power.java rename to src/main/java/zone/moddev/mc/basesteam/init/Power.java index 94fcab3..1febd10 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/init/Power.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/Power.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.init; +package zone.moddev.mc.basesteam.init; import net.minecraft.util.DamageSource; import cyano.poweradvantage.api.ConduitType; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/init/Recipes.java b/src/main/java/zone/moddev/mc/basesteam/init/Recipes.java similarity index 92% rename from src/main/java/zone/moddev/mc/steamadvantage/init/Recipes.java rename to src/main/java/zone/moddev/mc/basesteam/init/Recipes.java index c7fa8eb..36cc402 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/init/Recipes.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/Recipes.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.init; +package zone.moddev.mc.basesteam.init; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -6,10 +6,10 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -import zone.moddev.mc.poweradvantage.PowerAdvantage; -import zone.moddev.mc.poweradvantage.RecipeMode; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.compat.BaseMetalsCompat; +import zone.moddev.mc.basepower.PowerAdvantage; +import zone.moddev.mc.basepower.RecipeMode; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.compat.BaseMetalsCompat; public class Recipes { @@ -32,7 +32,7 @@ public static void init(){ if(SteamAdvantage.MUSKET_ENABLE)GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.blackpowder_musket,1),"ssf"," w",'f',net.minecraft.init.Items.FLINT_AND_STEEL,'s',"ingotSteel",'w',"plankWood")); } else if(recipeMode == RecipeMode.APOCALYPTIC){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.steam_governor,1)," t ","srs","btb",'t',"sprocket",'s',"rod",'r',"rod",'b',"ingotBrass")); - BaseMetalsCompat.addCrusherRecipe(Items.steam_governor, new ItemStack(zone.moddev.mc.poweradvantage.init.Items.sprocket,2)); + BaseMetalsCompat.addCrusherRecipe(Items.steam_governor, new ItemStack(zone.moddev.mc.basepower.init.Items.sprocket,2)); BaseMetalsCompat.addCrusherRecipe(Blocks.steam_crusher, new ItemStack(Items.steam_governor,2)); BaseMetalsCompat.addCrusherRecipe(Blocks.steam_furnace, new ItemStack(Items.steam_governor,2)); @@ -64,7 +64,7 @@ public static void init(){ GameRegistry.addRecipe(new ShapedOreRecipe(Items.blackpowder_cartridge,"L","g","p",'L',"nuggetLead",'g',net.minecraft.init.Items.GUNPOWDER,'p',net.minecraft.init.Items.PAPER)); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Blocks.steam_track),Blocks.steam_pipe, zone.moddev.mc.poweradvantage.init.Blocks.steel_frame)); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Blocks.steam_track),Blocks.steam_pipe, zone.moddev.mc.basepower.init.Blocks.steel_frame)); GameRegistry.addRecipe(new ShapedOreRecipe(Blocks.steam_switch," L ","pfp",'L',net.minecraft.init.Blocks.LEVER,'p',"conduitSteam",'f',"frameSteel")); GameRegistry.addRecipe(steamMachineRecipe(Blocks.steam_boiler_oil,net.minecraft.init.Blocks.FURNACE, net.minecraft.init.Items.BUCKET)); diff --git a/src/main/java/zone/moddev/mc/steamadvantage/init/TreasureChests.java b/src/main/java/zone/moddev/mc/basesteam/init/TreasureChests.java similarity index 82% rename from src/main/java/zone/moddev/mc/steamadvantage/init/TreasureChests.java rename to src/main/java/zone/moddev/mc/basesteam/init/TreasureChests.java index 2ba2ed0..5b0eac2 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/init/TreasureChests.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/TreasureChests.java @@ -1,14 +1,16 @@ -package zone.moddev.mc.steamadvantage.init; +package zone.moddev.mc.basesteam.init; -import zone.moddev.mc.steamadvantage.SteamAdvantage; +import zone.moddev.mc.basesteam.SteamAdvantage; import net.minecraftforge.fml.common.FMLLog; import org.apache.logging.log4j.Level; import java.io.IOException; import java.nio.charset.Charset; import java.nio.file.Files; +import java.nio.file.FileAlreadyExistsException; import java.nio.file.Path; import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; import java.util.Arrays; public class TreasureChests { @@ -28,10 +30,12 @@ public static void init(Path configFolder){ initDone = true; } - private static void writeLootFile(Path file, String content){ + static void writeLootFile(Path file, String content){ try { Files.createDirectories(file.getParent()); - Files.write(file, Arrays.asList(content), Charset.forName("UTF-8")); + Files.write(file, Arrays.asList(content), Charset.forName("UTF-8"), StandardOpenOption.CREATE_NEW); + } catch (FileAlreadyExistsException expected) { + // Existing administrator or migrated loot rules take precedence over defaults. } catch (IOException e) { FMLLog.log(Level.ERROR,e,"Error writing additional-loot-table files"); } @@ -41,7 +45,7 @@ private static void writeLootFile(Path file, String content){ private static final String LOOT_POOL = "{\n" + " \"pools\": [\n" + " {\n" + - " \"__comment\":\"25% chance of a Steam Advantage item\",\n" + + " \"__comment\":\"25% chance of a baseSteam item\",\n" + " \"rolls\": 1,\n" + " \"entries\": [\n" + " {\n" + @@ -50,7 +54,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 +68,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 +82,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,12 +96,12 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"steamadvantage:musket\",\n" + + " \"name\": \"basesteam:musket\",\n" + " \"weight\": 18\n" + " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"steamadvantage:musket\",\n" + + " \"name\": \"basesteam:musket\",\n" + " \"weight\": 2,\n" + " \"functions\": [\n" + " {\n" + diff --git a/src/main/java/zone/moddev/mc/steamadvantage/init/Villages.java b/src/main/java/zone/moddev/mc/basesteam/init/Villages.java similarity index 98% rename from src/main/java/zone/moddev/mc/steamadvantage/init/Villages.java rename to src/main/java/zone/moddev/mc/basesteam/init/Villages.java index 125cba6..4c3f387 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/init/Villages.java +++ b/src/main/java/zone/moddev/mc/basesteam/init/Villages.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.init; +package zone.moddev.mc.basesteam.init; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.item.Item; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/items/MusketItem.java b/src/main/java/zone/moddev/mc/basesteam/items/MusketItem.java similarity index 97% rename from src/main/java/zone/moddev/mc/steamadvantage/items/MusketItem.java rename to src/main/java/zone/moddev/mc/basesteam/items/MusketItem.java index 33ce39c..971402d 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/items/MusketItem.java +++ b/src/main/java/zone/moddev/mc/basesteam/items/MusketItem.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.steamadvantage.items; +package zone.moddev.mc.basesteam.items; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playBigSoundAtPosition; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtPosition; +import static zone.moddev.mc.basesteam.util.SoundHelper.playBigSoundAtPosition; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtPosition; import java.util.List; import java.util.Optional; @@ -9,9 +9,9 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.init.Enchantments; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.init.Enchantments; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.BlockTNT; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -463,7 +463,7 @@ public void addInformation(ItemStack stack, EntityPlayer player, List li 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/zone/moddev/mc/steamadvantage/machines/BlastFurnaceBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/BlastFurnaceBlock.java similarity index 92% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/BlastFurnaceBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/BlastFurnaceBlock.java index 8174812..b7bfac1 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/BlastFurnaceBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/BlastFurnaceBlock.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/BlastFurnaceTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/BlastFurnaceTileEntity.java similarity index 97% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/BlastFurnaceTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/BlastFurnaceTileEntity.java index 505b929..6fe2b1a 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/BlastFurnaceTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/BlastFurnaceTileEntity.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; @@ -15,7 +15,7 @@ import java.util.Arrays; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtTileEntity; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtTileEntity; public class BlastFurnaceTileEntity extends cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine{ @@ -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/zone/moddev/mc/steamadvantage/machines/CoalBoilerBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/CoalBoilerBlock.java similarity index 89% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/CoalBoilerBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/CoalBoilerBlock.java index d1e52e9..2aa00b1 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/CoalBoilerBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/CoalBoilerBlock.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.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, zone.moddev.mc.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/zone/moddev/mc/steamadvantage/machines/CoalBoilerTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/CoalBoilerTileEntity.java similarity index 97% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/CoalBoilerTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/CoalBoilerTileEntity.java index 7bf9e48..4cffaef 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/CoalBoilerTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/CoalBoilerTileEntity.java @@ -1,12 +1,12 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtTileEntity; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtTileEntity; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerRequest; import cyano.poweradvantage.api.fluid.FluidRequest; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; @@ -39,7 +39,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(FluidContainerRegistry.BUCKET_VOLUME * 4) { @Override protected void onContentsChanged() { diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/ElectricBoilerBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/ElectricBoilerBlock.java similarity index 90% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/ElectricBoilerBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/ElectricBoilerBlock.java index 0e6ae0f..59dec8b 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/ElectricBoilerBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/ElectricBoilerBlock.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.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, zone.moddev.mc.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/zone/moddev/mc/steamadvantage/machines/ElectricBoilerTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/ElectricBoilerTileEntity.java similarity index 97% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/ElectricBoilerTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/ElectricBoilerTileEntity.java index 2a9250e..d855445 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/ElectricBoilerTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/ElectricBoilerTileEntity.java @@ -1,12 +1,12 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtTileEntity; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtTileEntity; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerRequest; import cyano.poweradvantage.api.fluid.FluidRequest; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; @@ -40,7 +40,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(FluidContainerRegistry.BUCKET_VOLUME * 2) { @Override protected void onContentsChanged() { diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/GeothermalBoilerBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/GeothermalBoilerBlock.java similarity index 88% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/GeothermalBoilerBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/GeothermalBoilerBlock.java index cc97548..e5d6a22 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/GeothermalBoilerBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/GeothermalBoilerBlock.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.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, zone.moddev.mc.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/zone/moddev/mc/steamadvantage/machines/GeothermalBoilerTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/GeothermalBoilerTileEntity.java similarity index 97% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/GeothermalBoilerTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/GeothermalBoilerTileEntity.java index e9ec689..769b87b 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/GeothermalBoilerTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/GeothermalBoilerTileEntity.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerRequest; import cyano.poweradvantage.api.fluid.FluidRequest; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -16,7 +16,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fluids.*; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtTileEntity; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtTileEntity; @SuppressWarnings("deprecation") public class GeothermalBoilerTileEntity extends cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine implements IFluidHandler{ @@ -37,7 +37,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(FluidContainerRegistry.BUCKET_VOLUME * 2) { @Override protected void onContentsChanged() { diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/OilBoilerBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerBlock.java similarity index 88% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/OilBoilerBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerBlock.java index eb191d2..6d9aa70 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/OilBoilerBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerBlock.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.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, zone.moddev.mc.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/zone/moddev/mc/steamadvantage/machines/OilBoilerTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerTileEntity.java similarity index 94% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/OilBoilerTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerTileEntity.java index cee8678..ae5b760 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/OilBoilerTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/OilBoilerTileEntity.java @@ -1,13 +1,13 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.FluidCategoryRegistry; import cyano.poweradvantage.api.PowerRequest; import cyano.poweradvantage.api.fluid.FluidRequest; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.poweradvantage.registry.FuelRegistry; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basepower.registry.FuelRegistry; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtTileEntity; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtTileEntity; @SuppressWarnings("deprecation") public class OilBoilerTileEntity extends cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine implements IFluidHandler{ @@ -37,7 +37,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(FluidContainerRegistry.BUCKET_VOLUME * 4); fuelTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 4); } @@ -150,11 +150,18 @@ private static Float getBurnTimePerBucketFor(Fluid fluid){ } private static Float getConfiguredBurnTimePerBucketFor(Fluid fluid) { - if(SteamAdvantage.fluidBurnValues.containsKey(fluid.getName())){ - return SteamAdvantage.fluidBurnValues.get(fluid.getName()); + String name = fluid.getName(); + if(SteamAdvantage.fluidBurnValues.containsKey(name)){ + return SteamAdvantage.fluidBurnValues.get(name); } - if(SteamAdvantage.fluidBurnValues.containsKey(fluid.getUnlocalizedName())){ - return SteamAdvantage.fluidBurnValues.get(fluid.getUnlocalizedName()); + String unlocalizedName = fluid.getUnlocalizedName(); + if(SteamAdvantage.fluidBurnValues.containsKey(unlocalizedName)){ + return SteamAdvantage.fluidBurnValues.get(unlocalizedName); + } + // Copied configurations may still use the two original Power-owned oil keys. + if(("crude_oil".equals(name) || "refined_oil".equals(name)) + && ("fluid.basepower." + name).equals(unlocalizedName)){ + return SteamAdvantage.fluidBurnValues.get("fluid.poweradvantage." + name); } return null; } diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/RockCrusherBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/RockCrusherBlock.java similarity index 92% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/RockCrusherBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/RockCrusherBlock.java index e6b4737..f9068c5 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/RockCrusherBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/RockCrusherBlock.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/RockCrusherTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/RockCrusherTileEntity.java similarity index 95% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/RockCrusherTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/RockCrusherTileEntity.java index 5a4acd1..2989d63 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/RockCrusherTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/RockCrusherTileEntity.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import net.minecraft.entity.player.EntityPlayer; @@ -6,11 +6,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import zone.moddev.mc.steamadvantage.compat.BaseMetalsCompat; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.compat.BaseMetalsCompat; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.util.SoundCategory; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtTileEntity; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtTileEntity; public class RockCrusherTileEntity extends cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine{ @@ -25,7 +25,7 @@ public class RockCrusherTileEntity extends cyano.poweradvantage.api.simple.TileE private int progress = 0; public RockCrusherTileEntity() { - super(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/zone/moddev/mc/steamadvantage/machines/SteamDrillBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamDrillBlock.java similarity index 97% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/SteamDrillBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamDrillBlock.java index addb4d9..259ee58 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamDrillBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamDrillBlock.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.*; import cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.steamadvantage.blocks.DrillBitTileEntity; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basesteam.blocks.DrillBitTileEntity; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyDirection; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamDrillTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamDrillTileEntity.java similarity index 95% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/SteamDrillTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamDrillTileEntity.java index f947c7c..c21b134 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamDrillTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamDrillTileEntity.java @@ -1,11 +1,11 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; -import zone.moddev.mc.poweradvantage.util.InventoryWrapper; -import zone.moddev.mc.steamadvantage.blocks.DrillBitTileEntity; -import zone.moddev.mc.steamadvantage.compat.BaseMetalsCompat; -import zone.moddev.mc.steamadvantage.init.Blocks; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.util.InventoryWrapper; +import zone.moddev.mc.basesteam.blocks.DrillBitTileEntity; +import zone.moddev.mc.basesteam.compat.BaseMetalsCompat; +import zone.moddev.mc.basesteam.init.Blocks; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -23,8 +23,8 @@ import java.util.Arrays; import java.util.List; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtPosition; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtTileEntity; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtPosition; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtTileEntity; @SuppressWarnings("deprecation") public class SteamDrillTileEntity extends cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine{ @@ -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), zone.moddev.mc.poweradvantage.init.Blocks.steel_frame.getDefaultState()); + w.setBlockState(currentPos.offset(drillDirection), zone.moddev.mc.basepower.init.Blocks.steel_frame.getDefaultState()); w.setBlockState(currentPos, Blocks.steam_pipe.getDefaultState(), 2); return true; } @@ -283,7 +283,7 @@ public void onDataFieldUpdate() { if(hitEnd){ boolean moved = followTrack(); if(moved){ - zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry.getInstance() + zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry.getInstance() .conduitBlockRemovedEvent(powerAdvantageWorld(), powerAdvantageWorld().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() == zone.moddev.mc.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/zone/moddev/mc/steamadvantage/machines/SteamElevatorBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamElevatorBlock.java similarity index 92% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/SteamElevatorBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamElevatorBlock.java index 8222ee6..89412b2 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamElevatorBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamElevatorBlock.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamElevatorTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamElevatorTileEntity.java similarity index 93% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/SteamElevatorTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamElevatorTileEntity.java index 28e5fd1..db55823 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamElevatorTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamElevatorTileEntity.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; -import zone.moddev.mc.steamadvantage.init.Blocks; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Blocks; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; @@ -14,7 +14,7 @@ import java.util.List; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtTileEntity; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtTileEntity; public class SteamElevatorTileEntity extends cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine{ @@ -29,7 +29,7 @@ public class SteamElevatorTileEntity extends cyano.poweradvantage.api.simple.Til private boolean up = false; public SteamElevatorTileEntity() { - super(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/zone/moddev/mc/steamadvantage/machines/SteamPumpBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamPumpBlock.java similarity index 88% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/SteamPumpBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamPumpBlock.java index 400ffa2..658446c 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamPumpBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamPumpBlock.java @@ -1,11 +1,11 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.steamadvantage.init.Blocks; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basesteam.init.Blocks; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.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, zone.moddev.mc.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/zone/moddev/mc/steamadvantage/machines/SteamPumpTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamPumpTileEntity.java similarity index 95% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/SteamPumpTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamPumpTileEntity.java index e075c16..7f62be8 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamPumpTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamPumpTileEntity.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerRequest; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; @@ -23,7 +23,7 @@ import java.util.HashSet; import java.util.Set; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtTileEntity; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtTileEntity; @SuppressWarnings("deprecation") public class SteamPumpTileEntity extends cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine implements IFluidHandler{ @@ -42,7 +42,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(FluidContainerRegistry.BUCKET_VOLUME); } @@ -59,12 +59,12 @@ public void tickUpdate(boolean isServerWorld) { World w = getWorld(); boolean success = false; BlockPos target = this.getPos().down(); - while(target.getY() > 0 && w.getBlockState(target).getBlock() == zone.moddev.mc.steamadvantage.init.Blocks.pump_pipe_steam){ + while(target.getY() > 0 && w.getBlockState(target).getBlock() == zone.moddev.mc.basesteam.init.Blocks.pump_pipe_steam){ target = target.down(); } if(target.getY() > 0 && w.isAirBlock(target) && getEnergy(Power.steam_power) >= ENERGY_COST_PIPE){ // place pipe - w.setBlockState(target, zone.moddev.mc.steamadvantage.init.Blocks.pump_pipe_steam.getDefaultState()); + w.setBlockState(target, zone.moddev.mc.basesteam.init.Blocks.pump_pipe_steam.getDefaultState()); this.subtractEnergy(ENERGY_COST_PIPE, Power.steam_power); timeUntilNextPump = PIPE_INTERVAL; playSoundAtTileEntity( SoundEvents.BLOCK_STONE_PLACE, SoundCategory.BLOCKS, 0.3f, 1f, this); @@ -209,7 +209,7 @@ public void powerUpdate(){ FluidStack fluid = getTank().getFluid(); ConduitType type = Fluids.fluidToConduitType(fluid.getFluid()); float availableAmount = getTank().getFluidAmount(); - float delta = ConduitRegistry.transmitPowerToConsumers(availableAmount, zone.moddev.mc.poweradvantage.init.Fluids.fluidConduit_general, type, + float delta = ConduitRegistry.transmitPowerToConsumers(availableAmount, zone.moddev.mc.basepower.init.Fluids.fluidConduit_general, type, PowerRequest.LAST_PRIORITY, getWorld(), getPos(), this); if(delta > 0){ getTank().drain(Math.max((int)delta,1),true); // no free energy! @@ -336,7 +336,7 @@ public boolean isPowerSink(ConduitType type){ @Override public boolean isPowerSource(ConduitType type){ - return zone.moddev.mc.poweradvantage.init.Fluids.isFluidType(type); + return zone.moddev.mc.basepower.init.Fluids.isFluidType(type); } /** * Adds "energy" as a fluid to the FluidTank returned by getTank(). This implementation ignores diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamStillBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamStillBlock.java similarity index 88% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/SteamStillBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamStillBlock.java index 6601254..fc9c11a 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamStillBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamStillBlock.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.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, zone.moddev.mc.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/zone/moddev/mc/steamadvantage/machines/SteamStillTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamStillTileEntity.java similarity index 95% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/SteamStillTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamStillTileEntity.java index ad8fea4..be93c0b 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamStillTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamStillTileEntity.java @@ -1,13 +1,13 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerRequest; import cyano.poweradvantage.api.fluid.FluidRequest; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; -import zone.moddev.mc.poweradvantage.registry.still.recipe.DistillationRecipe; -import zone.moddev.mc.poweradvantage.registry.still.recipe.DistillationRecipeRegistry; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basepower.registry.still.recipe.DistillationRecipe; +import zone.moddev.mc.basepower.registry.still.recipe.DistillationRecipeRegistry; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; @@ -16,7 +16,7 @@ import net.minecraft.util.SoundCategory; import net.minecraftforge.fluids.*; -import static zone.moddev.mc.steamadvantage.util.SoundHelper.playSoundAtTileEntity; +import static zone.moddev.mc.basesteam.util.SoundHelper.playSoundAtTileEntity; @SuppressWarnings("deprecation") public class SteamStillTileEntity extends cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine implements IFluidHandler{ @@ -30,7 +30,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(FluidContainerRegistry.BUCKET_VOLUME ); inputTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME); } @@ -83,7 +83,7 @@ public void powerUpdate(){ if(this.getOutputTank().getFluidAmount() > 0){ ConduitType type = Fluids.fluidToConduitType(getOutputTank().getFluid().getFluid()); float availableAmount = getOutputTank().getFluidAmount(); - float delta = ConduitRegistry.transmitPowerToConsumers(availableAmount, zone.moddev.mc.poweradvantage.init.Fluids.fluidConduit_general, type, + float delta = ConduitRegistry.transmitPowerToConsumers(availableAmount, zone.moddev.mc.basepower.init.Fluids.fluidConduit_general, type, this.getMinimumSinkPriority(), getWorld(), getPos(), this); if(delta > 0){ getOutputTank().drain(Math.max((int)delta,1),true); // no free energy! diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamTankBlock.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamTankBlock.java similarity index 92% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/SteamTankBlock.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamTankBlock.java index 467b86b..eaa1d5b 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamTankBlock.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamTankBlock.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.steamadvantage.init.Power; +import zone.moddev.mc.basesteam.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamTankTileEntity.java b/src/main/java/zone/moddev/mc/basesteam/machines/SteamTankTileEntity.java similarity index 95% rename from src/main/java/zone/moddev/mc/steamadvantage/machines/SteamTankTileEntity.java rename to src/main/java/zone/moddev/mc/basesteam/machines/SteamTankTileEntity.java index 9690b14..6dce0aa 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/machines/SteamTankTileEntity.java +++ b/src/main/java/zone/moddev/mc/basesteam/machines/SteamTankTileEntity.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerRequest; -import zone.moddev.mc.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.FluidContainerRegistry; @@ -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, FluidContainerRegistry.BUCKET_VOLUME * 10, "tile.steamadvantage.steam_tank.name"); + super(Power.steam_power, FluidContainerRegistry.BUCKET_VOLUME * 10, "tile.basesteam.steam_tank.name"); } private boolean redstone = true; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/util/SoundHelper.java b/src/main/java/zone/moddev/mc/basesteam/util/SoundHelper.java similarity index 98% rename from src/main/java/zone/moddev/mc/steamadvantage/util/SoundHelper.java rename to src/main/java/zone/moddev/mc/basesteam/util/SoundHelper.java index 54a6f95..197c0c8 100644 --- a/src/main/java/zone/moddev/mc/steamadvantage/util/SoundHelper.java +++ b/src/main/java/zone/moddev/mc/basesteam/util/SoundHelper.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.util; +package zone.moddev.mc.basesteam.util; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/zone/moddev/mc/steamadvantage/init/Entities.java b/src/main/java/zone/moddev/mc/steamadvantage/init/Entities.java deleted file mode 100644 index 2c6989a..0000000 --- a/src/main/java/zone/moddev/mc/steamadvantage/init/Entities.java +++ /dev/null @@ -1,41 +0,0 @@ -package zone.moddev.mc.steamadvantage.init; - -import net.minecraftforge.fml.client.registry.ClientRegistry; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import zone.moddev.mc.steamadvantage.SteamAdvantage; -import zone.moddev.mc.steamadvantage.blocks.DrillBitTileEntity; -import zone.moddev.mc.steamadvantage.machines.*; - -public class Entities { - - private static boolean initDone = false; - public static void init(){ - if(initDone) return; - - Blocks.init(); - - - GameRegistry.registerTileEntity(CoalBoilerTileEntity.class, SteamAdvantage.MODID+"."+"steam_boiler_coal"); - GameRegistry.registerTileEntity(ElectricBoilerTileEntity.class, SteamAdvantage.MODID+"."+"steam_boiler_electric"); - GameRegistry.registerTileEntity(GeothermalBoilerTileEntity.class, SteamAdvantage.MODID+"."+"steam_boiler_geothermal"); - GameRegistry.registerTileEntity(SteamTankTileEntity.class, SteamAdvantage.MODID+"."+"steam_tank"); - GameRegistry.registerTileEntity(BlastFurnaceTileEntity.class, SteamAdvantage.MODID+"."+"steam_furnace"); - GameRegistry.registerTileEntity(RockCrusherTileEntity.class, SteamAdvantage.MODID+"."+"steam_crusher"); - GameRegistry.registerTileEntity(SteamDrillTileEntity.class, SteamAdvantage.MODID+"."+"steam_drill"); - GameRegistry.registerTileEntity(SteamElevatorTileEntity.class, SteamAdvantage.MODID+"."+"steam_elevator"); - GameRegistry.registerTileEntity(DrillBitTileEntity.class, SteamAdvantage.MODID+"."+"drillbit"); - GameRegistry.registerTileEntity(SteamStillTileEntity.class, SteamAdvantage.MODID+"."+"steam_still"); - GameRegistry.registerTileEntity(SteamPumpTileEntity.class, SteamAdvantage.MODID+"."+"steam_pump"); - GameRegistry.registerTileEntity(OilBoilerTileEntity.class, SteamAdvantage.MODID+"."+"steam_boiler_oil"); - - - initDone = true; - } - - @SideOnly(Side.CLIENT) - public static void registerRenderers(){ - ClientRegistry.bindTileEntitySpecialRenderer(DrillBitTileEntity.class, new zone.moddev.mc.steamadvantage.graphics.DrillBitRenderer()); - } -} 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..8242260 --- /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.electricadvantage.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/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/mcmod.info b/src/main/resources/mcmod.info index cbfac9f..3f4e06d 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,8 +1,8 @@ [ { - "modid": "steamadvantage", - "name": "Steam Advantage", - "description": "Add-on mod to Power Advantage that adds steam-powered machines to Minecraft", + "modid": "basesteam", + "name": "baseSteam", + "description": "Add-on mod to basePower that adds steam-powered machines to Minecraft", "version": "${version}", "mcversion": "${mcversion}", "url": "", diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 29757d6..0d72e98 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack":{ "pack_format":2, - "description":"Steam Advantage" + "description":"baseSteam" } -} \ No newline at end of file +} diff --git a/src/test/java/zone/moddev/mc/steamadvantage/gui/GUIHelperTest.java b/src/test/java/zone/moddev/mc/basesteam/gui/GUIHelperTest.java similarity index 96% rename from src/test/java/zone/moddev/mc/steamadvantage/gui/GUIHelperTest.java rename to src/test/java/zone/moddev/mc/basesteam/gui/GUIHelperTest.java index 6e4be43..207fd50 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/gui/GUIHelperTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/gui/GUIHelperTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.gui; +package zone.moddev.mc.basesteam.gui; import java.lang.reflect.Method; import org.junit.Test; diff --git a/src/test/java/zone/moddev/mc/basesteam/init/SteamAssetIdentityTest.java b/src/test/java/zone/moddev/mc/basesteam/init/SteamAssetIdentityTest.java new file mode 100644 index 0000000..bc28a41 --- /dev/null +++ b/src/test/java/zone/moddev/mc/basesteam/init/SteamAssetIdentityTest.java @@ -0,0 +1,91 @@ +package zone.moddev.mc.basesteam.init; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import org.junit.Test; +import zone.moddev.mc.basesteam.SteamAdvantage; + +import static org.junit.Assert.*; + +public class SteamAssetIdentityTest { + @Test public void everyRenamedModelAndTextureReferenceResolves() throws Exception { + Path root = Paths.get("src/main/resources/assets/basesteam"); + assertTrue(Files.isDirectory(root)); + assertFalse("The old active asset tree must not remain", Files.exists(root.resolveSibling("steamadvantage"))); + List documents; + try (Stream walk = Files.walk(root)) { + documents = walk.filter(path -> path.toString().endsWith(".json")).collect(Collectors.toList()); + } + assertTrue("Check the real asset set, not an empty directory", documents.size() > 50); + for (Path file : documents) { + String source = new String(Files.readAllBytes(file), StandardCharsets.UTF_8); + assertFalse(file.toString(), source.contains("steamadvantage:")); + assertFalse(file.toString(), source.contains("poweradvantage:")); + checkReferences(new JsonParser().parse(source), file.toString()); + } + } + + @Test public void sourceMetadataAndEnglishNamesUseTheNewIdentity() throws Exception { + JsonObject mod = new JsonParser().parse(new String(Files.readAllBytes(Paths.get("src/main/resources/mcmod.info")), + StandardCharsets.UTF_8)).getAsJsonArray().get(0).getAsJsonObject(); + assertEquals("basesteam", mod.get("modid").getAsString()); + assertEquals("baseSteam", mod.get("name").getAsString()); + assertEquals(SteamAdvantage.MODID, mod.get("modid").getAsString()); + String english = new String(Files.readAllBytes(Paths.get("src/main/resources/assets/basesteam/lang/en_US.lang")), + StandardCharsets.UTF_8); + assertTrue(english.contains("tile.basesteam.steam_drill.name=")); + assertTrue(english.contains("item.basesteam.musket.name=")); + assertFalse(english.contains("tile.steamadvantage.")); + assertFalse(english.contains("item.steamadvantage.")); + } + + private void checkReferences(JsonElement value, String source) throws Exception { + if (value.isJsonObject()) { + for (Map.Entry entry : value.getAsJsonObject().entrySet()) { + JsonElement child = entry.getValue(); + if (entry.getKey().equals("textures") && child.isJsonObject()) { + for (Map.Entry texture : child.getAsJsonObject().entrySet()) { + if (texture.getValue().isJsonPrimitive()) { + requireAsset(texture.getValue().getAsString(), "textures/", ".png", source); + } + } + } else if ((entry.getKey().equals("parent") || entry.getKey().equals("model")) + && child.isJsonPrimitive()) { + String reference = child.getAsString(); + int separator = reference.indexOf(':'); + if (separator > 0) { + String name = reference.substring(separator + 1); + if (!name.startsWith("block/") && !name.startsWith("item/")) { + reference = reference.substring(0, separator + 1) + "block/" + name; + } + requireAsset(reference, "models/", ".json", source); + } + } + checkReferences(child, source); + } + } else if (value.isJsonArray()) { + for (JsonElement child : value.getAsJsonArray()) checkReferences(child, source); + } + } + + private void requireAsset(String reference, String folder, String suffix, String source) throws Exception { + int separator = reference.indexOf(':'); + if (separator < 0) return; + String namespace = reference.substring(0, separator); + if (!namespace.equals("basesteam") && !namespace.equals("basepower")) return; + String path = "/assets/" + namespace + "/" + folder + reference.substring(separator + 1) + suffix; + try (InputStream asset = getClass().getResourceAsStream(path)) { + assertNotNull(source + " references missing " + path, asset); + } + } +} diff --git a/src/test/java/zone/moddev/mc/basesteam/init/SteamConfigurationMigrationTest.java b/src/test/java/zone/moddev/mc/basesteam/init/SteamConfigurationMigrationTest.java new file mode 100644 index 0000000..0d817c9 --- /dev/null +++ b/src/test/java/zone/moddev/mc/basesteam/init/SteamConfigurationMigrationTest.java @@ -0,0 +1,105 @@ +package zone.moddev.mc.basesteam.init; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import net.minecraft.init.Bootstrap; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import zone.moddev.mc.basepower.compat.LegacyIdentity; + +import static org.junit.Assert.*; + +public class SteamConfigurationMigrationTest { + @Rule public final TemporaryFolder temporary = new TemporaryFolder(); + @BeforeClass public static void bootstrap() { Bootstrap.register(); } + + @Test public void configImportPreservesOptionsAndNeverOverwritesEitherAuthority() throws Exception { + Path config = temporary.newFolder().toPath(); + Path old = config.resolve("steamadvantage.cfg"), current = config.resolve("basesteam.cfg"); + byte[] original = "options {\r\n I:musket_reload_time=173\r\n S:fluid_fuel_values=oil=8123;customfuel=9001\r\n}" + .getBytes(StandardCharsets.UTF_8); + Files.write(old, original); + assertEquals(current.toFile(), LegacyIdentity.migrateConfiguration(current.toFile(), "steamadvantage")); + assertArrayEquals(original, Files.readAllBytes(old)); + assertArrayEquals(original, Files.readAllBytes(current)); + byte[] edited = "current administrator configuration".getBytes(StandardCharsets.UTF_8); + Files.write(current, edited); + LegacyIdentity.migrateConfiguration(current.toFile(), "steamadvantage"); + assertArrayEquals(edited, Files.readAllBytes(current)); + assertArrayEquals(original, Files.readAllBytes(old)); + } + + @Test public void originalLootImportsCustomNumbersAndRetainsExternalAndEnchantmentIdentities() throws Exception { + Path config = temporary.newFolder().toPath(); + Path old = config.resolve("additional-loot-tables/steamadvantage/chests/custom.json"); + Files.createDirectories(old.getParent()); + byte[] original; + try (InputStream fixture = getClass().getResourceAsStream("/migration/steamadvantage-loot.json")) { + assertNotNull(fixture); + Files.copy(fixture, old); + original = Files.readAllBytes(old); + } + LegacyIdentity.migrateAdditionalLootTables(config, "steamadvantage", "basesteam"); + Path current = config.resolve("additional-loot-tables/basesteam/chests/custom.json"); + JsonObject document = new JsonParser().parse(new String(Files.readAllBytes(current), StandardCharsets.UTF_8)) + .getAsJsonObject(); + JsonObject pool = document.getAsJsonArray("pools").get(0).getAsJsonObject(); + assertEquals(3, pool.get("rolls").getAsInt()); + JsonArray entries = pool.getAsJsonArray("entries"); + assertEquals("basesteam:musket", entries.get(0).getAsJsonObject().get("name").getAsString()); + assertEquals(19, entries.get(0).getAsJsonObject().get("weight").getAsInt()); + assertEquals("steamadvantage:rapid_reload", entries.get(0).getAsJsonObject() + .getAsJsonArray("functions").get(0).getAsJsonObject().getAsJsonArray("enchantments").get(0).getAsString()); + assertEquals("basesteam:steam_governor", entries.get(1).getAsJsonObject().get("name").getAsString()); + assertEquals("basemetals:steel_ingot", entries.get(2).getAsJsonObject().get("name").getAsString()); + assertEquals("orespawn:external_fixture", entries.get(3).getAsJsonObject().get("name").getAsString()); + assertEquals("othersteamadvantage:musket", entries.get(4).getAsJsonObject().get("name").getAsString()); + assertFalse("Only the canonical loot file remains active", Files.exists(old)); + assertArrayEquals(original, Files.readAllBytes(old.resolveSibling("custom.json.before-basesteam"))); + byte[] imported = Files.readAllBytes(current); + LegacyIdentity.migrateAdditionalLootTables(config, "steamadvantage", "basesteam"); + assertArrayEquals(imported, Files.readAllBytes(current)); + } + + @Test public void existingCanonicalLootWinsAndDefaultWriterDoesNotClobberIt() throws Exception { + Path config = temporary.newFolder().toPath(); + Path old = config.resolve("additional-loot-tables/steamadvantage/chests/simple_dungeon.json"); + Path current = config.resolve("additional-loot-tables/basesteam/chests/simple_dungeon.json"); + Files.createDirectories(old.getParent()); Files.createDirectories(current.getParent()); + byte[] legacy = "{\"name\":\"steamadvantage:musket\",\"weight\":29}".getBytes(StandardCharsets.UTF_8); + byte[] authoritative = "{\"pools\":[],\"custom\":47}".getBytes(StandardCharsets.UTF_8); + Files.write(old, legacy); Files.write(current, authoritative); + LegacyIdentity.migrateAdditionalLootTables(config, "steamadvantage", "basesteam"); + TreasureChests.writeLootFile(current, "must not replace administrator rules"); + assertArrayEquals(authoritative, Files.readAllBytes(current)); + assertFalse(Files.exists(old)); + assertArrayEquals(legacy, Files.readAllBytes(old.resolveSibling("simple_dungeon.json.before-basesteam"))); + } + + @Test public void absentLootDefaultsAreWrittenOnlyOnce() throws Exception { + Path file = temporary.newFolder().toPath().resolve("basesteam/chests/new.json"); + TreasureChests.writeLootFile(file, "{\"name\":\"basesteam:steam_pipe\"}"); + byte[] first = Files.readAllBytes(file); + TreasureChests.writeLootFile(file, "different defaults"); + assertArrayEquals(first, Files.readAllBytes(file)); + } + + @Test public void invalidLegacyJsonStopsBeforeDisablingTheOriginalFile() throws Exception { + Path config = temporary.newFolder().toPath(); + Path old = config.resolve("additional-loot-tables/steamadvantage/chests/broken.json"); + Files.createDirectories(old.getParent()); + byte[] original = "{\"pools\":".getBytes(StandardCharsets.UTF_8); + Files.write(old, original); + assertThrows(IllegalStateException.class, + () -> LegacyIdentity.migrateAdditionalLootTables(config, "steamadvantage", "basesteam")); + assertArrayEquals(original, Files.readAllBytes(old)); + assertFalse(Files.exists(config.resolve("additional-loot-tables/basesteam/chests/broken.json"))); + } +} diff --git a/src/test/java/zone/moddev/mc/basesteam/init/SteamIdentityMigrationTest.java b/src/test/java/zone/moddev/mc/basesteam/init/SteamIdentityMigrationTest.java new file mode 100644 index 0000000..576a1e7 --- /dev/null +++ b/src/test/java/zone/moddev/mc/basesteam/init/SteamIdentityMigrationTest.java @@ -0,0 +1,179 @@ +package zone.moddev.mc.basesteam.init; + +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.ListMultimap; +import java.io.InputStream; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.init.Bootstrap; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.common.util.Constants.NBT; +import org.junit.BeforeClass; +import org.junit.Test; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.LdcInsnNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; +import zone.moddev.mc.basesteam.SteamAdvantage; +import zone.moddev.mc.basesteam.blocks.DrillBitTileEntity; +import zone.moddev.mc.basesteam.items.MusketItem; +import zone.moddev.mc.basesteam.machines.*; + +import static org.junit.Assert.*; + +public class SteamIdentityMigrationTest { + @BeforeClass public static void bootstrap() { Bootstrap.register(); } + + @Test public void allTwelveOriginalTileIdsLoadAndResaveCanonically() throws Exception { + Map> tiles = new LinkedHashMap<>(); + tiles.put("steam_boiler_coal", CoalBoilerTileEntity.class); + tiles.put("steam_boiler_electric", ElectricBoilerTileEntity.class); + tiles.put("steam_boiler_geothermal", GeothermalBoilerTileEntity.class); + tiles.put("steam_tank", SteamTankTileEntity.class); + tiles.put("steam_furnace", BlastFurnaceTileEntity.class); + tiles.put("steam_crusher", RockCrusherTileEntity.class); + tiles.put("steam_drill", SteamDrillTileEntity.class); + tiles.put("steam_elevator", SteamElevatorTileEntity.class); + tiles.put("drillbit", DrillBitTileEntity.class); + tiles.put("steam_still", SteamStillTileEntity.class); + tiles.put("steam_pump", SteamPumpTileEntity.class); + tiles.put("steam_boiler_oil", OilBoilerTileEntity.class); + + Method register = Entities.class.getDeclaredMethod("registerTile", Class.class, String.class); + register.setAccessible(true); + Set productionNames = new HashSet<>(); + ClassNode registration = bytecode(Entities.class); + for (MethodNode method : registration.methods) { + if (!method.name.equals("init")) continue; + for (AbstractInsnNode instruction : method.instructions.toArray()) { + if (instruction instanceof LdcInsnNode && ((LdcInsnNode) instruction).cst instanceof String) { + productionNames.add((String) ((LdcInsnNode) instruction).cst); + } + } + } + assertEquals("The test matrix must cover the actual production tile names", tiles.keySet(), productionNames); + + for (Map.Entry> entry : tiles.entrySet()) { + String name = entry.getKey(); + register.invoke(null, entry.getValue(), name); + NBTTagCompound original = new NBTTagCompound(); + original.setString("id", "steamadvantage." + name); + original.setInteger("x", 19); original.setInteger("y", 65); original.setInteger("z", -7); + TileEntity loaded = TileEntity.create(null, original); + assertNotNull(name, loaded); + assertEquals(name, entry.getValue(), loaded.getClass()); + NBTTagCompound saved = loaded.writeToNBT(new NBTTagCompound()); + assertEquals(name, "basesteam." + name, saved.getString("id")); + assertEquals(19, saved.getInteger("x")); + assertEquals(65, saved.getInteger("y")); + assertEquals(-7, saved.getInteger("z")); + assertEquals("Original fixture must retain its historical identity", "steamadvantage." + name, + original.getString("id")); + assertEquals(entry.getValue(), TileEntity.create(null, saved).getClass()); + } + } + + @Test public void renamedModHandlesOriginalNamespaceWithoutAnActiveLegacyContainer() { + ListMultimap missing = ArrayListMultimap.create(); + FMLMissingMappingsEvent.MissingMapping block = mapping(GameRegistry.Type.BLOCK, "steamadvantage", "unknown_block"); + FMLMissingMappingsEvent.MissingMapping item = mapping(GameRegistry.Type.ITEM, "steamadvantage", "unknown_item"); + FMLMissingMappingsEvent.MissingMapping foreign = mapping(GameRegistry.Type.ITEM, "basemetals", "unknown_item"); + missing.put("steamadvantage", block); missing.put("steamadvantage", item); missing.put("basemetals", foreign); + new SteamAdvantage().missingMappings(new FMLMissingMappingsEvent(missing)); + assertEquals(FMLMissingMappingsEvent.Action.FAIL, block.getAction()); + assertEquals(FMLMissingMappingsEvent.Action.FAIL, item.getAction()); + assertEquals(FMLMissingMappingsEvent.Action.DEFAULT, foreign.getAction()); + } + + @Test public void enchantmentKeysAndNumericStackRoundTripRemainLegacyCompatible() { + int[] expectedIds = new int[4]; + boolean firstInitialization = Enchantments.high_explosive == null; + if (firstInitialization) { + int found = 0; + for (int id = 0; id < 255 && found < expectedIds.length; id++) { + if (Enchantment.REGISTRY.getObjectById(id) == null) expectedIds[found++] = id; + } + assertEquals("Four IDs must be available in the historical range", 4, found); + } + Enchantments.init(); + Enchantment[] values = {Enchantments.high_explosive, Enchantments.powderless, + Enchantments.rapid_reload, Enchantments.recoil}; + String[] names = {"high_explosive", "powderless", "rapid_reload", "recoil"}; + for (int i = 0; i < values.length; i++) { + assertSame(values[i], Enchantment.REGISTRY.getObject(new ResourceLocation("steamadvantage", names[i]))); + assertNull("Do not register a second numeric identity", Enchantment.REGISTRY.getObject( + new ResourceLocation("basesteam", names[i]))); + if (firstInitialization) assertEquals("Keep the original first-free allocation order", + expectedIds[i], Enchantment.getEnchantmentID(values[i])); + ItemStack stack = new ItemStack(net.minecraft.init.Items.STICK); + stack.addEnchantment(values[i], 1); + NBTTagCompound saved = stack.writeToNBT(new NBTTagCompound()); + NBTTagList savedEnchantments = saved.getCompoundTag("tag").getTagList("ench", NBT.TAG_COMPOUND); + assertEquals("One actual enchantment entry must be saved", 1, savedEnchantments.tagCount()); + NBTTagCompound savedEnchantment = savedEnchantments.getCompoundTagAt(0); + assertTrue("1.10 persists the ID as a numeric short", savedEnchantment.hasKey("id", NBT.TAG_SHORT)); + int savedId = savedEnchantment.getShort("id"); + assertEquals("Saved ID must resolve to the retained legacy registration", + Enchantment.getEnchantmentID(values[i]), savedId); + assertSame(values[i], Enchantment.REGISTRY.getObjectById(savedId)); + ItemStack restored = ItemStack.loadItemStackFromNBT(saved); + assertNotNull(restored); + assertEquals(1, net.minecraft.enchantment.EnchantmentHelper.getEnchantmentLevel(values[i], restored)); + NBTTagCompound resaved = restored.writeToNBT(new NBTTagCompound()); + assertEquals("Loading and saving must retain the numeric enchantment ID", savedId, + resaved.getCompoundTag("tag").getTagList("ench", NBT.TAG_COMPOUND).getCompoundTagAt(0).getShort("id")); + } + int[] ids = Arrays.stream(values).mapToInt(Enchantment::getEnchantmentID).toArray(); + Enchantments.init(); + assertArrayEquals("Repeated initialization must not allocate aliases", ids, + Arrays.stream(values).mapToInt(Enchantment::getEnchantmentID).toArray()); + } + + @Test public void musketRemainsHitscanAndThereAreNoProjectileRegistryAliases() throws Exception { + boolean rayTrace = false, directDamage = false; + for (Class type : new Class[]{MusketItem.class, Entities.class}) { + for (MethodNode method : bytecode(type).methods) { + for (AbstractInsnNode instruction : method.instructions.toArray()) { + if (!(instruction instanceof MethodInsnNode)) continue; + MethodInsnNode call = (MethodInsnNode) instruction; + assertFalse("This 1.10 baseline has no persistent custom entities to alias", + call.owner.equals("net/minecraftforge/fml/common/registry/EntityRegistry")); + if (method.name.equals("fire")) { + rayTrace |= call.name.equals("rayTraceBlocksAndEntities"); + directDamage |= call.name.equals("attackEntityFrom"); + assertFalse(call.name.equals("spawnEntityInWorld")); + } + } + } + } + assertTrue(rayTrace); + assertTrue(directDamage); + } + + private static FMLMissingMappingsEvent.MissingMapping mapping(GameRegistry.Type type, String mod, String name) { + return new FMLMissingMappingsEvent.MissingMapping(type, new ResourceLocation(mod, name), 30000); + } + + private static ClassNode bytecode(Class type) throws Exception { + ClassNode node = new ClassNode(); + try (InputStream input = type.getResourceAsStream("/" + Type.getInternalName(type) + ".class")) { + assertNotNull(input); + new ClassReader(input).accept(node, 0); + } + return node; + } +} diff --git a/src/test/java/zone/moddev/mc/steamadvantage/items/MusketLoadedCartridgeTest.java b/src/test/java/zone/moddev/mc/basesteam/items/MusketLoadedCartridgeTest.java similarity index 96% rename from src/test/java/zone/moddev/mc/steamadvantage/items/MusketLoadedCartridgeTest.java rename to src/test/java/zone/moddev/mc/basesteam/items/MusketLoadedCartridgeTest.java index 64107b9..affa219 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/items/MusketLoadedCartridgeTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/items/MusketLoadedCartridgeTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.items; +package zone.moddev.mc.basesteam.items; import java.io.InputStream; import java.util.ArrayList; @@ -56,7 +56,7 @@ public class MusketLoadedCartridgeTest { private static String guardResult(ItemStack stack, boolean hasAmmo, EnumHand hand) throws Exception { ClassNode node = new ClassNode(); try (InputStream input = MusketLoadedCartridgeTest.class.getResourceAsStream( - "/zone/moddev/mc/steamadvantage/items/MusketItem.class")) { + "/zone/moddev/mc/basesteam/items/MusketItem.class")) { assertNotNull(input); new ClassReader(input).accept(node, 0); } @@ -101,7 +101,7 @@ private static String guardResult(ItemStack stack, boolean hasAmmo, EnumHand han } else if (instruction instanceof MethodInsnNode) { MethodInsnNode call = (MethodInsnNode) instruction; if (call.name.equals("isNotLoaded")) { - assertEquals("zone/moddev/mc/steamadvantage/items/MusketItem", call.owner); + assertEquals("zone/moddev/mc/basesteam/items/MusketItem", call.owner); operands.add(MusketItem.isNotLoaded((ItemStack) pop(operands))); } else if (call.name.equals("hasAmmo")) { assertSame(stack, pop(operands)); diff --git a/src/test/java/zone/moddev/mc/steamadvantage/items/MusketTargetingContractTest.java b/src/test/java/zone/moddev/mc/basesteam/items/MusketTargetingContractTest.java similarity index 97% rename from src/test/java/zone/moddev/mc/steamadvantage/items/MusketTargetingContractTest.java rename to src/test/java/zone/moddev/mc/basesteam/items/MusketTargetingContractTest.java index 5a12921..826742e 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/items/MusketTargetingContractTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/items/MusketTargetingContractTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.items; +package zone.moddev.mc.basesteam.items; import java.io.InputStream; import java.util.Optional; @@ -53,7 +53,7 @@ public class MusketTargetingContractTest { @Test public void targetingUsesThePortableSixCoordinateAabbConstructor() throws Exception { ClassNode node = new ClassNode(); - try (InputStream input = getClass().getResourceAsStream("/zone/moddev/mc/steamadvantage/items/MusketItem.class")) { + try (InputStream input = getClass().getResourceAsStream("/zone/moddev/mc/basesteam/items/MusketItem.class")) { assertNotNull(input); new ClassReader(input).accept(node, 0); } @@ -79,7 +79,7 @@ public class MusketTargetingContractTest { @Test public void targetingUsesLoadedServerEntitiesAndTerrainBeforeEntitySelection() throws Exception { ClassNode node = new ClassNode(); - try (InputStream input = getClass().getResourceAsStream("/zone/moddev/mc/steamadvantage/items/MusketItem.class")) { + try (InputStream input = getClass().getResourceAsStream("/zone/moddev/mc/basesteam/items/MusketItem.class")) { assertNotNull(input); new ClassReader(input).accept(node, 0); } diff --git a/src/test/java/zone/moddev/mc/steamadvantage/machines/CoalBoilerFillPersistenceTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/CoalBoilerFillPersistenceTest.java similarity index 98% rename from src/test/java/zone/moddev/mc/steamadvantage/machines/CoalBoilerFillPersistenceTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/CoalBoilerFillPersistenceTest.java index 47a0696..8b5e95c 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/machines/CoalBoilerFillPersistenceTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/CoalBoilerFillPersistenceTest.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import static org.junit.Assert.*; import cyano.poweradvantage.api.ConduitType; -import zone.moddev.mc.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.init.Fluids; import net.minecraft.init.Bootstrap; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.block.state.IBlockState; diff --git a/src/test/java/zone/moddev/mc/basesteam/machines/OilBoilerLegacyFuelOverrideTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/OilBoilerLegacyFuelOverrideTest.java new file mode 100644 index 0000000..f579f44 --- /dev/null +++ b/src/test/java/zone/moddev/mc/basesteam/machines/OilBoilerLegacyFuelOverrideTest.java @@ -0,0 +1,150 @@ +package zone.moddev.mc.basesteam.machines; + +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; +import net.minecraft.init.Bootstrap; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.Fluid; +import org.junit.After; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import zone.moddev.mc.basesteam.SteamAdvantage; + +import static org.junit.Assert.*; + +public class OilBoilerLegacyFuelOverrideTest { + private static final String[] OILS = {"crude_oil", "refined_oil"}; + private Map previousOverrides; + + @BeforeClass public static void bootstrap() { Bootstrap.register(); } + + @Before public void preserveConfiguration() { + previousOverrides = new HashMap<>(SteamAdvantage.fluidBurnValues); + SteamAdvantage.fluidBurnValues.clear(); + } + + @After public void restoreConfiguration() { + SteamAdvantage.fluidBurnValues.clear(); + SteamAdvantage.fluidBurnValues.putAll(previousOverrides); + } + + @Test public void legacyOilKeysReachTheBurnCalculationAndCache() throws Exception { + for (String name : OILS) { + Fluid fluid = fluid(name, "basepower"); + float configured = name.equals("crude_oil") ? 8123f : 29123f; + SteamAdvantage.fluidBurnValues.put("fluid.poweradvantage." + name, configured); + assertEquals(configured, lookup(fluid), 0f); + assertEquals(configured, burnTime(fluid), 0.01f); + assertEquals("The cached value must retain the override", configured, burnTime(fluid), 0.01f); + } + } + + @Test public void rawNamesWinOverCurrentAndLegacyKeys() throws Exception { + for (String name : OILS) { + Fluid fluid = fluid(name, "basepower"); + SteamAdvantage.fluidBurnValues.put(name, 12000f); + SteamAdvantage.fluidBurnValues.put("fluid.basepower." + name, 9000f); + SteamAdvantage.fluidBurnValues.put("fluid.poweradvantage." + name, 6000f); + assertEquals(12000f, lookup(fluid), 0f); + assertEquals(12000f, burnTime(fluid), 0.01f); + } + } + + @Test public void currentKeysWinOverLegacyKeys() throws Exception { + for (String name : OILS) { + Fluid fluid = fluid(name, "basepower"); + SteamAdvantage.fluidBurnValues.put("fluid.basepower." + name, 9000f); + SteamAdvantage.fluidBurnValues.put("fluid.poweradvantage." + name, 6000f); + assertEquals(9000f, lookup(fluid), 0f); + assertEquals(9000f, burnTime(fluid), 0.01f); + } + } + + @Test public void legacyZeroDisablesBothOilsInsteadOfFallingThrough() throws Exception { + for (String name : OILS) { + Fluid fluid = fluid(name, "basepower"); + SteamAdvantage.fluidBurnValues.put("fluid.poweradvantage." + name, 0f); + assertEquals(0f, lookup(fluid), 0f); + assertEquals(0f, burnTime(fluid), 0f); + assertEquals(0f, burnTime(fluid), 0f); + } + } + + @Test public void rawZeroStillWinsOverBothPositiveAliases() throws Exception { + for (String name : OILS) { + Fluid fluid = fluid(name, "basepower"); + SteamAdvantage.fluidBurnValues.put(name, 0f); + SteamAdvantage.fluidBurnValues.put("fluid.basepower." + name, 9000f); + SteamAdvantage.fluidBurnValues.put("fluid.poweradvantage." + name, 6000f); + assertEquals(0f, burnTime(fluid), 0f); + } + } + + @Test public void currentZeroStillWinsOverPositiveLegacyAliases() throws Exception { + for (String name : OILS) { + Fluid fluid = fluid(name, "basepower"); + SteamAdvantage.fluidBurnValues.put("fluid.basepower." + name, 0f); + SteamAdvantage.fluidBurnValues.put("fluid.poweradvantage." + name, 6000f); + assertEquals(0f, burnTime(fluid), 0f); + } + } + + @Test public void foreignFluidsWithTheSameRawNamesDoNotAcquirePowerOverrides() throws Exception { + for (String name : OILS) { + Fluid foreign = fluid(name, "othermod"); + SteamAdvantage.fluidBurnValues.put("fluid.poweradvantage." + name, 6000f); + assertNull(lookup(foreign)); + SteamAdvantage.fluidBurnValues.put("fluid.othermod." + name, 7000f); + assertEquals(7000f, lookup(foreign), 0f); + } + } + + @Test public void unrelatedFluidsAndNearMatchesDoNotAcquireLegacyAliases() throws Exception { + SteamAdvantage.fluidBurnValues.put("fluid.poweradvantage.lubricant", 6000f); + SteamAdvantage.fluidBurnValues.put("fluid.poweradvantage.mineralogy_crude_oil", 7000f); + SteamAdvantage.fluidBurnValues.put("fluid.poweradvantage.crude_oil", 8000f); + assertNull(lookup(fluid("lubricant", "basepower"))); + assertNull(lookup(fluid("mineralogy_crude_oil", "basepower"))); + assertNull(lookup(fluid("crude_oil", "otherbasepower"))); + } + + @Test public void absentOverridesLeaveTheExistingCrudeOilDefault() throws Exception { + Fluid fluid = fluid("crude_oil", "basepower"); + assertNull(lookup(fluid)); + assertEquals(5000f, burnTime(fluid), 0f); + } + + @Test public void lookupDoesNotRewriteConfigurationEntries() throws Exception { + SteamAdvantage.fluidBurnValues.put("fluid.poweradvantage.crude_oil", 8123f); + SteamAdvantage.fluidBurnValues.put("fluid.poweradvantage.refined_oil", 29123f); + SteamAdvantage.fluidBurnValues.put("fluid.basemetals.custom_fuel", 9001f); + Map original = new HashMap<>(SteamAdvantage.fluidBurnValues); + for (String name : OILS) burnTime(fluid(name, "basepower")); + assertEquals(original, SteamAdvantage.fluidBurnValues); + assertFalse(SteamAdvantage.fluidBurnValues.containsKey("fluid.basepower.crude_oil")); + assertFalse(SteamAdvantage.fluidBurnValues.containsKey("fluid.basepower.refined_oil")); + } + + private static Fluid fluid(String name, String owner) { + ResourceLocation texture = new ResourceLocation(owner, "blocks/" + name); + Fluid fluid = new Fluid(name, texture, texture); + fluid.setUnlocalizedName(owner + "." + name); + return fluid; + } + + private static Float lookup(Fluid fluid) throws Exception { + return invoke("getConfiguredBurnTimePerBucketFor", fluid); + } + + private static Float burnTime(Fluid fluid) throws Exception { + return invoke("getBurnTimePerBucketFor", fluid); + } + + private static Float invoke(String name, Fluid fluid) throws Exception { + Method method = OilBoilerTileEntity.class.getDeclaredMethod(name, Fluid.class); + method.setAccessible(true); + return (Float) method.invoke(null, fluid); + } +} diff --git a/src/test/java/zone/moddev/mc/steamadvantage/machines/RockCrusherComparatorTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/RockCrusherComparatorTest.java similarity index 95% rename from src/test/java/zone/moddev/mc/steamadvantage/machines/RockCrusherComparatorTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/RockCrusherComparatorTest.java index 543ea9f..5cca036 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/machines/RockCrusherComparatorTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/RockCrusherComparatorTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import static org.junit.Assert.assertEquals; import net.minecraft.item.ItemStack; diff --git a/src/test/java/zone/moddev/mc/steamadvantage/machines/RockCrusherReloadRedstoneTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/RockCrusherReloadRedstoneTest.java similarity index 98% rename from src/test/java/zone/moddev/mc/steamadvantage/machines/RockCrusherReloadRedstoneTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/RockCrusherReloadRedstoneTest.java index f81d2e9..4c63f90 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/machines/RockCrusherReloadRedstoneTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/RockCrusherReloadRedstoneTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import static org.junit.Assert.*; diff --git a/src/test/java/zone/moddev/mc/steamadvantage/machines/SteamDrillPersistenceTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/SteamDrillPersistenceTest.java similarity index 96% rename from src/test/java/zone/moddev/mc/steamadvantage/machines/SteamDrillPersistenceTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/SteamDrillPersistenceTest.java index 31f9763..4a6bf89 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/machines/SteamDrillPersistenceTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/SteamDrillPersistenceTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import net.minecraft.nbt.NBTTagCompound; import org.junit.Test; diff --git a/src/test/java/zone/moddev/mc/steamadvantage/machines/SteamOperationalPumpSourceTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/SteamOperationalPumpSourceTest.java similarity index 98% rename from src/test/java/zone/moddev/mc/steamadvantage/machines/SteamOperationalPumpSourceTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/SteamOperationalPumpSourceTest.java index d4fdd99..6b8e5ac 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/machines/SteamOperationalPumpSourceTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/SteamOperationalPumpSourceTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import java.io.InputStream; import java.lang.reflect.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( - "/zone/moddev/mc/steamadvantage/machines/SteamPumpTileEntity.class")) { + "/zone/moddev/mc/basesteam/machines/SteamPumpTileEntity.class")) { assertNotNull(input); new ClassReader(input).accept(node, 0); } diff --git a/src/test/java/zone/moddev/mc/steamadvantage/machines/SteamOperationalStillCapacityTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/SteamOperationalStillCapacityTest.java similarity index 94% rename from src/test/java/zone/moddev/mc/steamadvantage/machines/SteamOperationalStillCapacityTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/SteamOperationalStillCapacityTest.java index 920d363..997655e 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/machines/SteamOperationalStillCapacityTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/SteamOperationalStillCapacityTest.java @@ -1,12 +1,12 @@ -package zone.moddev.mc.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 zone.moddev.mc.poweradvantage.registry.still.recipe.DistillationRecipe; -import zone.moddev.mc.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/zone/moddev/mc/steamadvantage/machines/SteamRedstoneInitializationTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/SteamRedstoneInitializationTest.java similarity index 98% rename from src/test/java/zone/moddev/mc/steamadvantage/machines/SteamRedstoneInitializationTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/SteamRedstoneInitializationTest.java index 15d7955..47c25cd 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/machines/SteamRedstoneInitializationTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/SteamRedstoneInitializationTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import static org.junit.Assert.*; diff --git a/src/test/java/zone/moddev/mc/steamadvantage/machines/WaterBoilerFluidBoundaryTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/WaterBoilerFluidBoundaryTest.java similarity index 99% rename from src/test/java/zone/moddev/mc/steamadvantage/machines/WaterBoilerFluidBoundaryTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/WaterBoilerFluidBoundaryTest.java index 3c9ef7d..3fa5897 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/machines/WaterBoilerFluidBoundaryTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/WaterBoilerFluidBoundaryTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import static org.junit.Assert.*; import java.lang.reflect.Method; diff --git a/src/test/java/zone/moddev/mc/steamadvantage/machines/WaterBoilerTankNotificationTest.java b/src/test/java/zone/moddev/mc/basesteam/machines/WaterBoilerTankNotificationTest.java similarity index 98% rename from src/test/java/zone/moddev/mc/steamadvantage/machines/WaterBoilerTankNotificationTest.java rename to src/test/java/zone/moddev/mc/basesteam/machines/WaterBoilerTankNotificationTest.java index 0a24173..d4b0890 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/machines/WaterBoilerTankNotificationTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/machines/WaterBoilerTankNotificationTest.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.steamadvantage.machines; +package zone.moddev.mc.basesteam.machines; import static org.junit.Assert.*; import cyano.poweradvantage.api.IPowerMachine; -import zone.moddev.mc.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.init.Fluids; import java.util.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/test/java/zone/moddev/mc/steamadvantage/util/SoundHelperLoadedPlayersTest.java b/src/test/java/zone/moddev/mc/basesteam/util/SoundHelperLoadedPlayersTest.java similarity index 98% rename from src/test/java/zone/moddev/mc/steamadvantage/util/SoundHelperLoadedPlayersTest.java rename to src/test/java/zone/moddev/mc/basesteam/util/SoundHelperLoadedPlayersTest.java index dafac78..d754947 100644 --- a/src/test/java/zone/moddev/mc/steamadvantage/util/SoundHelperLoadedPlayersTest.java +++ b/src/test/java/zone/moddev/mc/basesteam/util/SoundHelperLoadedPlayersTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.steamadvantage.util; +package zone.moddev.mc.basesteam.util; import java.io.InputStream; import net.minecraft.util.math.AxisAlignedBB; @@ -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( - "/zone/moddev/mc/steamadvantage/util/SoundHelper.class")) { + "/zone/moddev/mc/basesteam/util/SoundHelper.class")) { assertNotNull("Compiled SoundHelper is available", input); new ClassReader(input).accept(node, 0); } diff --git a/src/test/resources/migration/steamadvantage-loot.json b/src/test/resources/migration/steamadvantage-loot.json new file mode 100644 index 0000000..428ceac --- /dev/null +++ b/src/test/resources/migration/steamadvantage-loot.json @@ -0,0 +1,13 @@ +{ + "pools": [{ + "rolls": 3, + "entries": [ + {"type": "item", "name": "steamadvantage:musket", "weight": 19, + "functions": [{"function": "minecraft:enchant_randomly", "enchantments": ["steamadvantage:rapid_reload"]}]}, + {"type": "item", "name": "steamadvantage:steam_governor", "weight": 7}, + {"type": "item", "name": "basemetals:steel_ingot", "weight": 11}, + {"type": "item", "name": "orespawn:external_fixture", "weight": 13}, + {"type": "item", "name": "othersteamadvantage:musket", "weight": 17} + ] + }] +} From 1afaa0c898204e16727a91e4637e0c82770f9ef4 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Mon, 2 Nov 2026 16:40:05 +0000 Subject: [PATCH 2/2] Pin the verified basePower source and portable test fixes --- .github/workflows/ci.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- README.md | 2 +- build.gradle | 2 +- docs/1.10-identity-migration.md | 2 +- gradle.properties | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 802f260..d64cc54 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: repository: MinecraftModDevelopmentMods/basePower - ref: 79fb16437615df98b6c6298fe8d98643a0e7140b + ref: 425af862ef5b41b61d3e1f7e665d1d691852ff4b path: .ci-dependencies/basePower - name: Install Java 8 toolchain diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b576087..0936253 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -37,7 +37,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: repository: MinecraftModDevelopmentMods/basePower - ref: 79fb16437615df98b6c6298fe8d98643a0e7140b + ref: 425af862ef5b41b61d3e1f7e665d1d691852ff4b path: .ci-dependencies/basePower - name: Install Java 8 toolchain diff --git a/README.md b/README.md index fe14e6e..eabff1a 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ gradlew.bat cleanEclipse verifyEclipseProductionClasspath The expected development artifact is `basePower-2.4.4.110021-deobf.jar`. Its SHA-256 is pinned in `gradle.properties`, the build audit, CI and CodeQL, together with source commit -`79fb16437615df98b6c6298fe8d98643a0e7140b` from the MMD basePower repository. +`425af862ef5b41b61d3e1f7e665d1d691852ff4b` from the MMD basePower repository. The build checks both pins. Do not substitute the old Power Advantage jar or a moving branch. basePower is required at compile time and runtime but is never bundled. OreSpawn is required transitively diff --git a/build.gradle b/build.gradle index f208f20..a87fd0a 100644 --- a/build.gradle +++ b/build.gradle @@ -313,7 +313,7 @@ tasks.register('verifyReleaseConfiguration') { } if (project.poweradvantage_version != '2.4.4.110021' || project.poweradvantage_source_repository != 'MinecraftModDevelopmentMods/basePower' - || project.poweradvantage_source_ref != '79fb16437615df98b6c6298fe8d98643a0e7140b' + || project.poweradvantage_source_ref != '425af862ef5b41b61d3e1f7e665d1d691852ff4b' || project.poweradvantage_deobf_sha256 != '2992F2CADC30D8F61A17216DF9AB02BDF8E8211BB8B494A6CCED70A3267F69FE') { throw new GradleException('Unexpected basePower compile dependency identity') } diff --git a/docs/1.10-identity-migration.md b/docs/1.10-identity-migration.md index aed4382..a399200 100644 --- a/docs/1.10-identity-migration.md +++ b/docs/1.10-identity-migration.md @@ -81,7 +81,7 @@ build, dependency, archive, checksum and Eclipse checks also pass with the exact The main jar remains SHA-256 `728E37A1A0551596D8167976A7022E31EF075A383640BB385470160DD9A8F07D`. -The build pins basePower source commit `79fb16437615df98b6c6298fe8d98643a0e7140b` and development-jar +The build pins basePower source commit `425af862ef5b41b61d3e1f7e665d1d691852ff4b` and development-jar SHA-256 `2992F2CADC30D8F61A17216DF9AB02BDF8E8211BB8B494A6CCED70A3267F69FE` in properties, the fixed audit, CI and CodeQL. Neither an old Power artifact nor a moving branch is an acceptable substitute. diff --git a/gradle.properties b/gradle.properties index 2853255..2085cdb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -36,7 +36,7 @@ cf_versions=1.10.2 poweradvantage_version=2.4.4.110021 poweradvantage_source_repository=MinecraftModDevelopmentMods/basePower # Keep the source commit and its reproducible development-jar checksum together. -poweradvantage_source_ref=79fb16437615df98b6c6298fe8d98643a0e7140b +poweradvantage_source_ref=425af862ef5b41b61d3e1f7e665d1d691852ff4b poweradvantage_deobf_sha256=2992F2CADC30D8F61A17216DF9AB02BDF8E8211BB8B494A6CCED70A3267F69FE orespawn_version=4.0.8.110021 orespawn_source_repository=MinecraftModDevelopmentMods/OreSpawn