From 8ae9e0b54d7c604f58b2e487f968512db1449907 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Mon, 2 Nov 2026 16:35:39 +0000 Subject: [PATCH 1/3] Continue Electric Advantage as baseElectric for 1.10.2 Migrate released Cyano blocks, machines, turbine links and saved contents to the new name. Preserve the legacy Power API and include the tested machine and restart fixes. 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 | 27 +- .github/workflows/codeql-analysis.yml | 15 +- .github/workflows/release-on-tag.yml | 11 +- CHANGELOG.txt | 12 +- README.md | 56 +++- build.gradle | 113 ++++--- docs/identity-migration.md | 132 +++++++++ gradle.properties | 23 +- settings.gradle | 2 +- .../Data.java | 6 +- .../ElectricAdvantage.java | 26 +- .../blocks/ElectricConduitBlock.java | 4 +- .../blocks/ElectricScaffoldBlock.java | 4 +- .../blocks/Ore.java | 2 +- .../blocks/PumpPipeBlock.java | 2 +- .../common/IRechargeableItem.java | 2 +- .../compat/BaseMetalsCompat.java | 4 +- .../entities/HydroturbineEntity.java | 6 +- .../graphics/HydroturbineRenderer.java | 6 +- .../graphics/LaserDrillRenderer.java | 6 +- .../graphics/LaserTurretRenderer.java | 6 +- .../gui/ArcFurnaceGUI.java | 8 +- .../gui/BatteryArrayGUI.java | 8 +- .../gui/ElectricDrillGUI.java | 8 +- .../gui/ElectricPumpGUI.java | 8 +- .../gui/ElectricStillGUI.java | 8 +- .../gui/FabricatorGUI.java | 8 +- .../gui/GUIHelper.java | 4 +- .../gui/GenericMachineGUI.java | 8 +- .../gui/GrowthChamberControllerGUI.java | 8 +- .../gui/GrowthChamberGUI.java | 8 +- .../gui/OvenGUI.java | 8 +- .../gui/PlasticRefineryGUI.java | 8 +- .../gui/PowerGeneratorGUI.java | 8 +- .../gui/RockCrusherGUI.java | 8 +- .../init/Blocks.java | 18 +- .../init/Enchantments.java | 4 +- .../init/Entities.java | 43 ++- .../init/GUI.java | 8 +- .../init/Items.java | 8 +- .../init/OreSpawnWorldGen.java | 29 +- .../init/Power.java | 2 +- .../init/Recipes.java | 10 +- .../init/TreasureChests.java | 27 +- .../init/Villages.java | 2 +- .../items/BatteryItem.java | 6 +- .../machines/ElectricBatteryArrayBlock.java | 2 +- .../ElectricBatteryArrayTileEntity.java | 8 +- .../machines/ElectricCrusherBlock.java | 2 +- .../machines/ElectricCrusherTileEntity.java | 8 +- .../machines/ElectricDrillBlock.java | 6 +- .../machines/ElectricDrillTileEntity.java | 14 +- .../machines/ElectricFabricatorBlock.java | 2 +- .../ElectricFabricatorTileEntity.java | 8 +- .../machines/ElectricFurnaceBlock.java | 2 +- .../machines/ElectricFurnaceTileEntity.java | 6 +- .../machines/ElectricGeneratorBlock.java | 4 +- .../machines/ElectricGeneratorTileEntity.java | 4 +- .../machines/ElectricMachineBlock.java | 4 +- .../machines/ElectricMachineTileEntity.java | 4 +- .../machines/ElectricOvenBlock.java | 2 +- .../machines/ElectricOvenTileEntity.java | 6 +- .../machines/ElectricPumpBlock.java | 14 +- .../machines/ElectricPumpTileEntity.java | 16 +- .../machines/ElectricStillBlock.java | 6 +- .../machines/ElectricStillTileEntity.java | 16 +- .../machines/GrowthChamberBlock.java | 4 +- .../GrowthChamberControllerBlock.java | 12 +- .../GrowthChamberControllerTileEntity.java | 8 +- .../machines/GrowthChamberTileEntity.java | 8 +- .../machines/HydroelectricGeneratorBlock.java | 2 +- .../HydroelectricGeneratorTileEntity.java | 6 +- .../machines/LEDBlock.java | 4 +- .../machines/LEDTileEntity.java | 6 +- .../machines/LaserTurretBlock.java | 2 +- .../machines/LaserTurretTileEntity.java | 8 +- .../machines/PhotovoltaicGeneratorBlock.java | 2 +- .../PhotovoltaicGeneratorTileEntity.java | 6 +- .../machines/PlasticRefineryBlock.java | 12 +- .../machines/PlasticRefineryTileEntity.java | 12 +- .../SteamPoweredElectricGeneratorBlock.java | 6 +- ...eamPoweredElectricGeneratorTileEntity.java | 8 +- .../util/crafting/ItemMatcher.java | 2 +- .../util/crafting/ItemRecord.java | 2 +- .../util/crafting/RecipeDeconstructor.java | 2 +- .../util/crafting/SerializedInventory.java | 2 +- .../util/farming/VirtualCrop.java | 4 +- .../blockstates/electric_battery_array.json | 12 + .../blockstates/electric_conduit.json | 70 +++++ .../blockstates/electric_crusher.json | 20 ++ .../blockstates/electric_drill.json | 16 + .../blockstates/electric_fabricator.json | 20 ++ .../blockstates/electric_furnace.json | 20 ++ .../blockstates/electric_oven.json | 20 ++ .../blockstates/electric_pcb_printer.json | 20 ++ .../blockstates/electric_pump.json | 20 ++ .../blockstates/electric_still.json | 20 ++ .../blockstates/electric_switch.json | 6 + .../blockstates/electric_track.json | 70 +++++ .../blockstates/geothermal_generator.json | 12 + .../blockstates/growth_chamber.json | 20 ++ .../growth_chamber_controller.json | 8 + .../blockstates/hydroelectric_generator.json | 12 + .../blockstates/laser_turret.json | 20 ++ .../blockstates/laser_turret_evil.json | 20 ++ .../baseelectric/blockstates/led_bar.json | 134 +++++++++ .../baseelectric/blockstates/li_ore.json | 5 + .../blockstates/photovoltaic_generator.json | 12 + .../blockstates/plastic_refinery.json | 20 ++ .../blockstates/pump_pipe_electric.json | 5 + .../blockstates/steam_powered_generator.json | 12 + .../baseelectric/blockstates/sulfur_ore.json | 5 + .../assets/baseelectric/lang/de_DE.lang | 54 ++++ .../assets/baseelectric/lang/en_AU.lang | 54 ++++ .../assets/baseelectric/lang/en_CA.lang | 54 ++++ .../assets/baseelectric/lang/en_EN.lang | 54 ++++ .../assets/baseelectric/lang/en_GB.lang | 54 ++++ .../assets/baseelectric/lang/en_PT.lang | 54 ++++ .../assets/baseelectric/lang/en_US.lang | 54 ++++ .../assets/baseelectric/lang/es_ES.lang | 55 ++++ .../assets/baseelectric/lang/es_MX.lang | 53 ++++ .../assets/baseelectric/lang/it_IT.lang | 53 ++++ .../assets/baseelectric/lang/ja_JP.lang | 54 ++++ .../assets/baseelectric/lang/ko_KO.lang | 52 ++++ .../assets/baseelectric/lang/pt_BR.lang | 54 ++++ .../assets/baseelectric/lang/zh_CN.lang | 55 ++++ .../models/block/electric_battery_array.json | 10 + .../models/block/electric_conduit_0.json | 7 + .../models/block/electric_conduit_densuw.json | 7 + .../models/block/electric_conduit_desuw.json | 7 + .../models/block/electric_conduit_dnu.json | 7 + .../models/block/electric_conduit_ensw.json | 7 + .../models/block/electric_conduit_n.json | 7 + .../models/block/electric_conduit_ns.json | 7 + .../models/block/electric_conduit_nsuw.json | 7 + .../models/block/electric_conduit_nsw.json | 7 + .../models/block/electric_conduit_nuw.json | 7 + .../models/block/electric_conduit_nw.json | 7 + .../models/block/electric_crusher_off.json | 10 + .../models/block/electric_crusher_on.json | 10 + .../block/electric_crusher_powered.json | 10 + .../models/block/electric_drill_base.json | 6 +- .../models/block/electric_drill_off.json | 7 + .../models/block/electric_drill_on.json | 7 + .../models/block/electric_fabricator_off.json | 10 + .../models/block/electric_fabricator_on.json | 10 + .../block/electric_fabricator_powered.json | 10 + .../models/block/electric_furnace_off.json | 10 + .../models/block/electric_furnace_on.json | 10 + .../block/electric_furnace_powered.json | 10 + .../models/block/electric_machine_base.json | 2 +- .../models/block/electric_oven_off.json | 10 + .../models/block/electric_oven_on.json | 10 + .../models/block/electric_oven_powered.json | 10 + .../block/electric_pcb_printer_off.json | 10 + .../models/block/electric_pcb_printer_on.json | 10 + .../block/electric_pcb_printer_powered.json | 10 + .../models/block/electric_pump_off.json | 10 + .../models/block/electric_pump_on.json | 10 + .../models/block/electric_pump_powered.json | 10 + .../models/block/electric_still_off.json | 10 + .../models/block/electric_still_on.json | 10 + .../models/block/electric_still_powered.json | 10 + .../models/block/electric_switch_off.json | 7 + .../models/block/electric_switch_on.json | 7 + .../models/block/electric_track_0.json | 8 +- .../models/block/electric_track_densuw.json | 8 +- .../models/block/electric_track_desuw.json | 8 +- .../models/block/electric_track_dnu.json | 8 +- .../models/block/electric_track_ensw.json | 8 +- .../models/block/electric_track_n.json | 8 +- .../models/block/electric_track_ns.json | 8 +- .../models/block/electric_track_nsuw.json | 8 +- .../models/block/electric_track_nsw.json | 8 +- .../models/block/electric_track_nuw.json | 8 +- .../models/block/electric_track_nw.json | 8 +- .../models/block/geothermal_generator.json | 10 + .../block/growth_chamber_controller.json | 10 + .../models/block/growth_chamber_off.json | 10 + .../models/block/growth_chamber_on.json | 10 + .../models/block/growth_chamber_powered.json | 10 + .../block/hydroelectric_generator_off.json | 10 + .../block/hydroelectric_generator_on.json | 10 + .../models/block/laser_turret.json | 10 +- .../models/block/led_bar_off_densuw.json | 7 + .../models/block/led_bar_off_desuw.json | 7 + .../models/block/led_bar_off_dnu.json | 7 + .../models/block/led_bar_off_ensw.json | 7 + .../models/block/led_bar_off_n.json | 7 + .../models/block/led_bar_off_ns.json | 7 + .../models/block/led_bar_off_nsuw.json | 7 + .../models/block/led_bar_off_nsw.json | 7 + .../models/block/led_bar_off_nuw.json | 7 + .../models/block/led_bar_off_nw.json | 7 + .../models/block/led_bar_on_densuw.json | 7 + .../models/block/led_bar_on_desuw.json | 7 + .../models/block/led_bar_on_dnu.json | 7 + .../models/block/led_bar_on_ensw.json | 7 + .../models/block/led_bar_on_n.json | 7 + .../models/block/led_bar_on_ns.json | 7 + .../models/block/led_bar_on_nsuw.json | 7 + .../models/block/led_bar_on_nsw.json | 7 + .../models/block/led_bar_on_nuw.json | 7 + .../models/block/led_bar_on_nw.json | 7 + .../models/block/li_ore.json | 12 +- .../models/block/photovoltaic_generator.json | 2 +- .../models/block/plastic_refinery_off.json | 10 + .../models/block/plastic_refinery_on.json | 10 + .../block/plastic_refinery_powered.json | 10 + .../block/steam_powered_generator_off.json | 10 + .../block/steam_powered_generator_on.json | 10 + .../models/block/sulfur_ore.json | 2 +- .../models/item/alkaline_battery.json | 6 + .../models/item/battery_base.json | 2 +- .../models/item/blank_circuit_board.json | 6 + .../models/item/control_circuit.json | 6 + .../models/item/electric_battery_array.json | 4 + .../models/item/electric_conduit.json | 4 + .../models/item/electric_crusher.json | 4 + .../models/item/electric_drill.json | 4 + .../models/item/electric_fabricator.json | 4 + .../models/item/electric_furnace.json | 4 + .../models/item/electric_oven.json | 4 + .../models/item/electric_pcb_printer.json | 4 + .../models/item/electric_pump.json | 4 + .../models/item/electric_still.json | 4 + .../models/item/electric_switch.json | 3 + .../models/item/electric_track.json | 4 + .../models/item/generic_item.json | 0 .../models/item/geothermal_generator.json | 4 + .../models/item/growth_chamber.json | 4 + .../item/growth_chamber_controller.json | 4 + .../models/item/hydroelectric_generator.json | 4 + .../models/item/integrated_circuit.json | 6 + .../models/item/laser_turret.json | 12 +- .../models/item/laser_turret_evil.json | 12 +- .../models/item/lead_acid_battery.json | 6 + .../baseelectric/models/item/led_bar.json | 4 + .../baseelectric/models/item/li_ingot.json | 6 + .../baseelectric/models/item/li_nugget.json | 6 + .../baseelectric/models/item/li_ore.json | 3 + .../baseelectric/models/item/li_powder.json | 6 + .../models/item/lithium_battery.json | 6 + .../models/item/nickel_hydride_battery.json | 6 + .../models/item/petrolplastic_ingot.json | 6 + .../models/item/photovoltaic_generator.json | 4 + .../models/item/plastic_refinery.json | 4 + .../assets/baseelectric/models/item/psu.json | 6 + .../models/item/pump_pipe_electric.json | 4 + .../models/item/silicon_ingot.json | 6 + .../baseelectric/models/item/silicon_mix.json | 6 + .../baseelectric/models/item/solder.json | 6 + .../baseelectric/models/item/solder_mix.json | 6 + .../models/item/steam_powered_generator.json | 4 + .../baseelectric/models/item/sulfur_ore.json | 3 + .../models/item/sulfur_powder.json | 6 + .../blocks/electric_battery_array.png | Bin .../textures/blocks/electric_conduit.png | Bin .../textures/blocks/electric_crusher_off.png | Bin .../textures/blocks/electric_crusher_on.png | Bin .../blocks/electric_crusher_on.png.mcmeta | 6 +- .../blocks/electric_crusher_powered.png | Bin .../textures/blocks/electric_drill_off.png | Bin .../textures/blocks/electric_drill_on.png | Bin .../blocks/electric_drill_powered.png | Bin .../blocks/electric_fabricator_off.png | Bin .../blocks/electric_fabricator_on.png | Bin .../blocks/electric_fabricator_on.png.mcmeta | 32 +- .../blocks/electric_fabricator_powered.png | Bin .../textures/blocks/electric_furnace_off.png | Bin .../textures/blocks/electric_furnace_on.png | Bin .../blocks/electric_furnace_powered.png | Bin .../textures/blocks/electric_oven_off.png | Bin .../textures/blocks/electric_oven_on.png | Bin .../textures/blocks/electric_oven_powered.png | Bin .../blocks/electric_pcb_printer_off.png | Bin .../blocks/electric_pcb_printer_on.png | Bin .../blocks/electric_pcb_printer_powered.png | Bin .../textures/blocks/electric_pump_off.png | Bin .../textures/blocks/electric_pump_on.png | Bin .../textures/blocks/electric_still_off.png | Bin .../textures/blocks/electric_still_on.png | Bin .../blocks/electric_still_on.png.mcmeta | 6 +- .../blocks/electric_still_powered.png | Bin .../textures/blocks/electric_switch_off.png | Bin .../textures/blocks/electric_switch_on.png | Bin .../blocks/growth_chamber_controller.png | Bin .../textures/blocks/growth_chamber_off.png | Bin .../textures/blocks/growth_chamber_on.png | Bin .../blocks/growth_chamber_powered.png | Bin .../blocks/hydroelectric_generator_off.png | Bin .../blocks/hydroelectric_generator_on.png | Bin .../hydroelectric_generator_on.png.mcmeta | 6 +- .../textures/blocks/laser_drill_optic.png | Bin .../textures/blocks/laser_drill_optic_on.png | Bin .../textures/blocks/laser_turret_base.png | Bin .../textures/blocks/led_bar_off.png | Bin .../textures/blocks/led_bar_on.png | Bin .../textures/blocks/lithium_ore.png | Bin .../textures/blocks/machine_back.png | Bin .../textures/blocks/machine_side.png | Bin .../textures/blocks/machine_top.png | Bin .../textures/blocks/photovoltaic_cell.png | Bin .../textures/blocks/plastic_refinery_off.png | Bin .../textures/blocks/plastic_refinery_on.png | Bin .../blocks/steam_powered_generator_off.png | Bin .../blocks/steam_powered_generator_on.png | Bin .../steam_powered_generator_on.png.mcmeta | 6 +- .../textures/blocks/sulfur_ore.png | Bin .../textures/entity/hydroturbine.png | Bin .../textures/entity/laser_turret.png | Bin .../textures/entity/windturbine.png | Bin .../container/electric_battery_array_gui.png | Bin .../gui/container/electric_crusher_gui.png | Bin .../gui/container/electric_drill_gui.png | Bin .../gui/container/electric_fabricator_gui.png | Bin .../gui/container/electric_furnace_gui.png | Bin .../gui/container/electric_generator_gui.png | Bin .../gui/container/electric_machine_gui.png | Bin .../gui/container/electric_oven_gui.png | Bin .../gui/container/electric_pump_gui.png | Bin .../gui/container/electric_still_gui.png | Bin .../container/geothermal_generator_gui.png | Bin .../growth_chamber_controller_gui.png | Bin .../gui/container/growth_chamber_gui.png | Bin .../gui/container/pcb_printer_gui.png | Bin .../gui/container/plastic_refinery_gui.png | Bin .../textures/items/alkaline_battery.png | Bin .../textures/items/blank_circuit_board.png | Bin .../textures/items/control_circuit.png | Bin .../textures/items/integrated_circuit.png | Bin .../textures/items/lead_acid_battery.png | Bin .../textures/items/li_ingot.png | Bin .../textures/items/li_nugget.png | Bin .../textures/items/li_powder.png | Bin .../textures/items/lithium_battery.png | Bin .../textures/items/nickel_hydride_battery.png | Bin .../textures/items/petrolplastic_ingot.png | Bin .../textures/items/psu.png | Bin .../textures/items/silicon_ingot.png | Bin .../textures/items/silicon_mix.png | Bin .../textures/items/solder.png | Bin .../textures/items/solder_mix.png | Bin .../textures/items/sulfur_powder.png | Bin .../textures/materials/laser_beam.png | Bin .../textures/materials/machine_case.png | Bin .../blockstates/electric_battery_array.json | 12 - .../blockstates/electric_conduit.json | 70 ----- .../blockstates/electric_crusher.json | 20 -- .../blockstates/electric_drill.json | 16 - .../blockstates/electric_fabricator.json | 20 -- .../blockstates/electric_furnace.json | 20 -- .../blockstates/electric_oven.json | 20 -- .../blockstates/electric_pcb_printer.json | 20 -- .../blockstates/electric_pump.json | 20 -- .../blockstates/electric_still.json | 20 -- .../blockstates/electric_switch.json | 6 - .../blockstates/electric_track.json | 70 ----- .../blockstates/geothermal_generator.json | 12 - .../blockstates/growth_chamber.json | 20 -- .../growth_chamber_controller.json | 8 - .../blockstates/hydroelectric_generator.json | 12 - .../blockstates/laser_turret.json | 20 -- .../blockstates/laser_turret_evil.json | 20 -- .../blockstates/led_bar.json | 134 --------- .../electricadvantage/blockstates/li_ore.json | 5 - .../blockstates/photovoltaic_generator.json | 12 - .../blockstates/plastic_refinery.json | 20 -- .../blockstates/pump_pipe_electric.json | 5 - .../blockstates/steam_powered_generator.json | 12 - .../blockstates/sulfur_ore.json | 5 - .../assets/electricadvantage/lang/de_DE.lang | 54 ---- .../assets/electricadvantage/lang/en_AU.lang | 54 ---- .../assets/electricadvantage/lang/en_CA.lang | 54 ---- .../assets/electricadvantage/lang/en_EN.lang | 54 ---- .../assets/electricadvantage/lang/en_GB.lang | 54 ---- .../assets/electricadvantage/lang/en_PT.lang | 54 ---- .../assets/electricadvantage/lang/en_US.lang | 54 ---- .../assets/electricadvantage/lang/es_ES.lang | 55 ---- .../assets/electricadvantage/lang/es_MX.lang | 53 ---- .../assets/electricadvantage/lang/it_IT.lang | 53 ---- .../assets/electricadvantage/lang/ja_JP.lang | 54 ---- .../assets/electricadvantage/lang/ko_KO.lang | 52 ---- .../assets/electricadvantage/lang/pt_BR.lang | 54 ---- .../assets/electricadvantage/lang/zh_CN.lang | 55 ---- .../models/block/electric_battery_array.json | 10 - .../models/block/electric_conduit_0.json | 7 - .../models/block/electric_conduit_densuw.json | 7 - .../models/block/electric_conduit_desuw.json | 7 - .../models/block/electric_conduit_dnu.json | 7 - .../models/block/electric_conduit_ensw.json | 7 - .../models/block/electric_conduit_n.json | 7 - .../models/block/electric_conduit_ns.json | 7 - .../models/block/electric_conduit_nsuw.json | 7 - .../models/block/electric_conduit_nsw.json | 7 - .../models/block/electric_conduit_nuw.json | 7 - .../models/block/electric_conduit_nw.json | 7 - .../models/block/electric_crusher_off.json | 10 - .../models/block/electric_crusher_on.json | 10 - .../block/electric_crusher_powered.json | 10 - .../models/block/electric_drill_off.json | 7 - .../models/block/electric_drill_on.json | 7 - .../models/block/electric_fabricator_off.json | 10 - .../models/block/electric_fabricator_on.json | 10 - .../block/electric_fabricator_powered.json | 10 - .../models/block/electric_furnace_off.json | 10 - .../models/block/electric_furnace_on.json | 10 - .../block/electric_furnace_powered.json | 10 - .../models/block/electric_oven_off.json | 10 - .../models/block/electric_oven_on.json | 10 - .../models/block/electric_oven_powered.json | 10 - .../block/electric_pcb_printer_off.json | 10 - .../models/block/electric_pcb_printer_on.json | 10 - .../block/electric_pcb_printer_powered.json | 10 - .../models/block/electric_pump_off.json | 10 - .../models/block/electric_pump_on.json | 10 - .../models/block/electric_pump_powered.json | 10 - .../models/block/electric_still_off.json | 10 - .../models/block/electric_still_on.json | 10 - .../models/block/electric_still_powered.json | 10 - .../models/block/electric_switch_off.json | 7 - .../models/block/electric_switch_on.json | 7 - .../models/block/geothermal_generator.json | 10 - .../block/growth_chamber_controller.json | 10 - .../models/block/growth_chamber_off.json | 10 - .../models/block/growth_chamber_on.json | 10 - .../models/block/growth_chamber_powered.json | 10 - .../block/hydroelectric_generator_off.json | 10 - .../block/hydroelectric_generator_on.json | 10 - .../models/block/led_bar_off_densuw.json | 7 - .../models/block/led_bar_off_desuw.json | 7 - .../models/block/led_bar_off_dnu.json | 7 - .../models/block/led_bar_off_ensw.json | 7 - .../models/block/led_bar_off_n.json | 7 - .../models/block/led_bar_off_ns.json | 7 - .../models/block/led_bar_off_nsuw.json | 7 - .../models/block/led_bar_off_nsw.json | 7 - .../models/block/led_bar_off_nuw.json | 7 - .../models/block/led_bar_off_nw.json | 7 - .../models/block/led_bar_on_densuw.json | 7 - .../models/block/led_bar_on_desuw.json | 7 - .../models/block/led_bar_on_dnu.json | 7 - .../models/block/led_bar_on_ensw.json | 7 - .../models/block/led_bar_on_n.json | 7 - .../models/block/led_bar_on_ns.json | 7 - .../models/block/led_bar_on_nsuw.json | 7 - .../models/block/led_bar_on_nsw.json | 7 - .../models/block/led_bar_on_nuw.json | 7 - .../models/block/led_bar_on_nw.json | 7 - .../models/block/plastic_refinery_off.json | 10 - .../models/block/plastic_refinery_on.json | 10 - .../block/plastic_refinery_powered.json | 10 - .../block/steam_powered_generator_off.json | 10 - .../block/steam_powered_generator_on.json | 10 - .../models/item/alkaline_battery.json | 6 - .../models/item/blank_circuit_board.json | 6 - .../models/item/control_circuit.json | 6 - .../models/item/electric_battery_array.json | 4 - .../models/item/electric_conduit.json | 4 - .../models/item/electric_crusher.json | 4 - .../models/item/electric_drill.json | 4 - .../models/item/electric_fabricator.json | 4 - .../models/item/electric_furnace.json | 4 - .../models/item/electric_oven.json | 4 - .../models/item/electric_pcb_printer.json | 4 - .../models/item/electric_pump.json | 4 - .../models/item/electric_still.json | 4 - .../models/item/electric_switch.json | 3 - .../models/item/electric_track.json | 4 - .../models/item/geothermal_generator.json | 4 - .../models/item/growth_chamber.json | 4 - .../item/growth_chamber_controller.json | 4 - .../models/item/hydroelectric_generator.json | 4 - .../models/item/integrated_circuit.json | 6 - .../models/item/lead_acid_battery.json | 6 - .../models/item/led_bar.json | 4 - .../models/item/li_ingot.json | 6 - .../models/item/li_nugget.json | 6 - .../electricadvantage/models/item/li_ore.json | 3 - .../models/item/li_powder.json | 6 - .../models/item/lithium_battery.json | 6 - .../models/item/nickel_hydride_battery.json | 6 - .../models/item/petrolplastic_ingot.json | 6 - .../models/item/photovoltaic_generator.json | 4 - .../models/item/plastic_refinery.json | 4 - .../electricadvantage/models/item/psu.json | 6 - .../models/item/pump_pipe_electric.json | 4 - .../models/item/silicon_ingot.json | 6 - .../models/item/silicon_mix.json | 6 - .../electricadvantage/models/item/solder.json | 6 - .../models/item/solder_mix.json | 6 - .../models/item/steam_powered_generator.json | 4 - .../models/item/sulfur_ore.json | 3 - .../models/item/sulfur_powder.json | 6 - src/main/resources/mcmod.info | 8 +- src/main/resources/pack.mcmeta | 2 +- ...tricOperationalHydroturbineAnchorTest.java | 2 +- .../gui/GUIHelperTest.java | 2 +- .../init/IdentityMigrationTest.java | 276 ++++++++++++++++++ .../init/IdentityResourceTest.java | 46 +++ .../init/LegacyOreSpawnMigrationTest.java | 180 ++++++++++++ .../init/OreSpawnWorldGenTest.java | 14 +- .../ElectricDrillMovementContractTest.java | 2 +- .../ElectricDrillPersistenceTest.java | 2 +- .../ElectricOperationalNativeDefectsTest.java | 4 +- .../ElectricOperationalPumpPickupTest.java | 4 +- .../ElectricOperationalRedstoneCacheTest.java | 13 +- ...ElectricOperationalSoundBroadcastTest.java | 2 +- .../ElectricOperationalStillCapacityTest.java | 10 +- .../GrowthChamberPersistenceTest.java | 2 +- .../init/LegacyOreSpawnMigrationTest.java | 44 --- 511 files changed, 3403 insertions(+), 2654 deletions(-) create mode 100644 docs/identity-migration.md rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/Data.java (81%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/ElectricAdvantage.java (81%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/blocks/ElectricConduitBlock.java (71%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/blocks/ElectricScaffoldBlock.java (93%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/blocks/Ore.java (97%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/blocks/PumpPipeBlock.java (98%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/common/IRechargeableItem.java (92%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/compat/BaseMetalsCompat.java (98%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/entities/HydroturbineEntity.java (95%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/graphics/HydroturbineRenderer.java (98%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/graphics/LaserDrillRenderer.java (96%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/graphics/LaserTurretRenderer.java (97%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/gui/ArcFurnaceGUI.java (91%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/gui/BatteryArrayGUI.java (89%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/gui/ElectricDrillGUI.java (88%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/gui/ElectricPumpGUI.java (89%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/gui/ElectricStillGUI.java (90%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/gui/FabricatorGUI.java (91%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/gui/GUIHelper.java (94%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/gui/GenericMachineGUI.java (88%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/gui/GrowthChamberControllerGUI.java (88%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/gui/GrowthChamberGUI.java (88%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/gui/OvenGUI.java (90%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/gui/PlasticRefineryGUI.java (89%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/gui/PowerGeneratorGUI.java (87%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/gui/RockCrusherGUI.java (88%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/init/Blocks.java (89%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/init/Enchantments.java (61%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/init/Entities.java (63%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/init/GUI.java (90%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/init/Items.java (93%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/init/OreSpawnWorldGen.java (80%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/init/Power.java (95%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/init/Recipes.java (96%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/init/TreasureChests.java (88%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/init/Villages.java (97%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/items/BatteryItem.java (95%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricBatteryArrayBlock.java (89%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricBatteryArrayTileEntity.java (95%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricCrusherBlock.java (88%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricCrusherTileEntity.java (94%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricDrillBlock.java (97%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricDrillTileEntity.java (96%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricFabricatorBlock.java (82%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricFabricatorTileEntity.java (96%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricFurnaceBlock.java (84%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricFurnaceTileEntity.java (95%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricGeneratorBlock.java (96%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricGeneratorTileEntity.java (98%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricMachineBlock.java (97%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricMachineTileEntity.java (99%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricOvenBlock.java (84%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricOvenTileEntity.java (94%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricPumpBlock.java (85%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricPumpTileEntity.java (95%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricStillBlock.java (89%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricStillTileEntity.java (95%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/GrowthChamberBlock.java (77%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/GrowthChamberControllerBlock.java (89%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/GrowthChamberControllerTileEntity.java (98%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/GrowthChamberTileEntity.java (96%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/HydroelectricGeneratorBlock.java (91%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/HydroelectricGeneratorTileEntity.java (92%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/LEDBlock.java (97%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/LEDTileEntity.java (92%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/LaserTurretBlock.java (97%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/LaserTurretTileEntity.java (98%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/PhotovoltaicGeneratorBlock.java (93%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/PhotovoltaicGeneratorTileEntity.java (94%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/PlasticRefineryBlock.java (82%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/PlasticRefineryTileEntity.java (96%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/SteamPoweredElectricGeneratorBlock.java (92%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/SteamPoweredElectricGeneratorTileEntity.java (93%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/util/crafting/ItemMatcher.java (97%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/util/crafting/ItemRecord.java (95%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/util/crafting/RecipeDeconstructor.java (99%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/util/crafting/SerializedInventory.java (98%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/util/farming/VirtualCrop.java (97%) create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_battery_array.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_conduit.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_crusher.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_drill.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_fabricator.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_furnace.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_oven.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_pcb_printer.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_pump.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_still.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_switch.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_track.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/geothermal_generator.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/growth_chamber.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/growth_chamber_controller.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/hydroelectric_generator.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/laser_turret.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/laser_turret_evil.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/led_bar.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/li_ore.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/photovoltaic_generator.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/plastic_refinery.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/pump_pipe_electric.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/steam_powered_generator.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/sulfur_ore.json create mode 100644 src/main/resources/assets/baseelectric/lang/de_DE.lang create mode 100644 src/main/resources/assets/baseelectric/lang/en_AU.lang create mode 100644 src/main/resources/assets/baseelectric/lang/en_CA.lang create mode 100644 src/main/resources/assets/baseelectric/lang/en_EN.lang create mode 100644 src/main/resources/assets/baseelectric/lang/en_GB.lang create mode 100644 src/main/resources/assets/baseelectric/lang/en_PT.lang create mode 100644 src/main/resources/assets/baseelectric/lang/en_US.lang create mode 100644 src/main/resources/assets/baseelectric/lang/es_ES.lang create mode 100644 src/main/resources/assets/baseelectric/lang/es_MX.lang create mode 100644 src/main/resources/assets/baseelectric/lang/it_IT.lang create mode 100644 src/main/resources/assets/baseelectric/lang/ja_JP.lang create mode 100644 src/main/resources/assets/baseelectric/lang/ko_KO.lang create mode 100644 src/main/resources/assets/baseelectric/lang/pt_BR.lang create mode 100644 src/main/resources/assets/baseelectric/lang/zh_CN.lang create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_battery_array.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_0.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_densuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_desuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_dnu.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_ensw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_n.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_ns.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_nsuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_nsw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_nuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_nw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_crusher_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_crusher_on.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_crusher_powered.json rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_drill_base.json (93%) create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_drill_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_drill_on.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_fabricator_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_fabricator_on.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_fabricator_powered.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_furnace_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_furnace_on.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_furnace_powered.json rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_machine_base.json (90%) create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_oven_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_oven_on.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_oven_powered.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_on.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_powered.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_pump_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_pump_on.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_pump_powered.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_still_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_still_on.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_still_powered.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_switch_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_switch_on.json rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_0.json (90%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_densuw.json (95%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_desuw.json (95%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_dnu.json (94%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_ensw.json (94%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_n.json (93%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_ns.json (94%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_nsuw.json (94%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_nsw.json (93%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_nuw.json (93%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_nw.json (92%) create mode 100644 src/main/resources/assets/baseelectric/models/block/geothermal_generator.json create mode 100644 src/main/resources/assets/baseelectric/models/block/growth_chamber_controller.json create mode 100644 src/main/resources/assets/baseelectric/models/block/growth_chamber_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/growth_chamber_on.json create mode 100644 src/main/resources/assets/baseelectric/models/block/growth_chamber_powered.json create mode 100644 src/main/resources/assets/baseelectric/models/block/hydroelectric_generator_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/hydroelectric_generator_on.json rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/laser_turret.json (77%) create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_off_densuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_off_desuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_off_dnu.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_off_ensw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_off_n.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_off_ns.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_off_nsuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_off_nsw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_off_nuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_off_nw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_on_densuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_on_desuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_on_dnu.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_on_ensw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_on_n.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_on_ns.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_on_nsuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_on_nsw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_on_nuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_on_nw.json rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/li_ore.json (50%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/photovoltaic_generator.json (50%) create mode 100644 src/main/resources/assets/baseelectric/models/block/plastic_refinery_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/plastic_refinery_on.json create mode 100644 src/main/resources/assets/baseelectric/models/block/plastic_refinery_powered.json create mode 100644 src/main/resources/assets/baseelectric/models/block/steam_powered_generator_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/steam_powered_generator_on.json rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/sulfur_ore.json (52%) create mode 100644 src/main/resources/assets/baseelectric/models/item/alkaline_battery.json rename src/main/resources/assets/{electricadvantage => baseelectric}/models/item/battery_base.json (91%) create mode 100644 src/main/resources/assets/baseelectric/models/item/blank_circuit_board.json create mode 100644 src/main/resources/assets/baseelectric/models/item/control_circuit.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_battery_array.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_conduit.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_crusher.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_drill.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_fabricator.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_furnace.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_oven.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_pcb_printer.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_pump.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_still.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_switch.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_track.json rename src/main/resources/assets/{electricadvantage => baseelectric}/models/item/generic_item.json (100%) create mode 100644 src/main/resources/assets/baseelectric/models/item/geothermal_generator.json create mode 100644 src/main/resources/assets/baseelectric/models/item/growth_chamber.json create mode 100644 src/main/resources/assets/baseelectric/models/item/growth_chamber_controller.json create mode 100644 src/main/resources/assets/baseelectric/models/item/hydroelectric_generator.json create mode 100644 src/main/resources/assets/baseelectric/models/item/integrated_circuit.json rename src/main/resources/assets/{electricadvantage => baseelectric}/models/item/laser_turret.json (81%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/item/laser_turret_evil.json (81%) create mode 100644 src/main/resources/assets/baseelectric/models/item/lead_acid_battery.json create mode 100644 src/main/resources/assets/baseelectric/models/item/led_bar.json create mode 100644 src/main/resources/assets/baseelectric/models/item/li_ingot.json create mode 100644 src/main/resources/assets/baseelectric/models/item/li_nugget.json create mode 100644 src/main/resources/assets/baseelectric/models/item/li_ore.json create mode 100644 src/main/resources/assets/baseelectric/models/item/li_powder.json create mode 100644 src/main/resources/assets/baseelectric/models/item/lithium_battery.json create mode 100644 src/main/resources/assets/baseelectric/models/item/nickel_hydride_battery.json create mode 100644 src/main/resources/assets/baseelectric/models/item/petrolplastic_ingot.json create mode 100644 src/main/resources/assets/baseelectric/models/item/photovoltaic_generator.json create mode 100644 src/main/resources/assets/baseelectric/models/item/plastic_refinery.json create mode 100644 src/main/resources/assets/baseelectric/models/item/psu.json create mode 100644 src/main/resources/assets/baseelectric/models/item/pump_pipe_electric.json create mode 100644 src/main/resources/assets/baseelectric/models/item/silicon_ingot.json create mode 100644 src/main/resources/assets/baseelectric/models/item/silicon_mix.json create mode 100644 src/main/resources/assets/baseelectric/models/item/solder.json create mode 100644 src/main/resources/assets/baseelectric/models/item/solder_mix.json create mode 100644 src/main/resources/assets/baseelectric/models/item/steam_powered_generator.json create mode 100644 src/main/resources/assets/baseelectric/models/item/sulfur_ore.json create mode 100644 src/main/resources/assets/baseelectric/models/item/sulfur_powder.json rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_battery_array.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_conduit.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_crusher_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_crusher_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_crusher_on.png.mcmeta (88%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_crusher_powered.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_drill_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_drill_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_drill_powered.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_fabricator_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_fabricator_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_fabricator_on.png.mcmeta (91%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_fabricator_powered.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_furnace_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_furnace_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_furnace_powered.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_oven_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_oven_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_oven_powered.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_pcb_printer_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_pcb_printer_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_pcb_printer_powered.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_pump_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_pump_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_still_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_still_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_still_on.png.mcmeta (88%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_still_powered.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_switch_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_switch_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/growth_chamber_controller.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/growth_chamber_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/growth_chamber_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/growth_chamber_powered.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/hydroelectric_generator_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/hydroelectric_generator_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/hydroelectric_generator_on.png.mcmeta (88%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/laser_drill_optic.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/laser_drill_optic_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/laser_turret_base.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/led_bar_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/led_bar_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/lithium_ore.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/machine_back.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/machine_side.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/machine_top.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/photovoltaic_cell.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/plastic_refinery_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/plastic_refinery_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/steam_powered_generator_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/steam_powered_generator_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/steam_powered_generator_on.png.mcmeta (88%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/sulfur_ore.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/entity/hydroturbine.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/entity/laser_turret.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/entity/windturbine.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/electric_battery_array_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/electric_crusher_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/electric_drill_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/electric_fabricator_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/electric_furnace_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/electric_generator_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/electric_machine_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/electric_oven_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/electric_pump_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/electric_still_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/geothermal_generator_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/growth_chamber_controller_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/growth_chamber_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/pcb_printer_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/plastic_refinery_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/alkaline_battery.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/blank_circuit_board.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/control_circuit.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/integrated_circuit.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/lead_acid_battery.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/li_ingot.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/li_nugget.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/li_powder.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/lithium_battery.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/nickel_hydride_battery.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/petrolplastic_ingot.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/psu.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/silicon_ingot.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/silicon_mix.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/solder.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/solder_mix.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/sulfur_powder.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/materials/laser_beam.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/materials/machine_case.png (100%) delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_battery_array.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_conduit.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_crusher.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_drill.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_fabricator.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_furnace.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_oven.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_pcb_printer.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_pump.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_still.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_switch.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_track.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/geothermal_generator.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/growth_chamber.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/growth_chamber_controller.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/hydroelectric_generator.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/laser_turret.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/laser_turret_evil.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/led_bar.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/li_ore.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/photovoltaic_generator.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/plastic_refinery.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/pump_pipe_electric.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/steam_powered_generator.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/sulfur_ore.json delete mode 100644 src/main/resources/assets/electricadvantage/lang/de_DE.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/en_AU.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/en_CA.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/en_EN.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/en_GB.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/en_PT.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/en_US.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/es_ES.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/es_MX.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/it_IT.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/ja_JP.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/ko_KO.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/pt_BR.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/zh_CN.lang delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_battery_array.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_0.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_densuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_desuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_dnu.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_ensw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_n.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_ns.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_nsuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_nsw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_nuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_nw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_crusher_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_crusher_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_crusher_powered.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_drill_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_drill_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_fabricator_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_fabricator_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_fabricator_powered.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_furnace_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_furnace_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_furnace_powered.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_oven_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_oven_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_oven_powered.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_powered.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_pump_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_pump_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_pump_powered.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_still_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_still_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_still_powered.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_switch_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_switch_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/geothermal_generator.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/growth_chamber_controller.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/growth_chamber_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/growth_chamber_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/growth_chamber_powered.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/hydroelectric_generator_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/hydroelectric_generator_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_off_densuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_off_desuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_off_dnu.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_off_ensw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_off_n.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_off_ns.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_off_nsuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_off_nsw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_off_nuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_off_nw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_on_densuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_on_desuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_on_dnu.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_on_ensw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_on_n.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_on_ns.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_on_nsuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_on_nsw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_on_nuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_on_nw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/plastic_refinery_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/plastic_refinery_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/plastic_refinery_powered.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/steam_powered_generator_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/steam_powered_generator_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/alkaline_battery.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/blank_circuit_board.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/control_circuit.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_battery_array.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_conduit.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_crusher.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_drill.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_fabricator.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_furnace.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_oven.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_pcb_printer.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_pump.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_still.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_switch.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_track.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/geothermal_generator.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/growth_chamber.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/growth_chamber_controller.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/hydroelectric_generator.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/integrated_circuit.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/lead_acid_battery.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/led_bar.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/li_ingot.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/li_nugget.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/li_ore.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/li_powder.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/lithium_battery.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/nickel_hydride_battery.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/petrolplastic_ingot.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/photovoltaic_generator.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/plastic_refinery.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/psu.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/pump_pipe_electric.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/silicon_ingot.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/silicon_mix.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/solder.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/solder_mix.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/steam_powered_generator.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/sulfur_ore.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/sulfur_powder.json rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/entities/ElectricOperationalHydroturbineAnchorTest.java (98%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/gui/GUIHelperTest.java (97%) create mode 100644 src/test/java/zone/moddev/mc/baseelectric/init/IdentityMigrationTest.java create mode 100644 src/test/java/zone/moddev/mc/baseelectric/init/IdentityResourceTest.java create mode 100644 src/test/java/zone/moddev/mc/baseelectric/init/LegacyOreSpawnMigrationTest.java rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/init/OreSpawnWorldGenTest.java (80%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricDrillMovementContractTest.java (97%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricDrillPersistenceTest.java (96%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricOperationalNativeDefectsTest.java (99%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricOperationalPumpPickupTest.java (98%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricOperationalRedstoneCacheTest.java (93%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricOperationalSoundBroadcastTest.java (99%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricOperationalStillCapacityTest.java (92%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/GrowthChamberPersistenceTest.java (98%) delete mode 100644 src/test/java/zone/moddev/mc/electricadvantage/init/LegacyOreSpawnMigrationTest.java diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38bf34b..065b2bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: Electric Advantage 1.10 CI +name: baseElectric 1.10 CI on: push: @@ -13,7 +13,7 @@ permissions: contents: read concurrency: - group: electricadvantage-1.10-${{ github.workflow }}-${{ github.ref }} + group: baseelectric-1.10-${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: @@ -23,7 +23,7 @@ jobs: timeout-minutes: 75 steps: - - name: Check out ElectricAdvantage + - name: Check out baseElectric uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 - name: Check out pinned OreSpawn @@ -33,11 +33,11 @@ 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 + repository: MinecraftModDevelopmentMods/basePower + ref: 79fb16437615df98b6c6298fe8d98643a0e7140b path: .ci-dependencies/PowerAdvantage - name: Install Java 8 toolchain @@ -70,7 +70,7 @@ 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: | @@ -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" + echo "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: ElectricAdvantage-1.10.2-${{ github.sha }} + name: baseElectric-1.10.2-${{ github.sha }} if-no-files-found: error retention-days: 30 path: | - build/libs/ElectricAdvantage-2.2.5.110021.jar - build/libs/ElectricAdvantage-2.2.5.110021-sources.jar - build/libs/ElectricAdvantage-2.2.5.110021-javadoc.jar + build/libs/baseElectric-2.2.6.110021.jar + build/libs/baseElectric-2.2.6.110021-sources.jar + build/libs/baseElectric-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: ElectricAdvantage-1.10.2-diagnostics-${{ github.sha }} + name: baseElectric-1.10.2-diagnostics-${{ github.sha }} if-no-files-found: ignore retention-days: 14 path: | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 1d6cff8..8a5de23 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 ElectricAdvantage + - name: Check out baseElectric uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 - name: Check out pinned OreSpawn @@ -33,11 +33,11 @@ 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 + repository: MinecraftModDevelopmentMods/basePower + ref: 79fb16437615df98b6c6298fe8d98643a0e7140b path: .ci-dependencies/PowerAdvantage - name: Install Java 8 toolchain @@ -70,7 +70,7 @@ 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: | @@ -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" + echo "2992F2CADC30D8F61A17216DF9AB02BDF8E8211BB8B494A6CCED70A3267F69FE $jar" | sha256sum --check --strict echo "jar=$jar" >> "$GITHUB_OUTPUT" - name: Initialize CodeQL @@ -95,7 +96,7 @@ jobs: with: languages: java-kotlin - - name: Compile ElectricAdvantage production code + - name: Compile baseElectric 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 e545334..c3c8e99 100644 --- a/.github/workflows/release-on-tag.yml +++ b/.github/workflows/release-on-tag.yml @@ -1,4 +1,4 @@ -name: Validate Electric Advantage release tag +name: Validate baseElectric release tag on: push: @@ -10,13 +10,13 @@ permissions: contents: read concurrency: - group: electricadvantage-release-tag-${{ github.ref_name }} + group: baseelectric-release-tag-${{ github.ref_name }} cancel-in-progress: false jobs: validate-release-tag: name: Validate tag for manual release confirmation - if: github.repository == 'MinecraftModDevelopmentMods/ElectricAdvantage' + if: github.repository == 'MinecraftModDevelopmentMods/baseElectric' 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)" + curseforge_project_id="$(value curseforge_project_id)" + if [[ ! "$curseforge_project_id" =~ ^[1-9][0-9]*$ || "$curseforge_project_id" == 240985 ]]; then + echo "baseElectric publication is disabled until its own CurseForge project is assigned" >&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 df2e29c..b6ffd6d 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,14 @@ -Unreleased +baseElectric 2.2.6.110021 + +- Rename the Minecraft 1.10.2 candidate to baseElectric 2.2.6.110021 with mod ID baseelectric and implementation namespace zone.moddev.mc.baseelectric. +- Require basePower 2.4.4.110021 or newer while retaining the stable cyano.poweradvantage.api public API. +- Remap released Cyano Electric Advantage block and item identities; retain old tile and hydroturbine reads while writing new canonical IDs. +- Copy the original configuration when the new one is absent, and preserve custom loot tables without duplicate injection. +- Use basePower's early, backed-up OreSpawn identity migration for new provider/rule/block IDs; retire consumed legacy inputs to avoid duplicate generation and abort on ambiguous authority. +- Move assets, translations, build metadata, workflows, and distribution relations to the new identity without changing gameplay or balance. +- Keep publication disabled until baseElectric has an assigned, authorized CurseForge project. +- Pin the exact basePower source commit and development-jar checksum in the build and CI. +- Update the installation and migration notes with the copied-world and operating test coverage. - Check generator redstone before the first power pulse so a disabled solar panel cannot produce a startup burst. - Charge the moved electric drill its existing 250-unit track cost before saving its replacement, instead of charging the removed drill. diff --git a/README.md b/README.md index 32da75f..2a60e81 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,40 @@ -# ElectricAdvantage +# baseElectric -Electric Advantage adds electrical generation, storage, and machines to Power Advantage for Minecraft 1.10.2. +baseElectric continues DrCyano's Electric Advantage, adding generators, batteries, wiring and electrically powered machines to basePower for Minecraft 1.10.2. -The maintained implementation namespace is `zone.moddev.mc.electricadvantage`. 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` uses mod ID `baseelectric`, artifact `baseElectric`, and implementation +namespace `zone.moddev.mc.baseelectric`. It requires basePower `2.4.4.110021` or newer; update +the two mods together. The public `cyano.poweradvantage.api` remains unchanged. -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 Electrician'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 sulfur/lithium ownership, migration, and Ore Dictionary aliases. +This version is not published. The [cross-mod qualification notes](https://github.com/MinecraftModDevelopmentMods/basePower/blob/master-1.10.2/docs/1.10/base-qualification.md) +record the exact jars used for local unit tests, original-release migration fixtures, operating +cases and full restarts. Not every machine has a 30-minute endurance run, and manual gameplay +acceptance remains separate from those automated checks. + +The cross-mod [Advantage Works 1.10.2 Handbook](https://github.com/MinecraftModDevelopmentMods/basePower/blob/master-1.10.2/docs/1.10/README.md) includes the Electrician'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 sulfur/lithium ownership, migration, and Ore Dictionary aliases. + +## Released-World Migration + +The supported input is an original released Cyano Electric Advantage 1.10 world, not every +unpublished implementation identity. Back up the world and configuration before upgrading; +qualify migration on disposable copies. See [the migration contract](docs/identity-migration.md). + +Released `electricadvantage` blocks and items load as `baseelectric`. Original tile and +hydroturbine IDs remain read aliases; subsequent saves use the new canonical IDs. +An existing `baseelectric.cfg` wins; otherwise `electricadvantage.cfg` is copied unchanged. +Custom additional-loot tables are imported with owned item IDs updated, then the old JSON +files are archived outside the loader's `.json` suffix so they cannot inject duplicate loot. +Existing new loot tables are never overwritten by generated defaults. + +basePower migrates both mods' OreSpawn configuration and selected-world profiles before +OreSpawn reads them. Provider, rule and owned block IDs become `baseelectric`; old active +provider IDs cannot be retained with the pinned engine. Original config bytes are backed up, +and consumed legacy input is retired to prevent duplicate generation. Ambiguous or failed +migrations stop startup instead of silently using fresh defaults. + +No recipes, machine rates, energy capacities, crop behavior, or ore placement settings are +changed by this identity migration. Existing bug fixes and regression tests from baseline +`c0f8424665f3810eb2d6d1a06b2cba85c5322e9a` are retained. ## Drill Reload Fix @@ -18,7 +46,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: ```text cd ..\..\PowerAdvantage @@ -27,7 +55,7 @@ gradlew.bat deobfJar The dependency locations can be overridden with `-PoreSpawnDeobfJar=` and `-PpowerAdvantageDeobfJar=`. -Then build and audit ElectricAdvantage: +Then build and audit baseElectric: ```text gradlew.bat clean check build javadoc verifyReleaseDependencies verifyReleaseArtifacts writeReleaseChecksums @@ -41,4 +69,14 @@ For Eclipse, import this repository as an existing Gradle project and run: gradlew.bat cleanEclipse verifyEclipseProductionClasspath ``` -Power Advantage `2.4.3.110021` or newer and OreSpawn are required at compile time and runtime but are never bundled. Base Metals remains a required distribution dependency while its integrations stay reflection-based and absent from the compile classpath. +basePower `2.4.4.110021` or newer and OreSpawn are required at compile time and runtime but are never bundled. Base Metals remains a required distribution dependency while its integrations stay reflection-based and absent from the compile classpath. CurseForge relations are `basepower`, `base-metals`, and `mmd-orespawn`. + +The build pins basePower source commit `79fb16437615df98b6c6298fe8d98643a0e7140b` and development-jar SHA-256 +`2992F2CADC30D8F61A17216DF9AB02BDF8E8211BB8B494A6CCED70A3267F69FE` in properties, audits and +both dependency-building workflows. CI builds that exact MMD basePower source and checks the +resulting jar before compiling baseElectric. Do not substitute an old jar or a moving branch. + +CurseForge project ID `0` means unassigned development metadata. No CurseForge project has +been created or authorized. Maven publication, prepared release validation, and release-tag +validation refuse unassigned IDs and the old Electric Advantage project ID. Local builds +and checks are separate from publication approval. diff --git a/build.gradle b/build.gradle index f7e9b44..44baba7 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { group = project.mod_group version = project.mod_version -base.archivesName = 'ElectricAdvantage' +base.archivesName = 'baseElectric' def versionParts = project.mod_version.toString().tokenize('.') if (versionParts.size() != 4 || !versionParts.every { it ==~ /\d+/ }) { @@ -144,12 +144,12 @@ repositories { } } -// ElectricAdvantage needs the full PowerAdvantage implementation in development, +// baseElectric 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) @@ -311,8 +311,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 ElectricAdvantage release version: ${project.mod_version}") + if (project.mod_version != '2.2.6.110021') { + throw new GradleException("Unexpected baseElectric release version: ${project.mod_version}") } if (project.minecraft_version != '1.10.2' || project.forge_version != '12.18.3.2511' @@ -326,22 +326,24 @@ tasks.register('verifyReleaseConfiguration') { || project.gradle_java_version != '17') { throw new GradleException('Unexpected release dispatcher target metadata') } - if (project.mod_id != 'electricadvantage' - || project.group.toString() != 'zone.moddev.mc.electricadvantage' - || base.archivesName.get() != 'ElectricAdvantage' + if (project.mod_id != 'baseelectric' || project.mod_name != 'baseElectric' + || project.group.toString() != 'zone.moddev.mc.baseelectric' + || base.archivesName.get() != 'baseElectric' + || rootProject.name != 'baseElectric' || project.mod_license != 'GPL-3.0-only' - || project.curseforge_project_id != '240985') { + || !(project.curseforge_project_id ==~ /0|[1-9][0-9]*/) + || project.curseforge_project_id == '240985') { throw new GradleException('Unexpected Forge, Maven, archive, or CurseForge identity') } - if (project.cf_requirements != 'power-advantage,base-metals,mmd-orespawn' + if (project.cf_requirements != 'basepower,base-metals,mmd-orespawn' || 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') { + 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 PowerAdvantage compile dependency identity') } if (project.orespawn_version != '4.0.8.110021' @@ -354,22 +356,27 @@ 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('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/electricadvantage/ElectricAdvantage.java').getText('UTF-8') - if (!mainSource.contains('MODID = "electricadvantage"') - || !mainSource.contains('VERSION = "2.2.5.110021"') - || !mainSource.contains('required-after:orespawn@[4.0.6,5.0.0);required-after:poweradvantage@[2.4.3.110021,);after:basemetals')) { - throw new GradleException('ElectricAdvantage source identity or dependency policy changed') + 'src/main/java/zone/moddev/mc/baseelectric/ElectricAdvantage.java').getText('UTF-8') + if (!mainSource.contains('MODID = "baseelectric"') + || !mainSource.contains('NAME = "baseElectric"') + || !mainSource.contains('VERSION = "2.2.6.110021"') + || !mainSource.contains('required-after:orespawn@[4.0.6,5.0.0);required-after:basepower@[2.4.4.110021,);after:basemetals') + || !mainSource.contains('LegacyIdentity.remapMissingMappings(event, LEGACY_MODID, MODID)') + || !mainSource.contains('LegacyIdentity.migrateConfiguration(') + || !mainSource.contains('LegacyIdentity.migrateAdditionalLootTables(')) { + throw new GradleException('baseElectric source identity, migration, 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 != 'electricadvantage') { - throw new GradleException('Source mcmod.info does not use the stable electricadvantage mod id') + if (mod.modid != 'baseelectric' || mod.name != 'baseElectric') { + throw new GradleException('Source mcmod.info does not use the baseElectric identity') } } } @@ -403,8 +410,10 @@ tasks.register('verifyReleaseDependencies') { ['cyano/poweradvantage/api/PoweredEntity.class', 'cyano/poweradvantage/api/GUIBlock.class', 'cyano/poweradvantage/api/FluidCategoryRegistry.class', - 'zone/moddev/mc/poweradvantage/conduitnetwork/ConduitRegistry.class', - 'zone/moddev/mc/poweradvantage/init/Fluids.class'].each { required -> + 'zone/moddev/mc/basepower/conduitnetwork/ConduitRegistry.class', + 'zone/moddev/mc/basepower/init/Fluids.class', + 'zone/moddev/mc/basepower/compat/LegacyIdentity.class', + 'zone/moddev/mc/basepower/compat/LegacyWorldgenIdentity.class'].each { required -> if (zip.getEntry(required) == null) { throw new GradleException("PowerAdvantage dependency is missing ${required}") } @@ -474,15 +483,17 @@ tasks.register('verifyReleaseArtifacts') { new ZipFile(mainJar).withCloseable { zip -> List names = zip.entries().collect { it.name } ['mcmod.info', 'pack.mcmeta', - 'zone/moddev/mc/electricadvantage/ElectricAdvantage.class', - 'zone/moddev/mc/electricadvantage/machines/ElectricDrillTileEntity.class', - 'assets/electricadvantage/lang/en_US.lang'].each { required -> + 'zone/moddev/mc/baseelectric/ElectricAdvantage.class', + 'zone/moddev/mc/baseelectric/machines/ElectricDrillTileEntity.class', + 'assets/baseelectric/lang/en_US.lang'].each { required -> if (!names.contains(required)) { throw new GradleException("Release jar is missing ${required}") } } ['agent-notes/', '.codex/', 'src/test/', 'fernflower_abstract_parameter_names.txt', 'cyano/poweradvantage/', + 'cyano/electricadvantage/', 'zone/moddev/mc/electricadvantage/', + 'assets/electricadvantage/', 'zone/moddev/mc/basepower/', 'com/mcmoddev/electricadvantage/', 'com/mcmoddev/poweradvantage/', 'zone/moddev/mc/poweradvantage/', 'cyano/basemetals/', 'com/mcmoddev/lib/', 'zone/moddev/mc/orespawn/', 'com/mcmoddev/orespawn/', @@ -491,15 +502,28 @@ tasks.register('verifyReleaseArtifacts') { throw new GradleException("Release jar contains forbidden entry matching ${forbidden}") } } + zip.entries().findAll { entry -> + entry.name.startsWith('assets/baseelectric/') + && ['.json', '.lang', '.mcmeta'].any { entry.name.endsWith(it) } + }.each { entry -> + String contents = zip.getInputStream(entry).getText(StandardCharsets.UTF_8.name()) + if (['electricadvantage:', 'poweradvantage:', 'tile.electricadvantage.', + 'item.electricadvantage.'].any { contents.contains(it) }) { + throw new GradleException("Stale asset or translation identity in ${entry.name}") + } + } 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') != 'baseElectric' + || manifest.getValue('Specification-Title') != 'baseelectric' + || manifest.getValue('Maven-Artifact') != "zone.moddev.mc.baseelectric:baseElectric:${project.mod_version}" || manifest.getValue('Built-On-Java') != project.java_version || manifest.getValue('Implementation-Timestamp') != null || manifest.getValue('Timestamp') != null) { @@ -520,9 +544,9 @@ tasks.register('verifyReleaseArtifacts') { } new ZipFile(new File(libs, expectedReleaseFiles.get()[1])).withCloseable { sourceZip -> - if (sourceZip.getEntry('zone/moddev/mc/electricadvantage/ElectricAdvantage.java') == null - || sourceZip.getEntry('zone/moddev/mc/electricadvantage/machines/ElectricDrillTileEntity.java') == null) { - throw new GradleException('Sources jar is missing required ElectricAdvantage sources') + if (sourceZip.getEntry('zone/moddev/mc/baseelectric/ElectricAdvantage.java') == null + || sourceZip.getEntry('zone/moddev/mc/baseelectric/machines/ElectricDrillTileEntity.java') == null) { + throw new GradleException('Sources jar is missing required baseElectric sources') } } new ZipFile(new File(libs, expectedReleaseFiles.get()[2])).withCloseable { javadocZip -> @@ -560,6 +584,7 @@ tasks.register('writeReleaseChecksums') { tasks.register('verifyPreparedReleaseArtifacts') { group = 'verification' description = 'Audits an immutable release bundle before Maven publication.' + dependsOn tasks.named('verifyPublicationConfiguration') doLast { if (!preparedReleaseDir.isPresent()) { throw new GradleException('preparedReleaseDir is required for prepared artifact publication') @@ -617,9 +642,9 @@ publishing { artifact(tasks.named('javadocJar')) } pom { - name = 'Electric Advantage' + name = 'baseElectric' description = project.mod_description - url = 'https://github.com/MinecraftModDevelopmentMods/ElectricAdvantage' + url = 'https://github.com/MinecraftModDevelopmentMods/baseElectric' licenses { license { name = 'GNU General Public License, Version 3' @@ -627,9 +652,9 @@ publishing { } } scm { - connection = 'scm:git:https://github.com/MinecraftModDevelopmentMods/ElectricAdvantage.git' - developerConnection = 'scm:git:ssh://git@github.com/MinecraftModDevelopmentMods/ElectricAdvantage.git' - url = 'https://github.com/MinecraftModDevelopmentMods/ElectricAdvantage' + connection = 'scm:git:https://github.com/MinecraftModDevelopmentMods/baseElectric.git' + developerConnection = 'scm:git:ssh://git@github.com/MinecraftModDevelopmentMods/baseElectric.git' + url = 'https://github.com/MinecraftModDevelopmentMods/baseElectric' } } } @@ -661,13 +686,29 @@ tasks.register('validateMavenReleaseCredentials') { } } +tasks.register('verifyPublicationConfiguration') { + group = 'verification' + description = 'Refuses publication until baseElectric has its own assigned CurseForge project.' + doLast { + String id = project.curseforge_project_id.toString() + if (!(id ==~ /[1-9][0-9]*/) || id == '240985') { + throw new GradleException('baseElectric CurseForge project is unassigned or uses the old ElectricAdvantage project; publication is disabled') + } + } +} + tasks.withType(PublishToMavenRepository).configureEach { + dependsOn tasks.named('verifyPublicationConfiguration') dependsOn tasks.named('validateMavenReleaseCredentials') dependsOn preparedReleaseDir.isPresent() ? tasks.named('verifyPreparedReleaseArtifacts') : tasks.named('verifyReleaseArtifacts') } +tasks.withType(PublishToMavenLocal).configureEach { + dependsOn tasks.named('verifyPublicationConfiguration') +} + idea { module { downloadSources = true @@ -799,7 +840,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="ElectricAdvantage"')) { + if (!contents.contains('PROJECT_ATTR" value="baseElectric"')) { throw new GradleException("${name} targets the wrong Eclipse project") } } diff --git a/docs/identity-migration.md b/docs/identity-migration.md new file mode 100644 index 0000000..5eb21b5 --- /dev/null +++ b/docs/identity-migration.md @@ -0,0 +1,132 @@ +# baseElectric 1.10 Identity Migration + +## Scope + +This local candidate starts at ElectricAdvantage baseline +`c0f8424665f3810eb2d6d1a06b2cba85c5322e9a`. Its target is baseElectric +`2.2.6.110021` on Minecraft 1.10.2 / Forge 12.18.3.2511. + +Only the original released Cyano Electric Advantage 1.10 saved identities are a required +migration input. Java implementation packages from unpublished intermediate candidates do +not become extra saved-world aliases. Historical fixtures must retain their original bytes. +The unchanged `cyano.poweradvantage.api` is a public API exception, not stale implementation. + +## Saved Objects + +- Blocks and items, including ItemBlocks: `electricadvantage:` to `baseelectric:`. +- The missing-mappings event delegates to basePower's `LegacyIdentity`, which reads + `event.getAll()`. Filtering only the active new mod container misses the old owner's entries. +- All 16 registered tiles retain `electricadvantage.` as read alternatives. + `GameRegistry.registerTileEntityWithAlternatives` receives `baseelectric.` as + its primary name, so native saves write the new identity. LED's historical suffix is `l_e_d`. +- The released hydroturbine ID is `electricadvantage.electricadvantage.Hydroturbine`: + the old code prefixed its registration name, and Forge prefixed it again. Its read-only + `EntityList.NAME_TO_CLASS` alias must not replace `CLASS_TO_NAME`'s canonical + `baseelectric.Hydroturbine` value or alter the local entity index/tracking settings. +- Also accept `electricadvantage.Hydroturbine` as a defensive read alias. This shorter spelling + has not been verified as an original-release saved ID. Both read aliases resolve to the + same class; neither creates another canonical registration. Validate both names for + ownership conflicts before installing either alias. +- Unknown old registry entries fail migration rather than silently becoming air. + +Inventory, energy, machine progress, coordinates, orientation, UUIDs, and generator links +remain under the existing serialization contracts. The rename does not alter their values. + +The inspected original fixture is `ElectricAdvantage_1.10.2-2.2.0.jar`, SHA-256 +`61AE5343A79F518F54F1717D508EA3F6DA7209EE69B0C4433E0B7A9722213EE0`, from the harness's +protected `20261023-working-legacy110/original110/mods` input. `javap -p -c` of +`cyano.electricadvantage.init.Entities` shows the `electricadvantage.` prefix and the legacy +`EntityRegistry.registerModEntity(Class,String,int,Object,int,int,boolean)` call. Forge then +adds the active mod ID to the saved name. The similarly named local jar with SHA-256 +`29A6EFA25B9519B32A2FCA853F3D8CC89E18ADBFD44A7BC4C4D0EC5F4C6A551B` contains `com.mcmoddev` +classes and is not interchangeable original Cyano release evidence. No fixture was changed +or loaded in a game during this inspection. + +## Configuration And Loot + +`LegacyIdentity.migrateConfiguration` runs before Forge Configuration loads. It copies +`electricadvantage.cfg` to `baseelectric.cfg` only if the new file does not exist, without +changing the old bytes. A new file is always authoritative. + +`LegacyIdentity.migrateAdditionalLootTables` runs before generating default tables. It +imports old tables with structured owned registry-value rewrites, preserves existing new +tables, and archives consumed files as `.json.before-baseelectric`. The loot loader scans +`.json`; retaining both active copies would inject loot twice. Default generation skips +existing files, preserving imported or new custom tables. Foreign registry values and +weights/counts remain unchanged. + +## OreSpawn Coordination + +Worldgen migration uses basePower's public `compat.LegacyWorldgenIdentity` helper against +pinned OreSpawn 4.0.8.110021. Provider owners and rule IDs must use `baseelectric`, not +`electricadvantage`: the pinned engine rejects unloaded owners and rules outside their +provider's namespace. Owned block outputs also become `baseelectric:*`. + +basePower's `required-before:orespawn` ordering makes its preInit the early migration hook. +It calls `migrateConfig(configDirectory, oldId, newId)` for both Power and Electric before +OreSpawn preInit reads the global profile. Electric also calls it defensively before +enqueueing its typed provider, but this later, idempotent check does not replace the early +Power hook. Any `IOException` aborts startup; it must never fall through to fresh defaults. + +basePower also calls `migrateWorld(selectedWorldRoot, oldId, newId)` for both owners before +OreSpawn's serverAboutToStart reads that world's saved profile. Electric adds no independent +world-file rewrite or world scan. Historical fixtures and protected source worlds remain +unchanged; qualification uses disposable copies. + +The original OS1 file's settings remain authoritative through migration, not its old active +filename. The helper writes the migrated owner file and retires consumed old JSON only after +creating and verifying a hash-named `.bak` containing its original bytes. An explicit modern +provider overrides the typed defaults, and consumed OS1 input is retired so the bridge cannot +import it again as a standalone `orespawn` provider. Conflicting old/new authorities, an +already-completed bridge marker without its owned provider, and ambiguous legacy/modern rule +overlaps abort for explicit reconciliation. Saved manifests are migrated alongside their +rules so API defaults are not added beside retained imported rules. + +Sulfur/lithium ownership priority, frequency, quantities, height limits, hosts, overrides, +and disabled retrogen must remain unchanged. Fresh and legacy-config starts require distinct +checks; parsing a fixture alone is not evidence that only one provider is active. + +## Build And Publication Gates + +Implementation references use `zone.moddev.mc.basepower`; public API references remain +`cyano.poweradvantage.api`. The required runtime constraint is +`required-after:basepower@[2.4.4.110021,);after:basemetals`, alongside the existing OreSpawn +requirement. Distribution relations are `basepower,base-metals,mmd-orespawn`. + +The build pins basePower source commit `79fb16437615df98b6c6298fe8d98643a0e7140b` and development-jar +SHA-256 `2992F2CADC30D8F61A17216DF9AB02BDF8E8211BB8B494A6CCED70A3267F69FE` in properties, +the strict dependency audit and both dependency-building workflows. CI builds that exact source +before checking the jar checksum. Required class, manifest, classpath, Java 8 bytecode, +reproducibility and no-bundling audits remain. +basePower and OreSpawn classes must not enter the distributable baseElectric jar. + +CurseForge ID `0` is local development metadata only. Publication and release-tag guards +refuse both `0` and old project `240985`; a newly assigned, authorized project is required. +Source delivery and publication are separate; normal CI never publishes a release. + +## Verification Boundaries + +New tests cover the actual missing-mapping handler, all tile read/write registrations, +native inventory/energy/position reload, entity read-only aliases, CFG precedence, and +custom-loot preservation. Worldgen tests retain the immutable original OS1 input, verify +new provider/rule/block identities, compare all imported placement settings, check byte-exact +backups and idempotence, and reject conflicting authorities or skipped-import states. +Existing operational regressions retain their assertions. + +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 and restart checks. They keep manual client +acceptance separate and do not claim every Electric machine has a 30-minute endurance run. + +## Building And Reproducing The Jars + +Build the pinned basePower and OreSpawn development artifacts first, then use the dependency +properties described in the README. Run the full checks without bypassing either checksum: + +```text +gradlew.bat clean check build javadoc verifyReleaseDependencies verifyReleaseArtifacts writeReleaseChecksums --no-daemon --stacktrace +``` + +For reproducibility, run that command from independent source checkouts with the same pinned +dependencies and toolchains. Compare all three distributable jars and the development jar, +retaining each run's logs and checksums outside Git. Do not overwrite a frozen test receipt or +launch an original source world. Publication remains disabled with CurseForge project ID `0`. diff --git a/gradle.properties b/gradle.properties index a54237e..8c836fc 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=240985 +curseforge_project_id=0 -mod_id=electricadvantage -mod_name=Electric Advantage +mod_id=baseelectric +mod_name=baseElectric mod_license=GPL-3.0-only -mod_version=2.2.5.110021 -mod_group=zone.moddev.mc.electricadvantage +mod_version=2.2.6.110021 +mod_group=zone.moddev.mc.baseelectric mod_authors=DrCyano -mod_description=Electrical generation, storage, and machines for the Power Advantage platform. +mod_description=Electrical generation, storage, and machines for the basePower platform. -cf_requirements=power-advantage,base-metals,mmd-orespawn +cf_requirements=basepower,base-metals,mmd-orespawn 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 23ff1c3..cea1b34 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 = 'ElectricAdvantage' +rootProject.name = 'baseElectric' diff --git a/src/main/java/zone/moddev/mc/electricadvantage/Data.java b/src/main/java/zone/moddev/mc/baseelectric/Data.java similarity index 81% rename from src/main/java/zone/moddev/mc/electricadvantage/Data.java rename to src/main/java/zone/moddev/mc/baseelectric/Data.java index 3ba07f7..dddd5ba 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/Data.java +++ b/src/main/java/zone/moddev/mc/baseelectric/Data.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage; +package zone.moddev.mc.baseelectric; public abstract class Data { @@ -9,7 +9,7 @@ public abstract class Data { + " \"dimension\":\"+\",\n" + " \"ores\":[\n" + " {\n" -+ " \"blockID\":\"electricadvantage:li_ore\",\n" ++ " \"blockID\":\"baseelectric:li_ore\",\n" + " \"size\":8,\n" + " \"variation\":2,\n" + " \"frequency\":0.125,\n" @@ -17,7 +17,7 @@ public abstract class Data { + " \"maxHeight\":32,\n" + " \"biomes\":[]\n" + " },{\n" -+ " \"blockID\":\"electricadvantage:sulfur_ore\",\n" ++ " \"blockID\":\"baseelectric:sulfur_ore\",\n" + " \"size\":16,\n" + " \"variation\":8,\n" + " \"frequency\":1,\n" diff --git a/src/main/java/zone/moddev/mc/electricadvantage/ElectricAdvantage.java b/src/main/java/zone/moddev/mc/baseelectric/ElectricAdvantage.java similarity index 81% rename from src/main/java/zone/moddev/mc/electricadvantage/ElectricAdvantage.java rename to src/main/java/zone/moddev/mc/baseelectric/ElectricAdvantage.java index ea42d05..b0ee092 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/ElectricAdvantage.java +++ b/src/main/java/zone/moddev/mc/baseelectric/ElectricAdvantage.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.electricadvantage; +package zone.moddev.mc.baseelectric; -import zone.moddev.mc.electricadvantage.init.*; -import zone.moddev.mc.electricadvantage.util.crafting.RecipeDeconstructor; +import zone.moddev.mc.baseelectric.init.*; +import zone.moddev.mc.baseelectric.util.crafting.RecipeDeconstructor; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.Mod; @@ -9,6 +9,8 @@ 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 zone.moddev.mc.basepower.compat.LegacyIdentity; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -17,15 +19,16 @@ import java.util.Set; @Mod(modid = ElectricAdvantage.MODID, version = ElectricAdvantage.VERSION, name=ElectricAdvantage.NAME, - dependencies = "required-after:orespawn@[4.0.6,5.0.0);required-after:poweradvantage@[2.4.3.110021,);after:basemetals", + dependencies = "required-after:orespawn@[4.0.6,5.0.0);required-after:basepower@[2.4.4.110021,);after:basemetals", acceptedMinecraftVersions = "[1.10.2,)") public class ElectricAdvantage {/** The identifier for this mod */ - public static final String MODID = "electricadvantage"; + public static final String MODID = "baseelectric"; + public static final String LEGACY_MODID = "electricadvantage"; /** The display name for this mod */ - public static final String NAME = "Electric Advantage"; + public static final String NAME = "baseElectric"; /** The version of this mod, in the format major.minor.update */ - public static final String VERSION = "2.2.5.110021"; + public static final String VERSION = "2.2.6.110021"; public static ElectricAdvantage INSTANCE = null; @@ -43,7 +46,8 @@ public class ElectricAdvantage public void preInit(FMLPreInitializationEvent event) { INSTANCE = this; - Configuration config = new Configuration(event.getSuggestedConfigurationFile()); + Configuration config = new Configuration(LegacyIdentity.migrateConfiguration( + event.getSuggestedConfigurationFile(), LEGACY_MODID)); config.load(); RecipeDeconstructor.RECURSION_LIMIT = config.getInt("recursion_limit", "fabricator", RecipeDeconstructor.RECURSION_LIMIT, @@ -65,6 +69,7 @@ public void preInit(FMLPreInitializationEvent event) Blocks.init(); Items.init(); OreSpawnWorldGen.register(config.getConfigFile().toPath().getParent()); + LegacyIdentity.migrateAdditionalLootTables(config.getConfigFile().toPath().getParent(), LEGACY_MODID, MODID); TreasureChests.init(config.getConfigFile().toPath().getParent()); @@ -76,6 +81,11 @@ public void preInit(FMLPreInitializationEvent event) } } + @EventHandler + public void missingMappings(FMLMissingMappingsEvent event) { + LegacyIdentity.remapMissingMappings(event, LEGACY_MODID, MODID); + } + @SideOnly(Side.CLIENT) private void clientPreInit(FMLPreInitializationEvent event){ // client-only code diff --git a/src/main/java/zone/moddev/mc/electricadvantage/blocks/ElectricConduitBlock.java b/src/main/java/zone/moddev/mc/baseelectric/blocks/ElectricConduitBlock.java similarity index 71% rename from src/main/java/zone/moddev/mc/electricadvantage/blocks/ElectricConduitBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/blocks/ElectricConduitBlock.java index 957724b..681ac0e 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/blocks/ElectricConduitBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/blocks/ElectricConduitBlock.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.electricadvantage.blocks; +package zone.moddev.mc.baseelectric.blocks; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import net.minecraft.block.material.Material; public class ElectricConduitBlock extends cyano.poweradvantage.api.simple.BlockSimplePowerConduit{ diff --git a/src/main/java/zone/moddev/mc/electricadvantage/blocks/ElectricScaffoldBlock.java b/src/main/java/zone/moddev/mc/baseelectric/blocks/ElectricScaffoldBlock.java similarity index 93% rename from src/main/java/zone/moddev/mc/electricadvantage/blocks/ElectricScaffoldBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/blocks/ElectricScaffoldBlock.java index 319fac4..a71fbe7 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/blocks/ElectricScaffoldBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/blocks/ElectricScaffoldBlock.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.electricadvantage.blocks; +package zone.moddev.mc.baseelectric.blocks; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.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/electricadvantage/blocks/Ore.java b/src/main/java/zone/moddev/mc/baseelectric/blocks/Ore.java similarity index 97% rename from src/main/java/zone/moddev/mc/electricadvantage/blocks/Ore.java rename to src/main/java/zone/moddev/mc/baseelectric/blocks/Ore.java index def632c..b065c0f 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/blocks/Ore.java +++ b/src/main/java/zone/moddev/mc/baseelectric/blocks/Ore.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.blocks; +package zone.moddev.mc.baseelectric.blocks; import net.minecraft.block.Block; import net.minecraft.block.SoundType; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/blocks/PumpPipeBlock.java b/src/main/java/zone/moddev/mc/baseelectric/blocks/PumpPipeBlock.java similarity index 98% rename from src/main/java/zone/moddev/mc/electricadvantage/blocks/PumpPipeBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/blocks/PumpPipeBlock.java index 14603f2..0a23813 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/blocks/PumpPipeBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/blocks/PumpPipeBlock.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.blocks; +package zone.moddev.mc.baseelectric.blocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/common/IRechargeableItem.java b/src/main/java/zone/moddev/mc/baseelectric/common/IRechargeableItem.java similarity index 92% rename from src/main/java/zone/moddev/mc/electricadvantage/common/IRechargeableItem.java rename to src/main/java/zone/moddev/mc/baseelectric/common/IRechargeableItem.java index df24562..27285ee 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/common/IRechargeableItem.java +++ b/src/main/java/zone/moddev/mc/baseelectric/common/IRechargeableItem.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.common; +package zone.moddev.mc.baseelectric.common; import cyano.poweradvantage.api.ConduitType; import net.minecraft.item.ItemStack; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/compat/BaseMetalsCompat.java b/src/main/java/zone/moddev/mc/baseelectric/compat/BaseMetalsCompat.java similarity index 98% rename from src/main/java/zone/moddev/mc/electricadvantage/compat/BaseMetalsCompat.java rename to src/main/java/zone/moddev/mc/baseelectric/compat/BaseMetalsCompat.java index 0deaec7..1ad2f00 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/compat/BaseMetalsCompat.java +++ b/src/main/java/zone/moddev/mc/baseelectric/compat/BaseMetalsCompat.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.electricadvantage.compat; +package zone.moddev.mc.baseelectric.compat; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; +import zone.moddev.mc.baseelectric.ElectricAdvantage; 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/electricadvantage/entities/HydroturbineEntity.java b/src/main/java/zone/moddev/mc/baseelectric/entities/HydroturbineEntity.java similarity index 95% rename from src/main/java/zone/moddev/mc/electricadvantage/entities/HydroturbineEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/entities/HydroturbineEntity.java index 6e4187a..d57c43d 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/entities/HydroturbineEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/entities/HydroturbineEntity.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.electricadvantage.entities; +package zone.moddev.mc.baseelectric.entities; -import zone.moddev.mc.electricadvantage.init.Power; -import zone.moddev.mc.electricadvantage.machines.HydroelectricGeneratorTileEntity; +import zone.moddev.mc.baseelectric.init.Power; +import zone.moddev.mc.baseelectric.machines.HydroelectricGeneratorTileEntity; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/graphics/HydroturbineRenderer.java b/src/main/java/zone/moddev/mc/baseelectric/graphics/HydroturbineRenderer.java similarity index 98% rename from src/main/java/zone/moddev/mc/electricadvantage/graphics/HydroturbineRenderer.java rename to src/main/java/zone/moddev/mc/baseelectric/graphics/HydroturbineRenderer.java index b1f18c6..57cdd40 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/graphics/HydroturbineRenderer.java +++ b/src/main/java/zone/moddev/mc/baseelectric/graphics/HydroturbineRenderer.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.electricadvantage.graphics; +package zone.moddev.mc.baseelectric.graphics; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.entities.HydroturbineEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.entities.HydroturbineEntity; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/graphics/LaserDrillRenderer.java b/src/main/java/zone/moddev/mc/baseelectric/graphics/LaserDrillRenderer.java similarity index 96% rename from src/main/java/zone/moddev/mc/electricadvantage/graphics/LaserDrillRenderer.java rename to src/main/java/zone/moddev/mc/baseelectric/graphics/LaserDrillRenderer.java index a490e1f..6a2f6b1 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/graphics/LaserDrillRenderer.java +++ b/src/main/java/zone/moddev/mc/baseelectric/graphics/LaserDrillRenderer.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.electricadvantage.graphics; +package zone.moddev.mc.baseelectric.graphics; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.machines.ElectricDrillTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricDrillTileEntity; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/graphics/LaserTurretRenderer.java b/src/main/java/zone/moddev/mc/baseelectric/graphics/LaserTurretRenderer.java similarity index 97% rename from src/main/java/zone/moddev/mc/electricadvantage/graphics/LaserTurretRenderer.java rename to src/main/java/zone/moddev/mc/baseelectric/graphics/LaserTurretRenderer.java index a4149ad..13c2009 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/graphics/LaserTurretRenderer.java +++ b/src/main/java/zone/moddev/mc/baseelectric/graphics/LaserTurretRenderer.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.electricadvantage.graphics; +package zone.moddev.mc.baseelectric.graphics; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.machines.LaserTurretTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.LaserTurretTileEntity; 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/electricadvantage/gui/ArcFurnaceGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/ArcFurnaceGUI.java similarity index 91% rename from src/main/java/zone/moddev/mc/electricadvantage/gui/ArcFurnaceGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/ArcFurnaceGUI.java index dbf06f3..21600dd 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/gui/ArcFurnaceGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/ArcFurnaceGUI.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.machines.ElectricMachineTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricMachineTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; +import zone.moddev.mc.basepower.math.Integer2D; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/gui/BatteryArrayGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/BatteryArrayGUI.java similarity index 89% rename from src/main/java/zone/moddev/mc/electricadvantage/gui/BatteryArrayGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/BatteryArrayGUI.java index 1b0d002..da24046 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/gui/BatteryArrayGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/BatteryArrayGUI.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.machines.ElectricBatteryArrayTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricBatteryArrayTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; +import zone.moddev.mc.basepower.math.Integer2D; import net.minecraft.util.ResourceLocation; public class BatteryArrayGUI extends SimpleMachineGUI{ diff --git a/src/main/java/zone/moddev/mc/electricadvantage/gui/ElectricDrillGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/ElectricDrillGUI.java similarity index 88% rename from src/main/java/zone/moddev/mc/electricadvantage/gui/ElectricDrillGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/ElectricDrillGUI.java index ab17995..306282e 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/gui/ElectricDrillGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/ElectricDrillGUI.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.machines.ElectricMachineTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricMachineTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; +import zone.moddev.mc.basepower.math.Integer2D; import net.minecraft.util.ResourceLocation; public class ElectricDrillGUI extends SimpleMachineGUI{ diff --git a/src/main/java/zone/moddev/mc/electricadvantage/gui/ElectricPumpGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/ElectricPumpGUI.java similarity index 89% rename from src/main/java/zone/moddev/mc/electricadvantage/gui/ElectricPumpGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/ElectricPumpGUI.java index 3db5a65..3ae164d 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/gui/ElectricPumpGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/ElectricPumpGUI.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.machines.ElectricPumpTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricPumpTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; +import zone.moddev.mc.basepower.math.Integer2D; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/gui/ElectricStillGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/ElectricStillGUI.java similarity index 90% rename from src/main/java/zone/moddev/mc/electricadvantage/gui/ElectricStillGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/ElectricStillGUI.java index 222279b..c7e4c4b 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/gui/ElectricStillGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/ElectricStillGUI.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.machines.ElectricStillTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricStillTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; +import zone.moddev.mc.basepower.math.Integer2D; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/gui/FabricatorGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/FabricatorGUI.java similarity index 91% rename from src/main/java/zone/moddev/mc/electricadvantage/gui/FabricatorGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/FabricatorGUI.java index fd14c0e..d28a6c0 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/gui/FabricatorGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/FabricatorGUI.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.machines.ElectricMachineTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricMachineTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; +import zone.moddev.mc.basepower.math.Integer2D; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/gui/GUIHelper.java b/src/main/java/zone/moddev/mc/baseelectric/gui/GUIHelper.java similarity index 94% rename from src/main/java/zone/moddev/mc/electricadvantage/gui/GUIHelper.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/GUIHelper.java index b7b451c..1d075c9 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/gui/GUIHelper.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/GUIHelper.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.electricadvantage.gui; +package zone.moddev.mc.baseelectric.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.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/gui/GenericMachineGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/GenericMachineGUI.java similarity index 88% rename from src/main/java/zone/moddev/mc/electricadvantage/gui/GenericMachineGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/GenericMachineGUI.java index 33f854c..173d4a2 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/gui/GenericMachineGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/GenericMachineGUI.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.machines.ElectricMachineTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricMachineTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; +import zone.moddev.mc.basepower.math.Integer2D; import net.minecraft.util.ResourceLocation; public class GenericMachineGUI extends SimpleMachineGUI{ diff --git a/src/main/java/zone/moddev/mc/electricadvantage/gui/GrowthChamberControllerGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/GrowthChamberControllerGUI.java similarity index 88% rename from src/main/java/zone/moddev/mc/electricadvantage/gui/GrowthChamberControllerGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/GrowthChamberControllerGUI.java index 9e5eae6..e7a9549 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/gui/GrowthChamberControllerGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/GrowthChamberControllerGUI.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.machines.GrowthChamberControllerTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.GrowthChamberControllerTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; +import zone.moddev.mc.basepower.math.Integer2D; import net.minecraft.util.ResourceLocation; public class GrowthChamberControllerGUI extends SimpleMachineGUI{ diff --git a/src/main/java/zone/moddev/mc/electricadvantage/gui/GrowthChamberGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/GrowthChamberGUI.java similarity index 88% rename from src/main/java/zone/moddev/mc/electricadvantage/gui/GrowthChamberGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/GrowthChamberGUI.java index 8cdb6e9..2d66521 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/gui/GrowthChamberGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/GrowthChamberGUI.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.machines.ElectricMachineTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricMachineTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; +import zone.moddev.mc.basepower.math.Integer2D; import net.minecraft.util.ResourceLocation; public class GrowthChamberGUI extends SimpleMachineGUI{ diff --git a/src/main/java/zone/moddev/mc/electricadvantage/gui/OvenGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/OvenGUI.java similarity index 90% rename from src/main/java/zone/moddev/mc/electricadvantage/gui/OvenGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/OvenGUI.java index a34a65f..174a206 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/gui/OvenGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/OvenGUI.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.machines.ElectricMachineTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricMachineTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; +import zone.moddev.mc.basepower.math.Integer2D; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/gui/PlasticRefineryGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/PlasticRefineryGUI.java similarity index 89% rename from src/main/java/zone/moddev/mc/electricadvantage/gui/PlasticRefineryGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/PlasticRefineryGUI.java index 065604e..4c4630b 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/gui/PlasticRefineryGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/PlasticRefineryGUI.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.machines.PlasticRefineryTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.PlasticRefineryTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; +import zone.moddev.mc.basepower.math.Integer2D; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/gui/PowerGeneratorGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/PowerGeneratorGUI.java similarity index 87% rename from src/main/java/zone/moddev/mc/electricadvantage/gui/PowerGeneratorGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/PowerGeneratorGUI.java index 582d2ac..cdc516b 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/gui/PowerGeneratorGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/PowerGeneratorGUI.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.machines.ElectricGeneratorTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricGeneratorTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; +import zone.moddev.mc.basepower.math.Integer2D; import net.minecraft.util.ResourceLocation; public class PowerGeneratorGUI extends SimpleMachineGUI{ diff --git a/src/main/java/zone/moddev/mc/electricadvantage/gui/RockCrusherGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/RockCrusherGUI.java similarity index 88% rename from src/main/java/zone/moddev/mc/electricadvantage/gui/RockCrusherGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/RockCrusherGUI.java index 36ffa77..df67c51 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/gui/RockCrusherGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/RockCrusherGUI.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.machines.ElectricMachineTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricMachineTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import zone.moddev.mc.poweradvantage.math.Integer2D; +import zone.moddev.mc.basepower.math.Integer2D; import net.minecraft.util.ResourceLocation; public class RockCrusherGUI extends SimpleMachineGUI{ diff --git a/src/main/java/zone/moddev/mc/electricadvantage/init/Blocks.java b/src/main/java/zone/moddev/mc/baseelectric/init/Blocks.java similarity index 89% rename from src/main/java/zone/moddev/mc/electricadvantage/init/Blocks.java rename to src/main/java/zone/moddev/mc/baseelectric/init/Blocks.java index 6bbfd1c..b9be39b 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/init/Blocks.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/Blocks.java @@ -1,13 +1,13 @@ -package zone.moddev.mc.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.blocks.ElectricConduitBlock; -import zone.moddev.mc.electricadvantage.blocks.ElectricScaffoldBlock; -import zone.moddev.mc.electricadvantage.blocks.Ore; -import zone.moddev.mc.electricadvantage.blocks.PumpPipeBlock; -import zone.moddev.mc.electricadvantage.machines.*; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.blocks.ElectricConduitBlock; +import zone.moddev.mc.baseelectric.blocks.ElectricScaffoldBlock; +import zone.moddev.mc.baseelectric.blocks.Ore; +import zone.moddev.mc.baseelectric.blocks.PumpPipeBlock; +import zone.moddev.mc.baseelectric.machines.*; import cyano.poweradvantage.api.GUIBlock; -import zone.moddev.mc.poweradvantage.blocks.BlockPowerSwitch; +import zone.moddev.mc.basepower.blocks.BlockPowerSwitch; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -104,7 +104,7 @@ public static void init(){ private static Block addBlock(Block block, String name, String... oreDictNames){ block.setUnlocalizedName(ElectricAdvantage.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); for(String oreName : oreDictNames){ OreDictionary.registerOre(oreName, block); diff --git a/src/main/java/zone/moddev/mc/electricadvantage/init/Enchantments.java b/src/main/java/zone/moddev/mc/baseelectric/init/Enchantments.java similarity index 61% rename from src/main/java/zone/moddev/mc/electricadvantage/init/Enchantments.java rename to src/main/java/zone/moddev/mc/baseelectric/init/Enchantments.java index 29f3719..b5e4d35 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/init/Enchantments.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/Enchantments.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; -//import zone.moddev.mc.electricadvantage.enchanments.*; +//import zone.moddev.mc.baseelectric.enchanments.*; public abstract class Enchantments { diff --git a/src/main/java/zone/moddev/mc/electricadvantage/init/Entities.java b/src/main/java/zone/moddev/mc/baseelectric/init/Entities.java similarity index 63% rename from src/main/java/zone/moddev/mc/electricadvantage/init/Entities.java rename to src/main/java/zone/moddev/mc/baseelectric/init/Entities.java index ecf1429..eccbdb7 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/init/Entities.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/Entities.java @@ -1,15 +1,18 @@ -package zone.moddev.mc.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.entities.*; -import zone.moddev.mc.electricadvantage.graphics.*; -import zone.moddev.mc.electricadvantage.machines.*; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.entities.*; +import zone.moddev.mc.baseelectric.graphics.*; +import zone.moddev.mc.baseelectric.machines.*; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.tileentity.TileEntity; +import zone.moddev.mc.basepower.compat.LegacyIdentity; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.registry.EntityRegistry; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -48,23 +51,39 @@ public static void init(){ - private static void registerTileEntity(Class tileEntityClass){ + static void registerTileEntity(Class tileEntityClass){ String name = tileEntityClass.getSimpleName(); if(name.endsWith("TileEntity")){ name = name.substring(0, name.lastIndexOf("TileEntity")); } - GameRegistry.registerTileEntity(tileEntityClass,ElectricAdvantage.MODID+"."+toUnderscoreStyle(name)); + String suffix = "." + toUnderscoreStyle(name); + LegacyIdentity.registerTileEntity(tileEntityClass, ElectricAdvantage.MODID + suffix, + ElectricAdvantage.LEGACY_MODID + suffix); } private static int entityIndex = 0; - private static void registerEntity(Class entityClass) { - String name=ElectricAdvantage.MODID+"."+entityClass.getSimpleName(); + private static void registerEntity(Class entityClass) { + String name=entityClass.getSimpleName(); if(name.endsWith("Entity")){ name = name.substring(0, name.lastIndexOf("Entity")); } else if(name.startsWith("Entity")){ name = name.substring("Entity".length(),name.length()); } EntityRegistry.registerModEntity(entityClass, name, entityIndex++, ElectricAdvantage.INSTANCE, 64, 1, true); + registerHydroturbineAliases(); + } + + static void registerHydroturbineAliases() { + String[] oldIds = {"electricadvantage.electricadvantage.Hydroturbine", + "electricadvantage.Hydroturbine"}; + for (String oldId : oldIds) { + Class previous = EntityList.NAME_TO_CLASS.get(oldId); + if (previous != null && previous != HydroturbineEntity.class) { + throw new IllegalStateException("Legacy entity ID is already owned: " + oldId); + } + } + // Read aliases only. Forge's canonical class-to-name entry controls new saves. + for (String oldId : oldIds) EntityList.NAME_TO_CLASS.put(oldId, HydroturbineEntity.class); } private static String toUnderscoreStyle(String camelCase){ @@ -85,8 +104,8 @@ private static String toUnderscoreStyle(String camelCase){ public static void registerRenderers(){ RenderManager rm = Minecraft.getMinecraft().getRenderManager(); - ClientRegistry.bindTileEntitySpecialRenderer(LaserTurretTileEntity.class, new zone.moddev.mc.electricadvantage.graphics.LaserTurretRenderer()); - ClientRegistry.bindTileEntitySpecialRenderer(ElectricDrillTileEntity.class, new zone.moddev.mc.electricadvantage.graphics.LaserDrillRenderer()); + ClientRegistry.bindTileEntitySpecialRenderer(LaserTurretTileEntity.class, new zone.moddev.mc.baseelectric.graphics.LaserTurretRenderer()); + ClientRegistry.bindTileEntitySpecialRenderer(ElectricDrillTileEntity.class, new zone.moddev.mc.baseelectric.graphics.LaserDrillRenderer()); RenderingRegistry.registerEntityRenderingHandler(HydroturbineEntity.class,new HydroturbineRenderer(rm)); } diff --git a/src/main/java/zone/moddev/mc/electricadvantage/init/GUI.java b/src/main/java/zone/moddev/mc/baseelectric/init/GUI.java similarity index 90% rename from src/main/java/zone/moddev/mc/electricadvantage/init/GUI.java rename to src/main/java/zone/moddev/mc/baseelectric/init/GUI.java index 9c0e04c..aabc089 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/init/GUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/GUI.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; -import zone.moddev.mc.poweradvantage.PowerAdvantage; -import zone.moddev.mc.poweradvantage.registry.MachineGUIRegistry; -import zone.moddev.mc.electricadvantage.gui.*; +import zone.moddev.mc.basepower.PowerAdvantage; +import zone.moddev.mc.basepower.registry.MachineGUIRegistry; +import zone.moddev.mc.baseelectric.gui.*; public abstract class GUI { diff --git a/src/main/java/zone/moddev/mc/electricadvantage/init/Items.java b/src/main/java/zone/moddev/mc/baseelectric/init/Items.java similarity index 93% rename from src/main/java/zone/moddev/mc/electricadvantage/init/Items.java rename to src/main/java/zone/moddev/mc/baseelectric/init/Items.java index 82cee12..96aa6e7 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/init/Items.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/Items.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.items.BatteryItem; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.items.BatteryItem; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; @@ -78,7 +78,7 @@ private static Item addItem(String unlocalizedName, Item i,String... oreDictName private static Item addItem(String unlocalizedName, Item i){ i.setUnlocalizedName(ElectricAdvantage.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/electricadvantage/init/OreSpawnWorldGen.java b/src/main/java/zone/moddev/mc/baseelectric/init/OreSpawnWorldGen.java similarity index 80% rename from src/main/java/zone/moddev/mc/electricadvantage/init/OreSpawnWorldGen.java rename to src/main/java/zone/moddev/mc/baseelectric/init/OreSpawnWorldGen.java index cd79286..a8ece87 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/init/OreSpawnWorldGen.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/OreSpawnWorldGen.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; +import zone.moddev.mc.baseelectric.ElectricAdvantage; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.Loader; @@ -8,11 +8,13 @@ import zone.moddev.mc.orespawn.api.OrePattern; import zone.moddev.mc.orespawn.api.OreSpawnApi; import zone.moddev.mc.orespawn.api.WorldgenProvider; +import zone.moddev.mc.basepower.compat.LegacyWorldgenIdentity; +import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -/** Registers ElectricAdvantage's fallback mineral rules with OreSpawn 4. */ +/** Registers baseElectric's fallback mineral rules with OreSpawn 4. */ public final class OreSpawnWorldGen { public static final ResourceLocation LITHIUM_ORE = new ResourceLocation(ElectricAdvantage.MODID, "ore/lithium"); @@ -26,14 +28,15 @@ private OreSpawnWorldGen() { } public static void register(Path configDirectory) { + migrateConfiguration(configDirectory); boolean mineralogyLoaded = Loader.isModLoaded("mineralogy"); boolean baseMineralsLoaded = Loader.isModLoaded("baseminerals"); boolean accepted = OreSpawnApi.enqueue(createProvider(mineralogyLoaded, baseMineralsLoaded)); String sulfurOwner = mineralogyLoaded ? "mineralogy" : baseMineralsLoaded ? "baseminerals" : ElectricAdvantage.MODID; String lithiumOwner = baseMineralsLoaded ? "baseminerals" : ElectricAdvantage.MODID; - FMLLog.info("%s: OreSpawn sulfur candidates=[mineralogy, baseminerals, electricadvantage], " - + "selected fresh-world owner=%s; lithium candidates=[baseminerals, electricadvantage], " + FMLLog.info("%s: OreSpawn sulfur candidates=[mineralogy, baseminerals, baseelectric], " + + "selected fresh-world owner=%s; lithium candidates=[baseminerals, baseelectric], " + "selected fresh-world owner=%s; explicit override=%s", ElectricAdvantage.MODID, sulfurOwner, lithiumOwner, describeOverride(configDirectory)); if (!accepted) { @@ -42,6 +45,16 @@ public static void register(Path configDirectory) { } } + static int migrateConfiguration(Path configDirectory) { + try { + // basePower already migrates both owners before OreSpawn preInit reads profiles. + return LegacyWorldgenIdentity.migrateConfig(configDirectory, + ElectricAdvantage.LEGACY_MODID, ElectricAdvantage.MODID); + } catch (IOException failure) { + throw new IllegalStateException("baseElectric cannot safely migrate its OreSpawn configuration", failure); + } + } + public static WorldgenProvider createProvider(boolean mineralogyLoaded, boolean baseMineralsLoaded) { boolean electricSulfurEnabled = !mineralogyLoaded && !baseMineralsLoaded; boolean electricLithiumEnabled = !baseMineralsLoaded; @@ -86,6 +99,10 @@ static String describeOverride(Path configDirectory) { .resolve(ElectricAdvantage.MODID + ".json"))) { return "config/orespawn/" + ElectricAdvantage.MODID + ".json (legacy importer authority)"; } + if (Files.isRegularFile(configDirectory.resolve("orespawn3") + .resolve(ElectricAdvantage.MODID + ".json"))) { + return "config/orespawn3/" + ElectricAdvantage.MODID + ".json (legacy importer authority)"; + } return "none"; } -} \ No newline at end of file +} diff --git a/src/main/java/zone/moddev/mc/electricadvantage/init/Power.java b/src/main/java/zone/moddev/mc/baseelectric/init/Power.java similarity index 95% rename from src/main/java/zone/moddev/mc/electricadvantage/init/Power.java rename to src/main/java/zone/moddev/mc/baseelectric/init/Power.java index 7f676c9..74721f5 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/init/Power.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/Power.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; import net.minecraft.util.DamageSource; import cyano.poweradvantage.api.ConduitType; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/init/Recipes.java b/src/main/java/zone/moddev/mc/baseelectric/init/Recipes.java similarity index 96% rename from src/main/java/zone/moddev/mc/electricadvantage/init/Recipes.java rename to src/main/java/zone/moddev/mc/baseelectric/init/Recipes.java index ce9e3ed..17278ae 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/init/Recipes.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/Recipes.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; -import zone.moddev.mc.electricadvantage.compat.BaseMetalsCompat; -import zone.moddev.mc.poweradvantage.PowerAdvantage; -import zone.moddev.mc.poweradvantage.RecipeMode; +import zone.moddev.mc.baseelectric.compat.BaseMetalsCompat; +import zone.moddev.mc.basepower.PowerAdvantage; +import zone.moddev.mc.basepower.RecipeMode; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -51,7 +51,7 @@ public static void init(){ GameRegistry.addRecipe(batteryRecipe(Items.alkaline_battery,"ingotIron","gunpowder","ingotZinc")); GameRegistry.addRecipe(batteryRecipe(Items.lithium_battery,"ingotLithium","dustRedstone","dustCarbon")); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Blocks.electric_track,1),Blocks.electric_conduit, zone.moddev.mc.poweradvantage.init.Blocks.steel_frame)); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Blocks.electric_track,1),Blocks.electric_conduit, zone.moddev.mc.basepower.init.Blocks.steel_frame)); // non-apocalyctic recipes (high-tech machines cannot be crafted in post-apocalyspe mode) if(recipeMode != RecipeMode.APOCALYPTIC){ diff --git a/src/main/java/zone/moddev/mc/electricadvantage/init/TreasureChests.java b/src/main/java/zone/moddev/mc/baseelectric/init/TreasureChests.java similarity index 88% rename from src/main/java/zone/moddev/mc/electricadvantage/init/TreasureChests.java rename to src/main/java/zone/moddev/mc/baseelectric/init/TreasureChests.java index 3d8febc..9fc381e 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/init/TreasureChests.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/TreasureChests.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; +import zone.moddev.mc.baseelectric.ElectricAdvantage; import net.minecraftforge.fml.common.FMLLog; import org.apache.logging.log4j.Level; @@ -30,6 +30,7 @@ public static void init(Path configFolder){ private static void writeLootFile(Path file, String content){ try { + if (Files.exists(file)) return; Files.createDirectories(file.getParent()); Files.write(file, Arrays.asList(content), Charset.forName("UTF-8")); } catch (IOException e) { @@ -41,7 +42,7 @@ private static void writeLootFile(Path file, String content){ private static final String LOOT_POOL = "{\n" + " \"pools\": [\n" + " {\n" + - " \"__comment\":\"25% chance of a Electric Advantage item\",\n" + + " \"__comment\":\"25% chance of a baseElectric item\",\n" + " \"rolls\": 1,\n" + " \"entries\": [\n" + " {\n" + @@ -50,7 +51,7 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"electricadvantage:psu\",\n" + + " \"name\": \"baseelectric:psu\",\n" + " \"weight\": 6,\n" + " \"functions\": [\n" + " {\n" + @@ -64,7 +65,7 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"electricadvantage:electric_conduit\",\n" + + " \"name\": \"baseelectric:electric_conduit\",\n" + " \"weight\": 12,\n" + " \"functions\": [\n" + " {\n" + @@ -78,7 +79,7 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"electricadvantage:led_bar\",\n" + + " \"name\": \"baseelectric:led_bar\",\n" + " \"weight\": 6,\n" + " \"functions\": [\n" + " {\n" + @@ -92,7 +93,7 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"electricadvantage:solder\",\n" + + " \"name\": \"baseelectric:solder\",\n" + " \"weight\": 6,\n" + " \"functions\": [\n" + " {\n" + @@ -106,7 +107,7 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"electricadvantage:integrated_circuit\",\n" + + " \"name\": \"baseelectric:integrated_circuit\",\n" + " \"weight\": 3,\n" + " \"functions\": [\n" + " {\n" + @@ -120,7 +121,7 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"electricadvantage:lead_acid_battery\",\n" + + " \"name\": \"baseelectric:lead_acid_battery\",\n" + " \"weight\": 8,\n" + " \"functions\": [\n" + " {\n" + @@ -134,7 +135,7 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"electricadvantage:nickel_hydride_battery\",\n" + + " \"name\": \"baseelectric:nickel_hydride_battery\",\n" + " \"weight\": 4,\n" + " \"functions\": [\n" + " {\n" + @@ -148,7 +149,7 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"electricadvantage:alkaline_battery\",\n" + + " \"name\": \"baseelectric:alkaline_battery\",\n" + " \"weight\": 2,\n" + " \"functions\": [\n" + " {\n" + @@ -162,7 +163,7 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"electricadvantage:lithium_battery\",\n" + + " \"name\": \"baseelectric:lithium_battery\",\n" + " \"weight\": 1,\n" + " \"functions\": [\n" + " {\n" + @@ -178,4 +179,4 @@ private static void writeLootFile(Path file, String content){ " }\n" + " ]\n" + "}\n"; -} \ No newline at end of file +} diff --git a/src/main/java/zone/moddev/mc/electricadvantage/init/Villages.java b/src/main/java/zone/moddev/mc/baseelectric/init/Villages.java similarity index 97% rename from src/main/java/zone/moddev/mc/electricadvantage/init/Villages.java rename to src/main/java/zone/moddev/mc/baseelectric/init/Villages.java index 24ae74c..6993c77 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/init/Villages.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/Villages.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.item.Item; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/items/BatteryItem.java b/src/main/java/zone/moddev/mc/baseelectric/items/BatteryItem.java similarity index 95% rename from src/main/java/zone/moddev/mc/electricadvantage/items/BatteryItem.java rename to src/main/java/zone/moddev/mc/baseelectric/items/BatteryItem.java index a96b678..cfe24f6 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/items/BatteryItem.java +++ b/src/main/java/zone/moddev/mc/baseelectric/items/BatteryItem.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.electricadvantage.items; +package zone.moddev.mc.baseelectric.items; -import zone.moddev.mc.electricadvantage.common.IRechargeableItem; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.common.IRechargeableItem; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricBatteryArrayBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricBatteryArrayBlock.java similarity index 89% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricBatteryArrayBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricBatteryArrayBlock.java index 9ddf934..3e2c41d 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricBatteryArrayBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricBatteryArrayBlock.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import cyano.poweradvantage.api.ConduitType; import net.minecraft.world.World; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricBatteryArrayTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricBatteryArrayTileEntity.java similarity index 95% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricBatteryArrayTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricBatteryArrayTileEntity.java index 4e93438..6ec6c5e 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricBatteryArrayTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricBatteryArrayTileEntity.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.common.IRechargeableItem; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.common.IRechargeableItem; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerRequest; import net.minecraft.item.Item; @@ -11,7 +11,7 @@ public class ElectricBatteryArrayTileEntity extends ElectricGeneratorTileEntity{ public ElectricBatteryArrayTileEntity(){ - super("tile.electricadvantage.electric_battery_array.name",8); + super("tile.baseelectric.electric_battery_array.name",8); } diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricCrusherBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricCrusherBlock.java similarity index 88% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricCrusherBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricCrusherBlock.java index 718671c..24c4d94 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricCrusherBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricCrusherBlock.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraft.world.World; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricCrusherTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricCrusherTileEntity.java similarity index 94% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricCrusherTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricCrusherTileEntity.java index 5c613fa..7f28101 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricCrusherTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricCrusherTileEntity.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.compat.BaseMetalsCompat; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.compat.BaseMetalsCompat; +import zone.moddev.mc.baseelectric.init.Power; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -22,7 +22,7 @@ public class ElectricCrusherTileEntity extends ElectricMachineTileEntity{ public ElectricCrusherTileEntity() { - super("tile.electricadvantage.electric_crusher.name", + super("tile.baseelectric.electric_crusher.name", 3, 6, 0); Arrays.fill(smashTime, (short)0); } diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricDrillBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricDrillBlock.java similarity index 97% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricDrillBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricDrillBlock.java index 6e83684..898c738 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricDrillBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricDrillBlock.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.*; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricDrillTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricDrillTileEntity.java similarity index 96% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricDrillTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricDrillTileEntity.java index f903cf3..cd9aa5e 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricDrillTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricDrillTileEntity.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.init.Blocks; -import zone.moddev.mc.electricadvantage.init.Power; -import zone.moddev.mc.poweradvantage.util.InventoryWrapper; +import zone.moddev.mc.baseelectric.init.Blocks; +import zone.moddev.mc.baseelectric.init.Power; +import zone.moddev.mc.basepower.util.InventoryWrapper; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -46,7 +46,7 @@ public class ElectricDrillTileEntity extends ElectricMachineTileEntity{ private boolean deferred = false; public ElectricDrillTileEntity() { - super("tile.electricadvantage.electric_drill.name", + super("tile.baseelectric.electric_drill.name", 0, 6, 0); } @@ -158,7 +158,7 @@ private boolean followTrack(){ Arrays.fill(this.getInventory(), null); // replace this block with steam pipe - w.setBlockState(getPos().offset(getFacing()), zone.moddev.mc.poweradvantage.init.Blocks.steel_frame.getDefaultState()); + w.setBlockState(getPos().offset(getFacing()), zone.moddev.mc.basepower.init.Blocks.steel_frame.getDefaultState()); w.setBlockState(getPos(), Blocks.electric_conduit.getDefaultState(), 2); @@ -243,7 +243,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(getWorld(), getWorld().provider.getDimension(), getPos(), getType()); return; } diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricFabricatorBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFabricatorBlock.java similarity index 82% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricFabricatorBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFabricatorBlock.java index a3ac6c6..1bf7e97 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricFabricatorBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFabricatorBlock.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraft.world.World; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricFabricatorTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFabricatorTileEntity.java similarity index 96% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricFabricatorTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFabricatorTileEntity.java index 34ccddc..eac9ccb 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricFabricatorTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFabricatorTileEntity.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.util.crafting.RecipeDeconstructor; -import zone.moddev.mc.electricadvantage.util.crafting.SerializedInventory; +import zone.moddev.mc.baseelectric.util.crafting.RecipeDeconstructor; +import zone.moddev.mc.baseelectric.util.crafting.SerializedInventory; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -19,7 +19,7 @@ public class ElectricFabricatorTileEntity extends ElectricMachineTileEntity { private final int progressGoal = 200; public ElectricFabricatorTileEntity() { - super("tile.electricadvantage.electric_fabricator.name", 12, 2, 1); + super("tile.baseelectric.electric_fabricator.name", 12, 2, 1); } diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricFurnaceBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFurnaceBlock.java similarity index 84% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricFurnaceBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFurnaceBlock.java index b4beba5..f25790a 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricFurnaceBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFurnaceBlock.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraft.world.World; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricFurnaceTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFurnaceTileEntity.java similarity index 95% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricFurnaceTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFurnaceTileEntity.java index cb141ce..938af42 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricFurnaceTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFurnaceTileEntity.java @@ -1,8 +1,8 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import java.util.Arrays; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; @@ -21,7 +21,7 @@ public class ElectricFurnaceTileEntity extends ElectricMachineTileEntity{ public ElectricFurnaceTileEntity() { - super("tile.electricadvantage.electric_furnace.name", + super("tile.baseelectric.electric_furnace.name", 4, 6, 0); Arrays.fill(burnTime, (short)0); } diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricGeneratorBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricGeneratorBlock.java similarity index 96% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricGeneratorBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricGeneratorBlock.java index 96eba97..51fdd7d 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricGeneratorBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricGeneratorBlock.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricGeneratorTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricGeneratorTileEntity.java similarity index 98% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricGeneratorTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricGeneratorTileEntity.java index f09f109..f8f4263 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricGeneratorTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricGeneratorTileEntity.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricMachineBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricMachineBlock.java similarity index 97% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricMachineBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricMachineBlock.java index 3716b0a..bab56f5 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricMachineBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricMachineBlock.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricMachineTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricMachineTileEntity.java similarity index 99% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricMachineTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricMachineTileEntity.java index a400f79..f1bd6db 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricMachineTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricMachineTileEntity.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricOvenBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricOvenBlock.java similarity index 84% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricOvenBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricOvenBlock.java index c5c35ce..aeacb7b 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricOvenBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricOvenBlock.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraft.world.World; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricOvenTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricOvenTileEntity.java similarity index 94% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricOvenTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricOvenTileEntity.java index 6b07377..682f5c3 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricOvenTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricOvenTileEntity.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -15,7 +15,7 @@ public class ElectricOvenTileEntity extends ElectricMachineTileEntity{ private short progress = 0; public ElectricOvenTileEntity() { - super("tile.electricadvantage.electric_oven.name", 1, 1, 0); + super("tile.baseelectric.electric_oven.name", 1, 1, 0); } @Override diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricPumpBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricPumpBlock.java similarity index 85% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricPumpBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricPumpBlock.java index c2bb7d6..4f83a0c 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricPumpBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricPumpBlock.java @@ -1,11 +1,11 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.init.Blocks; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Blocks; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerConnectorContext; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; @@ -26,7 +26,7 @@ public ElectricMachineTileEntity createNewTileEntity(World w, int m) { @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); } /** @@ -35,7 +35,7 @@ public void onBlockAdded(World w, BlockPos coord, IBlockState state){ @Override public void onBlockDestroyedByPlayer(World w, BlockPos coord, IBlockState state){ super.onBlockDestroyedByPlayer(w, coord, state); - ConduitRegistry.getInstance().conduitBlockRemovedEvent(w, w.provider.getDimension(), coord, zone.moddev.mc.poweradvantage.init.Fluids.fluidConduit_general); + ConduitRegistry.getInstance().conduitBlockRemovedEvent(w, w.provider.getDimension(), coord, zone.moddev.mc.basepower.init.Fluids.fluidConduit_general); destroyPipe(w,coord); } /** diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricPumpTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricPumpTileEntity.java similarity index 95% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricPumpTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricPumpTileEntity.java index fe7b838..9351711 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricPumpTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricPumpTileEntity.java @@ -1,11 +1,11 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerConnectorContext; import cyano.poweradvantage.api.PowerRequest; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; @@ -41,7 +41,7 @@ public class ElectricPumpTileEntity extends ElectricMachineTileEntity implements public ElectricPumpTileEntity() { - super("tile.electricadvantage.electric_pump.name", 0, 0, 0, new ConduitType[]{Power.ELECTRIC_POWER, Fluids.fluidConduit_general},new float[]{ENERGY_COST_PUMP + 256 * ENERGY_COST_VERTICAL,1000f}); + super("tile.baseelectric.electric_pump.name", 0, 0, 0, new ConduitType[]{Power.ELECTRIC_POWER, Fluids.fluidConduit_general},new float[]{ENERGY_COST_PUMP + 256 * ENERGY_COST_VERTICAL,1000f}); 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.electricadvantage.init.Blocks.pump_pipe_electric){ + while(target.getY() > 0 && w.getBlockState(target).getBlock() == zone.moddev.mc.baseelectric.init.Blocks.pump_pipe_electric){ target = target.down(); } if(target.getY() > 0 && w.isAirBlock(target) && getEnergy() >= ENERGY_COST_PIPE){ // place pipe - w.setBlockState(target, zone.moddev.mc.electricadvantage.init.Blocks.pump_pipe_electric.getDefaultState()); + w.setBlockState(target, zone.moddev.mc.baseelectric.init.Blocks.pump_pipe_electric.getDefaultState()); this.subtractEnergy(ENERGY_COST_PIPE, Power.ELECTRIC_POWER); timeUntilNextPump = PIPE_INTERVAL; playSoundEffect(target.getX()+0.5, target.getY()+0.5, target.getZ()+0.5, SoundEvents.BLOCK_STONE_STEP, 0.3f, 1f); @@ -212,7 +212,7 @@ public void powerUpdate(){ if(this.getTank().getFluidAmount() > 0){ ConduitType type = Fluids.fluidToConduitType(getTank().getFluid().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! diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricStillBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricStillBlock.java similarity index 89% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricStillBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricStillBlock.java index d072b9b..a7c57e1 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricStillBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricStillBlock.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerConnectorContext; -import zone.moddev.mc.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.init.Fluids; import net.minecraft.world.World; public class ElectricStillBlock extends ElectricMachineBlock{ diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricStillTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricStillTileEntity.java similarity index 95% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricStillTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricStillTileEntity.java index e71115f..667369d 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricStillTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricStillTileEntity.java @@ -1,13 +1,13 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; 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.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 net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -28,7 +28,7 @@ public class ElectricStillTileEntity extends ElectricMachineTileEntity implement private final int[] dataSyncArray = new int[5]; public ElectricStillTileEntity() { - super("tile.electricadvantage.electric_still.name", 0, 0, 0, new ConduitType[]{Power.ELECTRIC_POWER, Fluids.fluidConduit_general},new float[]{500f,1000f}); + super("tile.baseelectric.electric_still.name", 0, 0, 0, new ConduitType[]{Power.ELECTRIC_POWER, Fluids.fluidConduit_general},new float[]{500f,1000f}); outputTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME ); inputTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME); } @@ -221,7 +221,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, PowerRequest.LAST_PRIORITY, 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/electricadvantage/machines/GrowthChamberBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberBlock.java similarity index 77% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/GrowthChamberBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberBlock.java index 259e5c0..6c237be 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/GrowthChamberBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberBlock.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import net.minecraft.block.material.Material; import net.minecraft.world.World; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/GrowthChamberControllerBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberControllerBlock.java similarity index 89% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/GrowthChamberControllerBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberControllerBlock.java index 32b4481..92571f6 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/GrowthChamberControllerBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberControllerBlock.java @@ -1,11 +1,11 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerConnectorContext; import cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; @@ -54,7 +54,7 @@ public int getComparatorInputOverride(IBlockState bs, World world, BlockPos coor @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); ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, Power.GROWTHCHAMBER_POWER); ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, Power.ELECTRIC_POWER); } @@ -65,7 +65,7 @@ public void onBlockAdded(World w, BlockPos coord, IBlockState state){ @Override public void onBlockDestroyedByPlayer(World w, BlockPos coord, IBlockState state){ super.onBlockDestroyedByPlayer(w, coord, state); - ConduitRegistry.getInstance().conduitBlockRemovedEvent(w, w.provider.getDimension(), coord, zone.moddev.mc.poweradvantage.init.Fluids.fluidConduit_general); + ConduitRegistry.getInstance().conduitBlockRemovedEvent(w, w.provider.getDimension(), coord, zone.moddev.mc.basepower.init.Fluids.fluidConduit_general); ConduitRegistry.getInstance().conduitBlockRemovedEvent(w, w.provider.getDimension(), coord, Power.GROWTHCHAMBER_POWER); ConduitRegistry.getInstance().conduitBlockRemovedEvent(w, w.provider.getDimension(), coord, Power.ELECTRIC_POWER); } diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/GrowthChamberControllerTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberControllerTileEntity.java similarity index 98% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/GrowthChamberControllerTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberControllerTileEntity.java index ee70343..ee6128e 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/GrowthChamberControllerTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberControllerTileEntity.java @@ -1,11 +1,11 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerConnectorContext; import cyano.poweradvantage.api.PowerRequest; import cyano.poweradvantage.api.fluid.FluidRequest; -import zone.moddev.mc.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.init.Fluids; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; @@ -34,7 +34,7 @@ public class GrowthChamberControllerTileEntity extends cyano.poweradvantage.api. private final int[] dataSyncArray = new int[4]; public GrowthChamberControllerTileEntity() { - super(types, capacities, "tile.electricadvantage.growth_chamber_controller.name"); + super(types, capacities, "tile.baseelectric.growth_chamber_controller.name"); tank = new FluidTank((int)capacities[2]); inventory = new ItemStack[1]; } diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/GrowthChamberTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberTileEntity.java similarity index 96% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/GrowthChamberTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberTileEntity.java index b5a09fe..b66e1dd 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/GrowthChamberTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberTileEntity.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.init.Power; -import zone.moddev.mc.electricadvantage.util.farming.VirtualCrop; +import zone.moddev.mc.baseelectric.init.Power; +import zone.moddev.mc.baseelectric.util.farming.VirtualCrop; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerRequest; import net.minecraft.entity.item.EntityItem; @@ -24,7 +24,7 @@ public class GrowthChamberTileEntity extends ElectricMachineTileEntity { private byte[] pendingGrowth; public GrowthChamberTileEntity() { - super("tile.electricadvantage.growth_chamber.name",Power.GROWTHCHAMBER_POWER, ENERGY_PER_TICK*64, GROWTH_AREA, 6, 0); + super("tile.baseelectric.growth_chamber.name",Power.GROWTHCHAMBER_POWER, ENERGY_PER_TICK*64, GROWTH_AREA, 6, 0); } diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/HydroelectricGeneratorBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/HydroelectricGeneratorBlock.java similarity index 91% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/HydroelectricGeneratorBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/HydroelectricGeneratorBlock.java index 14d519b..329c3c9 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/HydroelectricGeneratorBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/HydroelectricGeneratorBlock.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/HydroelectricGeneratorTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/HydroelectricGeneratorTileEntity.java similarity index 92% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/HydroelectricGeneratorTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/HydroelectricGeneratorTileEntity.java index f50ec26..f4ce941 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/HydroelectricGeneratorTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/HydroelectricGeneratorTileEntity.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.entities.HydroturbineEntity; +import zone.moddev.mc.baseelectric.entities.HydroturbineEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.AxisAlignedBB; @@ -20,7 +20,7 @@ public class HydroelectricGeneratorTileEntity extends ElectricGeneratorTileEntit private boolean isInitialized; public HydroelectricGeneratorTileEntity() { - super("tile.electricadvantage.hydroelectric_generator.name", 0); + super("tile.baseelectric.hydroelectric_generator.name", 0); isInitialized = false; } diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/LEDBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/LEDBlock.java similarity index 97% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/LEDBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/LEDBlock.java index 5e7e22c..1d669fd 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/LEDBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/LEDBlock.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.blocks.ElectricConduitBlock; +import zone.moddev.mc.baseelectric.blocks.ElectricConduitBlock; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/LEDTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/LEDTileEntity.java similarity index 92% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/LEDTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/LEDTileEntity.java index fb75ad3..f2a13be 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/LEDTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/LEDTileEntity.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerRequest; import cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine; @@ -14,7 +14,7 @@ public class LEDTileEntity extends TileEntitySimplePowerMachine { private static final float ENERGY_COST = 0.125f; public LEDTileEntity() { - super(Power.ELECTRIC_POWER, ENERGY_COST * 4, "tile.electricadvantage.led_bar.name"); + super(Power.ELECTRIC_POWER, ENERGY_COST * 4, "tile.baseelectric.led_bar.name"); } private final ItemStack[] none = new ItemStack[0]; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/LaserTurretBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/LaserTurretBlock.java similarity index 97% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/LaserTurretBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/LaserTurretBlock.java index 9fec943..5c112bf 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/LaserTurretBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/LaserTurretBlock.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/LaserTurretTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/LaserTurretTileEntity.java similarity index 98% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/LaserTurretTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/LaserTurretTileEntity.java index e627cba..2c2ce7f 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/LaserTurretTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/LaserTurretTileEntity.java @@ -1,7 +1,7 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.init.Power; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -77,7 +77,7 @@ public class LaserTurretTileEntity extends ElectricMachineTileEntity implements public LaserTurretTileEntity(){ - super("tile.electricadvantage.laser_turret.name",MAX_BUFFER,0,0,0); + super("tile.baseelectric.laser_turret.name",MAX_BUFFER,0,0,0); SoundEvent soundEvent = SoundEvent.REGISTRY.getObject(new ResourceLocation(ElectricAdvantage.INSTANCE.LASER_SOUND)); if(soundEvent == null){ LASER_SOUND = SoundEvents.ENTITY_ENDERMEN_TELEPORT; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/PhotovoltaicGeneratorBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/PhotovoltaicGeneratorBlock.java similarity index 93% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/PhotovoltaicGeneratorBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/PhotovoltaicGeneratorBlock.java index 17d7abb..837ee20 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/PhotovoltaicGeneratorBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/PhotovoltaicGeneratorBlock.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/PhotovoltaicGeneratorTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/PhotovoltaicGeneratorTileEntity.java similarity index 94% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/PhotovoltaicGeneratorTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/PhotovoltaicGeneratorTileEntity.java index 572341b..e954f0c 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/PhotovoltaicGeneratorTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/PhotovoltaicGeneratorTileEntity.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; @@ -17,7 +17,7 @@ public class PhotovoltaicGeneratorTileEntity extends ElectricGeneratorTileEntity private float powerOutput = 0; public PhotovoltaicGeneratorTileEntity() { - super("tile.electricadvantage.photovoltaic_generator.name", 0); + super("tile.baseelectric.photovoltaic_generator.name", 0); } @Override diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/PlasticRefineryBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/PlasticRefineryBlock.java similarity index 82% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/PlasticRefineryBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/PlasticRefineryBlock.java index 80f0958..b69da75 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/PlasticRefineryBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/PlasticRefineryBlock.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerConnectorContext; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; -import zone.moddev.mc.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; @@ -25,7 +25,7 @@ public ElectricMachineTileEntity createNewTileEntity(World w, int m) { @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); } /** @@ -34,7 +34,7 @@ public void onBlockAdded(World w, BlockPos coord, IBlockState state){ @Override public void onBlockDestroyedByPlayer(World w, BlockPos coord, IBlockState state){ super.onBlockDestroyedByPlayer(w, coord, state); - ConduitRegistry.getInstance().conduitBlockRemovedEvent(w, w.provider.getDimension(), coord, zone.moddev.mc.poweradvantage.init.Fluids.fluidConduit_general); + ConduitRegistry.getInstance().conduitBlockRemovedEvent(w, w.provider.getDimension(), coord, zone.moddev.mc.basepower.init.Fluids.fluidConduit_general); } /** * This method is called when the block is destroyed by an explosion. diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/PlasticRefineryTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/PlasticRefineryTileEntity.java similarity index 96% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/PlasticRefineryTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/PlasticRefineryTileEntity.java index 1b3c1a8..5a9b5e2 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/PlasticRefineryTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/PlasticRefineryTileEntity.java @@ -1,13 +1,13 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.init.Items; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.init.Items; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerConnectorContext; import cyano.poweradvantage.api.PowerRequest; import cyano.poweradvantage.api.fluid.FluidRequest; -import zone.moddev.mc.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.init.Fluids; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -30,7 +30,7 @@ public class PlasticRefineryTileEntity extends ElectricMachineTileEntity impleme private final int[] dataSyncArray = new int[4]; public PlasticRefineryTileEntity() { - super("tile.electricadvantage.plastic_refinery.name", + super("tile.baseelectric.plastic_refinery.name", 0, 1, 0, new ConduitType[]{Power.ELECTRIC_POWER, Fluids.fluidConduit_general},new float[]{500f,2000f}); tank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 2); } diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/SteamPoweredElectricGeneratorBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/SteamPoweredElectricGeneratorBlock.java similarity index 92% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/SteamPoweredElectricGeneratorBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/SteamPoweredElectricGeneratorBlock.java index 8ffc34f..b2328a4 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/SteamPoweredElectricGeneratorBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/SteamPoweredElectricGeneratorBlock.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerConnectorContext; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/SteamPoweredElectricGeneratorTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/SteamPoweredElectricGeneratorTileEntity.java similarity index 93% rename from src/main/java/zone/moddev/mc/electricadvantage/machines/SteamPoweredElectricGeneratorTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/SteamPoweredElectricGeneratorTileEntity.java index a7cb381..3652dde 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/SteamPoweredElectricGeneratorTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/SteamPoweredElectricGeneratorTileEntity.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerConnectorContext; import cyano.poweradvantage.api.PowerRequest; @@ -9,7 +9,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import static zone.moddev.mc.electricadvantage.machines.SteamPoweredElectricGeneratorBlock.STEAM_POWER; +import static zone.moddev.mc.baseelectric.machines.SteamPoweredElectricGeneratorBlock.STEAM_POWER; public class SteamPoweredElectricGeneratorTileEntity extends ElectricGeneratorTileEntity{ @@ -25,7 +25,7 @@ public class SteamPoweredElectricGeneratorTileEntity extends ElectricGeneratorTi private final int[] dataArray = new int[3]; public SteamPoweredElectricGeneratorTileEntity() { - super("tile.electricadvantage.steam_powered_generator.name", 0, new ConduitType[]{Power.ELECTRIC_POWER,STEAM_POWER}, new float[]{1000f,32f}); + super("tile.baseelectric.steam_powered_generator.name", 0, new ConduitType[]{Power.ELECTRIC_POWER,STEAM_POWER}, new float[]{1000f,32f}); } @Override public void powerUpdate(){ diff --git a/src/main/java/zone/moddev/mc/electricadvantage/util/crafting/ItemMatcher.java b/src/main/java/zone/moddev/mc/baseelectric/util/crafting/ItemMatcher.java similarity index 97% rename from src/main/java/zone/moddev/mc/electricadvantage/util/crafting/ItemMatcher.java rename to src/main/java/zone/moddev/mc/baseelectric/util/crafting/ItemMatcher.java index 0da8358..df6e4ce 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/util/crafting/ItemMatcher.java +++ b/src/main/java/zone/moddev/mc/baseelectric/util/crafting/ItemMatcher.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.util.crafting; +package zone.moddev.mc.baseelectric.util.crafting; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/util/crafting/ItemRecord.java b/src/main/java/zone/moddev/mc/baseelectric/util/crafting/ItemRecord.java similarity index 95% rename from src/main/java/zone/moddev/mc/electricadvantage/util/crafting/ItemRecord.java rename to src/main/java/zone/moddev/mc/baseelectric/util/crafting/ItemRecord.java index 2db86f6..d77822f 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/util/crafting/ItemRecord.java +++ b/src/main/java/zone/moddev/mc/baseelectric/util/crafting/ItemRecord.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.util.crafting; +package zone.moddev.mc.baseelectric.util.crafting; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/util/crafting/RecipeDeconstructor.java b/src/main/java/zone/moddev/mc/baseelectric/util/crafting/RecipeDeconstructor.java similarity index 99% rename from src/main/java/zone/moddev/mc/electricadvantage/util/crafting/RecipeDeconstructor.java rename to src/main/java/zone/moddev/mc/baseelectric/util/crafting/RecipeDeconstructor.java index ab73f11..2fdc07d 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/util/crafting/RecipeDeconstructor.java +++ b/src/main/java/zone/moddev/mc/baseelectric/util/crafting/RecipeDeconstructor.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.util.crafting; +package zone.moddev.mc.baseelectric.util.crafting; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/util/crafting/SerializedInventory.java b/src/main/java/zone/moddev/mc/baseelectric/util/crafting/SerializedInventory.java similarity index 98% rename from src/main/java/zone/moddev/mc/electricadvantage/util/crafting/SerializedInventory.java rename to src/main/java/zone/moddev/mc/baseelectric/util/crafting/SerializedInventory.java index 884ecc8..f6bffca 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/util/crafting/SerializedInventory.java +++ b/src/main/java/zone/moddev/mc/baseelectric/util/crafting/SerializedInventory.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.util.crafting; +package zone.moddev.mc.baseelectric.util.crafting; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/util/farming/VirtualCrop.java b/src/main/java/zone/moddev/mc/baseelectric/util/farming/VirtualCrop.java similarity index 97% rename from src/main/java/zone/moddev/mc/electricadvantage/util/farming/VirtualCrop.java rename to src/main/java/zone/moddev/mc/baseelectric/util/farming/VirtualCrop.java index bacf81f..97ac22c 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/util/farming/VirtualCrop.java +++ b/src/main/java/zone/moddev/mc/baseelectric/util/farming/VirtualCrop.java @@ -1,6 +1,6 @@ -package zone.moddev.mc.electricadvantage.util.farming; +package zone.moddev.mc.baseelectric.util.farming; -import zone.moddev.mc.electricadvantage.util.crafting.ItemRecord; +import zone.moddev.mc.baseelectric.util.crafting.ItemRecord; import net.minecraft.block.Block; import net.minecraft.block.BlockStem; import net.minecraft.block.properties.PropertyInteger; diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_battery_array.json b/src/main/resources/assets/baseelectric/blockstates/electric_battery_array.json new file mode 100644 index 0000000..c8160c0 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_battery_array.json @@ -0,0 +1,12 @@ +{ + "variants": { + "active=true,facing=east": { "model": "baseelectric:electric_battery_array", "y": 90 }, + "active=true,facing=north": { "model": "baseelectric:electric_battery_array" }, + "active=true,facing=south": { "model": "baseelectric:electric_battery_array", "y": 180 }, + "active=true,facing=west": { "model": "baseelectric:electric_battery_array", "y": 270 }, + "active=false,facing=east": { "model": "baseelectric:electric_battery_array", "y": 90 }, + "active=false,facing=north": { "model": "baseelectric:electric_battery_array" }, + "active=false,facing=south": { "model": "baseelectric:electric_battery_array", "y": 180 }, + "active=false,facing=west": { "model": "baseelectric:electric_battery_array", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_conduit.json b/src/main/resources/assets/baseelectric/blockstates/electric_conduit.json new file mode 100644 index 0000000..2da5843 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_conduit.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": "baseelectric:electric_conduit_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=false,west=false": { "model": "baseelectric:electric_conduit_n", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=false,west=false": { "model": "baseelectric:electric_conduit_n", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=false,west=false": { "model": "baseelectric:electric_conduit_n", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=false,west=false": { "model": "baseelectric:electric_conduit_n", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=true,west=false": { "model": "baseelectric:electric_conduit_n", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=false,west=true": { "model": "baseelectric:electric_conduit_n", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=false,west=false": { "model": "baseelectric:electric_conduit_nw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=false,west=false": { "model": "baseelectric:electric_conduit_nw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=false,west=false": { "model": "baseelectric:electric_conduit_nw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=true,west=false": { "model": "baseelectric:electric_conduit_ns", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=false,west=true": { "model": "baseelectric:electric_conduit_nw", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=false,west=false": { "model": "baseelectric:electric_conduit_nw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=false,west=false": { "model": "baseelectric:electric_conduit_nw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=true,west=false": { "model": "baseelectric:electric_conduit_nw", "x": 270, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=false,west=true": { "model": "baseelectric:electric_conduit_ns", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=false,west=false": { "model": "baseelectric:electric_conduit_ns", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=true,west=false": { "model": "baseelectric:electric_conduit_nw", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=false,west=true": { "model": "baseelectric:electric_conduit_nw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=true,west=false": { "model": "baseelectric:electric_conduit_nw", "x": 270, "y": 270, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=false,west=true": { "model": "baseelectric:electric_conduit_nw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=true,west=true": { "model": "baseelectric:electric_conduit_nw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=false,west=false": { "model": "baseelectric:electric_conduit_nuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=false,west=false": { "model": "baseelectric:electric_conduit_nuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=true,west=false": { "model": "baseelectric:electric_conduit_dnu", "x": 0, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=false,west=true": { "model": "baseelectric:electric_conduit_dnu", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=false,west=false": { "model": "baseelectric:electric_conduit_dnu", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=true,west=false": { "model": "baseelectric:electric_conduit_dnu", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=false,west=true": { "model": "baseelectric:electric_conduit_nuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=true,west=false": { "model": "baseelectric:electric_conduit_dnu", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=false,west=true": { "model": "baseelectric:electric_conduit_nuw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=true,west=true": { "model": "baseelectric:electric_conduit_dnu", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=false,west=false": { "model": "baseelectric:electric_conduit_nsw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=true,west=false": { "model": "baseelectric:electric_conduit_nuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=false,west=true": { "model": "baseelectric:electric_conduit_nsw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=true,west=false": { "model": "baseelectric:electric_conduit_nuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=false,west=true": { "model": "baseelectric:electric_conduit_nsw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=true,west=true": { "model": "baseelectric:electric_conduit_dnu", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=true,west=false": { "model": "baseelectric:electric_conduit_dnu", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=false,west=true": { "model": "baseelectric:electric_conduit_nsw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=true,west=true": { "model": "baseelectric:electric_conduit_nuw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=true,west=true": { "model": "baseelectric:electric_conduit_nuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=false,west=false": { "model": "baseelectric:electric_conduit_nsuw", "x": 180, "y": 180, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=true,west=false": { "model": "baseelectric:electric_conduit_nsuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=false,west=true": { "model": "baseelectric:electric_conduit_nsuw", "x": 180, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=true,west=false": { "model": "baseelectric:electric_conduit_nsuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=false,west=true": { "model": "baseelectric:electric_conduit_nsuw", "x": 180, "y": 270, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=true,west=true": { "model": "baseelectric:electric_conduit_ensw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=true,west=false": { "model": "baseelectric:electric_conduit_ensw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=false,west=true": { "model": "baseelectric:electric_conduit_nsuw", "x": 180, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=true,west=true": { "model": "baseelectric:electric_conduit_nsuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=true,west=true": { "model": "baseelectric:electric_conduit_nsuw", "x": 90, "y": 270, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=true,west=false": { "model": "baseelectric:electric_conduit_nsuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=false,west=true": { "model": "baseelectric:electric_conduit_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=true,west=true": { "model": "baseelectric:electric_conduit_nsuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=true,west=true": { "model": "baseelectric:electric_conduit_nsuw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=true,west=true": { "model": "baseelectric:electric_conduit_nsuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=true,west=false": { "model": "baseelectric:electric_conduit_desuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=false,west=true": { "model": "baseelectric:electric_conduit_desuw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=true,west=true": { "model": "baseelectric:electric_conduit_desuw", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=true,west=true": { "model": "baseelectric:electric_conduit_desuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=true,west=true": { "model": "baseelectric:electric_conduit_desuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=true,west=true": { "model": "baseelectric:electric_conduit_desuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=true,west=true": { "model": "baseelectric:electric_conduit_densuw", "x": 0, "y": 0, "uvlock": false } + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_crusher.json b/src/main/resources/assets/baseelectric/blockstates/electric_crusher.json new file mode 100644 index 0000000..ad918cc --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_crusher.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:electric_crusher_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:electric_crusher_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:electric_crusher_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:electric_crusher_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:electric_crusher_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:electric_crusher_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:electric_crusher_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:electric_crusher_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:electric_crusher_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:electric_crusher_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:electric_crusher_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:electric_crusher_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:electric_crusher_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:electric_crusher_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:electric_crusher_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:electric_crusher_on", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_drill.json b/src/main/resources/assets/baseelectric/blockstates/electric_drill.json new file mode 100644 index 0000000..011d5e6 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_drill.json @@ -0,0 +1,16 @@ +{ + "variants": { + "active=true,facing=up": { "model": "baseelectric:electric_drill_on", "x":270 }, + "active=true,facing=down": { "model": "baseelectric:electric_drill_on", "x": 90 }, + "active=true,facing=east": { "model": "baseelectric:electric_drill_on", "y": 90 }, + "active=true,facing=north": { "model": "baseelectric:electric_drill_on" }, + "active=true,facing=south": { "model": "baseelectric:electric_drill_on", "y": 180 }, + "active=true,facing=west": { "model": "baseelectric:electric_drill_on", "y": 270 }, + "active=false,facing=up": { "model": "baseelectric:electric_drill_off", "x":270 }, + "active=false,facing=down": { "model": "baseelectric:electric_drill_off", "x": 90 }, + "active=false,facing=east": { "model": "baseelectric:electric_drill_off", "y": 90 }, + "active=false,facing=north": { "model": "baseelectric:electric_drill_off" }, + "active=false,facing=south": { "model": "baseelectric:electric_drill_off", "y": 180 }, + "active=false,facing=west": { "model": "baseelectric:electric_drill_off", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_fabricator.json b/src/main/resources/assets/baseelectric/blockstates/electric_fabricator.json new file mode 100644 index 0000000..4f2d8e6 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_fabricator.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:electric_fabricator_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:electric_fabricator_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:electric_fabricator_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:electric_fabricator_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:electric_fabricator_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:electric_fabricator_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:electric_fabricator_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:electric_fabricator_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:electric_fabricator_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:electric_fabricator_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:electric_fabricator_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:electric_fabricator_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:electric_fabricator_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:electric_fabricator_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:electric_fabricator_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:electric_fabricator_on", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_furnace.json b/src/main/resources/assets/baseelectric/blockstates/electric_furnace.json new file mode 100644 index 0000000..8b4b2d2 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_furnace.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:electric_furnace_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:electric_furnace_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:electric_furnace_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:electric_furnace_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:electric_furnace_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:electric_furnace_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:electric_furnace_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:electric_furnace_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:electric_furnace_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:electric_furnace_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:electric_furnace_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:electric_furnace_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:electric_furnace_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:electric_furnace_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:electric_furnace_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:electric_furnace_on", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_oven.json b/src/main/resources/assets/baseelectric/blockstates/electric_oven.json new file mode 100644 index 0000000..552e36a --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_oven.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:electric_oven_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:electric_oven_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:electric_oven_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:electric_oven_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:electric_oven_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:electric_oven_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:electric_oven_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:electric_oven_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:electric_oven_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:electric_oven_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:electric_oven_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:electric_oven_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:electric_oven_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:electric_oven_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:electric_oven_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:electric_oven_on", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_pcb_printer.json b/src/main/resources/assets/baseelectric/blockstates/electric_pcb_printer.json new file mode 100644 index 0000000..428666f --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_pcb_printer.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:electric_pcb_printer_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:electric_pcb_printer_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:electric_pcb_printer_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:electric_pcb_printer_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:electric_pcb_printer_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:electric_pcb_printer_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:electric_pcb_printer_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:electric_pcb_printer_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:electric_pcb_printer_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:electric_pcb_printer_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:electric_pcb_printer_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:electric_pcb_printer_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:electric_pcb_printer_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:electric_pcb_printer_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:electric_pcb_printer_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:electric_pcb_printer_on", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_pump.json b/src/main/resources/assets/baseelectric/blockstates/electric_pump.json new file mode 100644 index 0000000..1e39411 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_pump.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:electric_pump_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:electric_pump_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:electric_pump_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:electric_pump_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:electric_pump_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:electric_pump_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:electric_pump_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:electric_pump_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:electric_pump_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:electric_pump_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:electric_pump_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:electric_pump_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:electric_pump_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:electric_pump_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:electric_pump_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:electric_pump_on", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_still.json b/src/main/resources/assets/baseelectric/blockstates/electric_still.json new file mode 100644 index 0000000..90f3584 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_still.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:electric_still_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:electric_still_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:electric_still_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:electric_still_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:electric_still_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:electric_still_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:electric_still_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:electric_still_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:electric_still_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:electric_still_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:electric_still_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:electric_still_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:electric_still_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:electric_still_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:electric_still_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:electric_still_on", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_switch.json b/src/main/resources/assets/baseelectric/blockstates/electric_switch.json new file mode 100644 index 0000000..c0a925c --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_switch.json @@ -0,0 +1,6 @@ +{ + "variants": { + "active=false": { "model": "baseelectric:electric_switch_off"}, + "active=true": { "model": "baseelectric:electric_switch_on"} + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_track.json b/src/main/resources/assets/baseelectric/blockstates/electric_track.json new file mode 100644 index 0000000..a8a7c1a --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_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": "baseelectric:electric_track_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=false,west=false": { "model": "baseelectric:electric_track_n", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=false,west=false": { "model": "baseelectric:electric_track_n", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=false,west=false": { "model": "baseelectric:electric_track_n", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=false,west=false": { "model": "baseelectric:electric_track_n", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=true,west=false": { "model": "baseelectric:electric_track_n", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=false,west=true": { "model": "baseelectric:electric_track_n", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=false,west=false": { "model": "baseelectric:electric_track_nw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=false,west=false": { "model": "baseelectric:electric_track_nw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=false,west=false": { "model": "baseelectric:electric_track_nw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=true,west=false": { "model": "baseelectric:electric_track_ns", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=false,west=true": { "model": "baseelectric:electric_track_nw", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=false,west=false": { "model": "baseelectric:electric_track_nw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=false,west=false": { "model": "baseelectric:electric_track_nw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=true,west=false": { "model": "baseelectric:electric_track_nw", "x": 270, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=false,west=true": { "model": "baseelectric:electric_track_ns", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=false,west=false": { "model": "baseelectric:electric_track_ns", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=true,west=false": { "model": "baseelectric:electric_track_nw", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=false,west=true": { "model": "baseelectric:electric_track_nw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=true,west=false": { "model": "baseelectric:electric_track_nw", "x": 270, "y": 270, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=false,west=true": { "model": "baseelectric:electric_track_nw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=true,west=true": { "model": "baseelectric:electric_track_nw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=false,west=false": { "model": "baseelectric:electric_track_nuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=false,west=false": { "model": "baseelectric:electric_track_nuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=true,west=false": { "model": "baseelectric:electric_track_dnu", "x": 0, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=false,west=true": { "model": "baseelectric:electric_track_dnu", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=false,west=false": { "model": "baseelectric:electric_track_dnu", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=true,west=false": { "model": "baseelectric:electric_track_dnu", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=false,west=true": { "model": "baseelectric:electric_track_nuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=true,west=false": { "model": "baseelectric:electric_track_dnu", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=false,west=true": { "model": "baseelectric:electric_track_nuw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=true,west=true": { "model": "baseelectric:electric_track_dnu", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=false,west=false": { "model": "baseelectric:electric_track_nsw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=true,west=false": { "model": "baseelectric:electric_track_nuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=false,west=true": { "model": "baseelectric:electric_track_nsw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=true,west=false": { "model": "baseelectric:electric_track_nuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=false,west=true": { "model": "baseelectric:electric_track_nsw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=true,west=true": { "model": "baseelectric:electric_track_dnu", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=true,west=false": { "model": "baseelectric:electric_track_dnu", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=false,west=true": { "model": "baseelectric:electric_track_nsw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=true,west=true": { "model": "baseelectric:electric_track_nuw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=true,west=true": { "model": "baseelectric:electric_track_nuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=false,west=false": { "model": "baseelectric:electric_track_nsuw", "x": 180, "y": 180, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=true,west=false": { "model": "baseelectric:electric_track_nsuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=false,west=true": { "model": "baseelectric:electric_track_nsuw", "x": 180, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=true,west=false": { "model": "baseelectric:electric_track_nsuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=false,west=true": { "model": "baseelectric:electric_track_nsuw", "x": 180, "y": 270, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=true,west=true": { "model": "baseelectric:electric_track_ensw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=true,west=false": { "model": "baseelectric:electric_track_ensw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=false,west=true": { "model": "baseelectric:electric_track_nsuw", "x": 180, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=true,west=true": { "model": "baseelectric:electric_track_nsuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=true,west=true": { "model": "baseelectric:electric_track_nsuw", "x": 90, "y": 270, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=true,west=false": { "model": "baseelectric:electric_track_nsuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=false,west=true": { "model": "baseelectric:electric_track_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=true,west=true": { "model": "baseelectric:electric_track_nsuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=true,west=true": { "model": "baseelectric:electric_track_nsuw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=true,west=true": { "model": "baseelectric:electric_track_nsuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=true,west=false": { "model": "baseelectric:electric_track_desuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=false,west=true": { "model": "baseelectric:electric_track_desuw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=true,west=true": { "model": "baseelectric:electric_track_desuw", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=true,west=true": { "model": "baseelectric:electric_track_desuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=true,west=true": { "model": "baseelectric:electric_track_desuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=true,west=true": { "model": "baseelectric:electric_track_desuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=true,west=true": { "model": "baseelectric:electric_track_densuw", "x": 0, "y": 0, "uvlock": false } + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/baseelectric/blockstates/geothermal_generator.json b/src/main/resources/assets/baseelectric/blockstates/geothermal_generator.json new file mode 100644 index 0000000..676b6e0 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/geothermal_generator.json @@ -0,0 +1,12 @@ +{ + "variants": { + "active=true,facing=east": { "model": "baseelectric:geothermal_generator", "y": 90 }, + "active=true,facing=north": { "model": "baseelectric:geothermal_generator" }, + "active=true,facing=south": { "model": "baseelectric:geothermal_generator", "y": 180 }, + "active=true,facing=west": { "model": "baseelectric:geothermal_generator", "y": 270 }, + "active=false,facing=east": { "model": "baseelectric:geothermal_generator", "y": 90 }, + "active=false,facing=north": { "model": "baseelectric:geothermal_generator" }, + "active=false,facing=south": { "model": "baseelectric:geothermal_generator", "y": 180 }, + "active=false,facing=west": { "model": "baseelectric:geothermal_generator", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/growth_chamber.json b/src/main/resources/assets/baseelectric/blockstates/growth_chamber.json new file mode 100644 index 0000000..3f1ef00 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/growth_chamber.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:growth_chamber_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:growth_chamber_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:growth_chamber_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:growth_chamber_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:growth_chamber_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:growth_chamber_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:growth_chamber_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:growth_chamber_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:growth_chamber_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:growth_chamber_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:growth_chamber_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:growth_chamber_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:growth_chamber_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:growth_chamber_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:growth_chamber_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:growth_chamber_on", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/growth_chamber_controller.json b/src/main/resources/assets/baseelectric/blockstates/growth_chamber_controller.json new file mode 100644 index 0000000..3198d5b --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/growth_chamber_controller.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "baseelectric:growth_chamber_controller", "y": 90 }, + "facing=north": { "model": "baseelectric:growth_chamber_controller" }, + "facing=south": { "model": "baseelectric:growth_chamber_controller", "y": 180 }, + "facing=west": { "model": "baseelectric:growth_chamber_controller", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/hydroelectric_generator.json b/src/main/resources/assets/baseelectric/blockstates/hydroelectric_generator.json new file mode 100644 index 0000000..b91f58d --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/hydroelectric_generator.json @@ -0,0 +1,12 @@ +{ + "variants": { + "active=true,facing=east": { "model": "baseelectric:hydroelectric_generator_on", "y": 90 }, + "active=true,facing=north": { "model": "baseelectric:hydroelectric_generator_on" }, + "active=true,facing=south": { "model": "baseelectric:hydroelectric_generator_on", "y": 180 }, + "active=true,facing=west": { "model": "baseelectric:hydroelectric_generator_on", "y": 270 }, + "active=false,facing=east": { "model": "baseelectric:hydroelectric_generator_off", "y": 90 }, + "active=false,facing=north": { "model": "baseelectric:hydroelectric_generator_off" }, + "active=false,facing=south": { "model": "baseelectric:hydroelectric_generator_off", "y": 180 }, + "active=false,facing=west": { "model": "baseelectric:hydroelectric_generator_off", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/laser_turret.json b/src/main/resources/assets/baseelectric/blockstates/laser_turret.json new file mode 100644 index 0000000..a66b21c --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/laser_turret.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:laser_turret", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:laser_turret" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:laser_turret", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:laser_turret", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:laser_turret", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:laser_turret" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:laser_turret", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:laser_turret", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:laser_turret", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:laser_turret" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:laser_turret", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:laser_turret", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:laser_turret", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:laser_turret" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:laser_turret", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:laser_turret", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/laser_turret_evil.json b/src/main/resources/assets/baseelectric/blockstates/laser_turret_evil.json new file mode 100644 index 0000000..a66b21c --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/laser_turret_evil.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:laser_turret", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:laser_turret" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:laser_turret", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:laser_turret", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:laser_turret", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:laser_turret" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:laser_turret", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:laser_turret", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:laser_turret", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:laser_turret" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:laser_turret", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:laser_turret", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:laser_turret", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:laser_turret" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:laser_turret", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:laser_turret", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/led_bar.json b/src/main/resources/assets/baseelectric/blockstates/led_bar.json new file mode 100644 index 0000000..aee8c61 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/led_bar.json @@ -0,0 +1,134 @@ +{ + "__comment": "blockstate parameters MUST be in alphabetical order!", + "variants": { + "down=false,east=false,lit=false,north=false,south=false,up=false,west=false": { "model": "baseelectric:led_bar_off_n", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=false,north=false,south=false,up=false,west=false": { "model": "baseelectric:led_bar_off_n", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,lit=false,north=false,south=false,up=false,west=false": { "model": "baseelectric:led_bar_off_n", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,lit=false,north=true,south=false,up=false,west=false": { "model": "baseelectric:led_bar_off_n", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,lit=false,north=false,south=true,up=false,west=false": { "model": "baseelectric:led_bar_off_n", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=false,lit=false,north=false,south=false,up=true,west=false": { "model": "baseelectric:led_bar_off_n", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,lit=false,north=false,south=false,up=false,west=true": { "model": "baseelectric:led_bar_off_n", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,lit=false,north=false,south=false,up=false,west=false": { "model": "baseelectric:led_bar_off_nw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=false,lit=false,north=true,south=false,up=false,west=false": { "model": "baseelectric:led_bar_off_nw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,lit=false,north=false,south=true,up=false,west=false": { "model": "baseelectric:led_bar_off_nw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,lit=false,north=false,south=false,up=true,west=false": { "model": "baseelectric:led_bar_off_ns", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=false,north=false,south=false,up=false,west=true": { "model": "baseelectric:led_bar_off_nw", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,lit=false,north=true,south=false,up=false,west=false": { "model": "baseelectric:led_bar_off_nw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,lit=false,north=false,south=true,up=false,west=false": { "model": "baseelectric:led_bar_off_nw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,lit=false,north=false,south=false,up=true,west=false": { "model": "baseelectric:led_bar_off_nw", "x": 270, "y": 180, "uvlock": false }, + "down=false,east=true,lit=false,north=false,south=false,up=false,west=true": { "model": "baseelectric:led_bar_off_ns", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,lit=false,north=true,south=true,up=false,west=false": { "model": "baseelectric:led_bar_off_ns", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,lit=false,north=true,south=false,up=true,west=false": { "model": "baseelectric:led_bar_off_nw", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,lit=false,north=true,south=false,up=false,west=true": { "model": "baseelectric:led_bar_off_nw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,lit=false,north=false,south=true,up=true,west=false": { "model": "baseelectric:led_bar_off_nw", "x": 270, "y": 270, "uvlock": false }, + "down=false,east=false,lit=false,north=false,south=true,up=false,west=true": { "model": "baseelectric:led_bar_off_nw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,lit=false,north=false,south=false,up=true,west=true": { "model": "baseelectric:led_bar_off_nw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,lit=false,north=true,south=false,up=false,west=false": { "model": "baseelectric:led_bar_off_nuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,lit=false,north=false,south=true,up=false,west=false": { "model": "baseelectric:led_bar_off_nuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,lit=false,north=false,south=false,up=true,west=false": { "model": "baseelectric:led_bar_off_dnu", "x": 0, "y": 90, "uvlock": false }, + "down=true,east=true,lit=false,north=false,south=false,up=false,west=true": { "model": "baseelectric:led_bar_off_dnu", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,lit=false,north=true,south=true,up=false,west=false": { "model": "baseelectric:led_bar_off_dnu", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=false,north=true,south=false,up=true,west=false": { "model": "baseelectric:led_bar_off_dnu", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,lit=false,north=true,south=false,up=false,west=true": { "model": "baseelectric:led_bar_off_nuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=false,north=false,south=true,up=true,west=false": { "model": "baseelectric:led_bar_off_dnu", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=false,lit=false,north=false,south=true,up=false,west=true": { "model": "baseelectric:led_bar_off_nuw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,lit=false,north=false,south=false,up=true,west=true": { "model": "baseelectric:led_bar_off_dnu", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,lit=false,north=true,south=true,up=false,west=false": { "model": "baseelectric:led_bar_off_nsw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,lit=false,north=true,south=false,up=true,west=false": { "model": "baseelectric:led_bar_off_nuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,lit=false,north=true,south=false,up=false,west=true": { "model": "baseelectric:led_bar_off_nsw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,lit=false,north=false,south=true,up=true,west=false": { "model": "baseelectric:led_bar_off_nuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,lit=false,north=false,south=true,up=false,west=true": { "model": "baseelectric:led_bar_off_nsw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,lit=false,north=false,south=false,up=true,west=true": { "model": "baseelectric:led_bar_off_dnu", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,lit=false,north=true,south=true,up=true,west=false": { "model": "baseelectric:led_bar_off_dnu", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,lit=false,north=true,south=true,up=false,west=true": { "model": "baseelectric:led_bar_off_nsw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,lit=false,north=true,south=false,up=true,west=true": { "model": "baseelectric:led_bar_off_nuw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,lit=false,north=false,south=true,up=true,west=true": { "model": "baseelectric:led_bar_off_nuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,lit=false,north=true,south=true,up=false,west=false": { "model": "baseelectric:led_bar_off_nsuw", "x": 180, "y": 180, "uvlock": false }, + "down=true,east=true,lit=false,north=true,south=false,up=true,west=false": { "model": "baseelectric:led_bar_off_nsuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,lit=false,north=true,south=false,up=false,west=true": { "model": "baseelectric:led_bar_off_nsuw", "x": 180, "y": 90, "uvlock": false }, + "down=true,east=true,lit=false,north=false,south=true,up=true,west=false": { "model": "baseelectric:led_bar_off_nsuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,lit=false,north=false,south=true,up=false,west=true": { "model": "baseelectric:led_bar_off_nsuw", "x": 180, "y": 270, "uvlock": false }, + "down=true,east=true,lit=false,north=false,south=false,up=true,west=true": { "model": "baseelectric:led_bar_off_ensw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=false,north=true,south=true,up=true,west=false": { "model": "baseelectric:led_bar_off_ensw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,lit=false,north=true,south=true,up=false,west=true": { "model": "baseelectric:led_bar_off_nsuw", "x": 180, "y": 0, "uvlock": false }, + "down=true,east=false,lit=false,north=true,south=false,up=true,west=true": { "model": "baseelectric:led_bar_off_nsuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=false,north=false,south=true,up=true,west=true": { "model": "baseelectric:led_bar_off_nsuw", "x": 90, "y": 270, "uvlock": false }, + "down=false,east=true,lit=false,north=true,south=true,up=true,west=false": { "model": "baseelectric:led_bar_off_nsuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,lit=false,north=true,south=true,up=false,west=true": { "model": "baseelectric:led_bar_off_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=true,lit=false,north=true,south=false,up=true,west=true": { "model": "baseelectric:led_bar_off_nsuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,lit=false,north=false,south=true,up=true,west=true": { "model": "baseelectric:led_bar_off_nsuw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,lit=false,north=true,south=true,up=true,west=true": { "model": "baseelectric:led_bar_off_nsuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=true,lit=false,north=true,south=true,up=true,west=false": { "model": "baseelectric:led_bar_off_desuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,lit=false,north=true,south=true,up=false,west=true": { "model": "baseelectric:led_bar_off_desuw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,lit=false,north=true,south=false,up=true,west=true": { "model": "baseelectric:led_bar_off_desuw", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=true,lit=false,north=false,south=true,up=true,west=true": { "model": "baseelectric:led_bar_off_desuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,lit=false,north=true,south=true,up=true,west=true": { "model": "baseelectric:led_bar_off_desuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,lit=false,north=true,south=true,up=true,west=true": { "model": "baseelectric:led_bar_off_desuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=true,lit=false,north=true,south=true,up=true,west=true": { "model": "baseelectric:led_bar_off_densuw", "x": 0, "y": 0, "uvlock": false }, + + "down=false,east=false,lit=true,north=false,south=false,up=false,west=false": { "model": "baseelectric:led_bar_on_n", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=true,north=false,south=false,up=false,west=false": { "model": "baseelectric:led_bar_on_n", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,lit=true,north=false,south=false,up=false,west=false": { "model": "baseelectric:led_bar_on_n", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,lit=true,north=true,south=false,up=false,west=false": { "model": "baseelectric:led_bar_on_n", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,lit=true,north=false,south=true,up=false,west=false": { "model": "baseelectric:led_bar_on_n", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=false,lit=true,north=false,south=false,up=true,west=false": { "model": "baseelectric:led_bar_on_n", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,lit=true,north=false,south=false,up=false,west=true": { "model": "baseelectric:led_bar_on_n", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,lit=true,north=false,south=false,up=false,west=false": { "model": "baseelectric:led_bar_on_nw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=false,lit=true,north=true,south=false,up=false,west=false": { "model": "baseelectric:led_bar_on_nw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,lit=true,north=false,south=true,up=false,west=false": { "model": "baseelectric:led_bar_on_nw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,lit=true,north=false,south=false,up=true,west=false": { "model": "baseelectric:led_bar_on_ns", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=true,north=false,south=false,up=false,west=true": { "model": "baseelectric:led_bar_on_nw", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,lit=true,north=true,south=false,up=false,west=false": { "model": "baseelectric:led_bar_on_nw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,lit=true,north=false,south=true,up=false,west=false": { "model": "baseelectric:led_bar_on_nw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,lit=true,north=false,south=false,up=true,west=false": { "model": "baseelectric:led_bar_on_nw", "x": 270, "y": 180, "uvlock": false }, + "down=false,east=true,lit=true,north=false,south=false,up=false,west=true": { "model": "baseelectric:led_bar_on_ns", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,lit=true,north=true,south=true,up=false,west=false": { "model": "baseelectric:led_bar_on_ns", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,lit=true,north=true,south=false,up=true,west=false": { "model": "baseelectric:led_bar_on_nw", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,lit=true,north=true,south=false,up=false,west=true": { "model": "baseelectric:led_bar_on_nw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,lit=true,north=false,south=true,up=true,west=false": { "model": "baseelectric:led_bar_on_nw", "x": 270, "y": 270, "uvlock": false }, + "down=false,east=false,lit=true,north=false,south=true,up=false,west=true": { "model": "baseelectric:led_bar_on_nw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,lit=true,north=false,south=false,up=true,west=true": { "model": "baseelectric:led_bar_on_nw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,lit=true,north=true,south=false,up=false,west=false": { "model": "baseelectric:led_bar_on_nuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,lit=true,north=false,south=true,up=false,west=false": { "model": "baseelectric:led_bar_on_nuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,lit=true,north=false,south=false,up=true,west=false": { "model": "baseelectric:led_bar_on_dnu", "x": 0, "y": 90, "uvlock": false }, + "down=true,east=true,lit=true,north=false,south=false,up=false,west=true": { "model": "baseelectric:led_bar_on_dnu", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,lit=true,north=true,south=true,up=false,west=false": { "model": "baseelectric:led_bar_on_dnu", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=true,north=true,south=false,up=true,west=false": { "model": "baseelectric:led_bar_on_dnu", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,lit=true,north=true,south=false,up=false,west=true": { "model": "baseelectric:led_bar_on_nuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=true,north=false,south=true,up=true,west=false": { "model": "baseelectric:led_bar_on_dnu", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=false,lit=true,north=false,south=true,up=false,west=true": { "model": "baseelectric:led_bar_on_nuw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,lit=true,north=false,south=false,up=true,west=true": { "model": "baseelectric:led_bar_on_dnu", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,lit=true,north=true,south=true,up=false,west=false": { "model": "baseelectric:led_bar_on_nsw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,lit=true,north=true,south=false,up=true,west=false": { "model": "baseelectric:led_bar_on_nuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,lit=true,north=true,south=false,up=false,west=true": { "model": "baseelectric:led_bar_on_nsw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,lit=true,north=false,south=true,up=true,west=false": { "model": "baseelectric:led_bar_on_nuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,lit=true,north=false,south=true,up=false,west=true": { "model": "baseelectric:led_bar_on_nsw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,lit=true,north=false,south=false,up=true,west=true": { "model": "baseelectric:led_bar_on_dnu", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,lit=true,north=true,south=true,up=true,west=false": { "model": "baseelectric:led_bar_on_dnu", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,lit=true,north=true,south=true,up=false,west=true": { "model": "baseelectric:led_bar_on_nsw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,lit=true,north=true,south=false,up=true,west=true": { "model": "baseelectric:led_bar_on_nuw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,lit=true,north=false,south=true,up=true,west=true": { "model": "baseelectric:led_bar_on_nuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,lit=true,north=true,south=true,up=false,west=false": { "model": "baseelectric:led_bar_on_nsuw", "x": 180, "y": 180, "uvlock": false }, + "down=true,east=true,lit=true,north=true,south=false,up=true,west=false": { "model": "baseelectric:led_bar_on_nsuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,lit=true,north=true,south=false,up=false,west=true": { "model": "baseelectric:led_bar_on_nsuw", "x": 180, "y": 90, "uvlock": false }, + "down=true,east=true,lit=true,north=false,south=true,up=true,west=false": { "model": "baseelectric:led_bar_on_nsuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,lit=true,north=false,south=true,up=false,west=true": { "model": "baseelectric:led_bar_on_nsuw", "x": 180, "y": 270, "uvlock": false }, + "down=true,east=true,lit=true,north=false,south=false,up=true,west=true": { "model": "baseelectric:led_bar_on_ensw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=true,north=true,south=true,up=true,west=false": { "model": "baseelectric:led_bar_on_ensw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,lit=true,north=true,south=true,up=false,west=true": { "model": "baseelectric:led_bar_on_nsuw", "x": 180, "y": 0, "uvlock": false }, + "down=true,east=false,lit=true,north=true,south=false,up=true,west=true": { "model": "baseelectric:led_bar_on_nsuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=true,north=false,south=true,up=true,west=true": { "model": "baseelectric:led_bar_on_nsuw", "x": 90, "y": 270, "uvlock": false }, + "down=false,east=true,lit=true,north=true,south=true,up=true,west=false": { "model": "baseelectric:led_bar_on_nsuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,lit=true,north=true,south=true,up=false,west=true": { "model": "baseelectric:led_bar_on_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=true,lit=true,north=true,south=false,up=true,west=true": { "model": "baseelectric:led_bar_on_nsuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,lit=true,north=false,south=true,up=true,west=true": { "model": "baseelectric:led_bar_on_nsuw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,lit=true,north=true,south=true,up=true,west=true": { "model": "baseelectric:led_bar_on_nsuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=true,lit=true,north=true,south=true,up=true,west=false": { "model": "baseelectric:led_bar_on_desuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,lit=true,north=true,south=true,up=false,west=true": { "model": "baseelectric:led_bar_on_desuw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,lit=true,north=true,south=false,up=true,west=true": { "model": "baseelectric:led_bar_on_desuw", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=true,lit=true,north=false,south=true,up=true,west=true": { "model": "baseelectric:led_bar_on_desuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,lit=true,north=true,south=true,up=true,west=true": { "model": "baseelectric:led_bar_on_desuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,lit=true,north=true,south=true,up=true,west=true": { "model": "baseelectric:led_bar_on_desuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=true,lit=true,north=true,south=true,up=true,west=true": { "model": "baseelectric:led_bar_on_densuw", "x": 0, "y": 0, "uvlock": false } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/baseelectric/blockstates/li_ore.json b/src/main/resources/assets/baseelectric/blockstates/li_ore.json new file mode 100644 index 0000000..a26c252 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/li_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "baseelectric:li_ore" } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/photovoltaic_generator.json b/src/main/resources/assets/baseelectric/blockstates/photovoltaic_generator.json new file mode 100644 index 0000000..061c9ec --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/photovoltaic_generator.json @@ -0,0 +1,12 @@ +{ + "variants": { + "active=true,facing=east": { "model": "baseelectric:photovoltaic_generator", "y": 90 }, + "active=true,facing=north": { "model": "baseelectric:photovoltaic_generator" }, + "active=true,facing=south": { "model": "baseelectric:photovoltaic_generator", "y": 180 }, + "active=true,facing=west": { "model": "baseelectric:photovoltaic_generator", "y": 270 }, + "active=false,facing=east": { "model": "baseelectric:photovoltaic_generator", "y": 90 }, + "active=false,facing=north": { "model": "baseelectric:photovoltaic_generator" }, + "active=false,facing=south": { "model": "baseelectric:photovoltaic_generator", "y": 180 }, + "active=false,facing=west": { "model": "baseelectric:photovoltaic_generator", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/plastic_refinery.json b/src/main/resources/assets/baseelectric/blockstates/plastic_refinery.json new file mode 100644 index 0000000..8f77563 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/plastic_refinery.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:plastic_refinery_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:plastic_refinery_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:plastic_refinery_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:plastic_refinery_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:plastic_refinery_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:plastic_refinery_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:plastic_refinery_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:plastic_refinery_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:plastic_refinery_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:plastic_refinery_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:plastic_refinery_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:plastic_refinery_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:plastic_refinery_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:plastic_refinery_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:plastic_refinery_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:plastic_refinery_on", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/pump_pipe_electric.json b/src/main/resources/assets/baseelectric/blockstates/pump_pipe_electric.json new file mode 100644 index 0000000..4051e54 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/pump_pipe_electric.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/baseelectric/blockstates/steam_powered_generator.json b/src/main/resources/assets/baseelectric/blockstates/steam_powered_generator.json new file mode 100644 index 0000000..f883c7f --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/steam_powered_generator.json @@ -0,0 +1,12 @@ +{ + "variants": { + "active=true,facing=east": { "model": "baseelectric:steam_powered_generator_on", "y": 90 }, + "active=true,facing=north": { "model": "baseelectric:steam_powered_generator_on" }, + "active=true,facing=south": { "model": "baseelectric:steam_powered_generator_on", "y": 180 }, + "active=true,facing=west": { "model": "baseelectric:steam_powered_generator_on", "y": 270 }, + "active=false,facing=east": { "model": "baseelectric:steam_powered_generator_off", "y": 90 }, + "active=false,facing=north": { "model": "baseelectric:steam_powered_generator_off" }, + "active=false,facing=south": { "model": "baseelectric:steam_powered_generator_off", "y": 180 }, + "active=false,facing=west": { "model": "baseelectric:steam_powered_generator_off", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/sulfur_ore.json b/src/main/resources/assets/baseelectric/blockstates/sulfur_ore.json new file mode 100644 index 0000000..1a97290 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/sulfur_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "baseelectric:sulfur_ore" } + } +} diff --git a/src/main/resources/assets/baseelectric/lang/de_DE.lang b/src/main/resources/assets/baseelectric/lang/de_DE.lang new file mode 100644 index 0000000..d3520e7 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/de_DE.lang @@ -0,0 +1,54 @@ +language_support_goals=Englisch (en_US, de_DE, en_CA, de_DE, en_AU, en_PT), Spanisch (es_MX, es_ES), Chinesisch (zh_CN), Japanisch (ja_JA), Portugiesisch (pt_BR), Deutsch (de_DE), Italienisch (it_IT), Koreanisch (ko_KR) + +item.baseelectric.blank_circuit_board.name=Leiterplatte (Leer) +item.baseelectric.control_circuit.name=Steuerstromkreis +item.baseelectric.integrated_circuit.name=Mikrochip +item.baseelectric.psu.name=Netzteil +item.baseelectric.silicon_ingot.name=Silizium-Ingots +item.baseelectric.silicon_mix.name=Silizium-Mischung +item.baseelectric.solder_mix.name=Lötmetall Mischung +item.baseelectric.solder.name=Lötmetall +item.baseelectric.li_powder.name=Pulverisierte Lithium +item.baseelectric.li_ingot.name=Lithium-Barren +item.baseelectric.li_nugget.name=Lithium Nugget +item.baseelectric.sulfur_powder.name=Schwefelpulver +item.baseelectric.lead_acid_battery.name=Blei-Säure-Batterie +item.baseelectric.nickel_hydride_battery.name=Nickel-Metallhydrid-Batterie +item.baseelectric.alkaline_battery.name=Alkali-Batterie +item.baseelectric.lithium_battery.name=Lithium-Ionen-Batterie + +tile.baseelectric.electric_conduit.name=Elektrischen Draht +tile.baseelectric.electric_track.name=Elektro-Gerüst +tile.baseelectric.electric_battery_array.name=Batterie Array +tile.baseelectric.electric_crusher.name=Elektrische Felsen-Zerkleinerungsmaschine +tile.baseelectric.laser_turret.name=Laser-Verteidigung Waffe +tile.baseelectric.electric_drill.name=Laser Bohrer +tile.baseelectric.electric_fabricator.name=Automatisierte Fabrik +tile.baseelectric.electric_furnace.name=Lichtbogenofen +tile.baseelectric.electric_oven.name=Elektro-Ofen +tile.baseelectric.electric_pcb_printer.name=PCB Drucker +tile.baseelectric.geothermal_generator.name=Geothermal Generator +tile.baseelectric.hydroelectric_generator.name=Hydroelectric Generator +tile.baseelectric.photovoltaic_generator.name=Photovoltaik-Generator +tile.baseelectric.steam_powered_generator.name=Pumpenlose Stromerzeuger +tile.baseelectric.growth_chamber.name=Wachstumskammer +tile.baseelectric.growth_chamber_controller.name=Wachstumskammer Steuereinheit +tile.baseelectric.li_ore.name=Lithiumerz +tile.baseelectric.sulfur_ore.name=Schwefelerz +tile.baseelectric.led_bar.name=LED Draht + +tooltip.battery.charge=Lade +tooltip.battery.capacity=Kapazität + +death.attack.laser=%1$s verdampft +death.attack.laser.player=%2$s verdampft %1$s +death.attack.propeller=%1$s wurde von einem Propeller pulverisiert. +death.attack.propeller.player=%2$s geschoben %1$s in einen Propeller. + + +tile.baseelectric.electric_switch.name=Elektrische Schalter +tile.baseelectric.electric_still.name=Elektro Brennerei +tile.baseelectric.electric_pump.name=Elektropumpe +tile.baseelectric.plastic_refinery.name=Kunststoff-Raffinerie +item.baseelectric.petrolplastic_ingot.name=Erdöl Kunststoff Barren +tile.baseelectric.pump_pipe_electric.name=Pumpenrohr diff --git a/src/main/resources/assets/baseelectric/lang/en_AU.lang b/src/main/resources/assets/baseelectric/lang/en_AU.lang new file mode 100644 index 0000000..c20bc22 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/en_AU.lang @@ -0,0 +1,54 @@ +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.baseelectric.blank_circuit_board.name=Circuit Board (Blank) +item.baseelectric.control_circuit.name=Control Circuit +item.baseelectric.integrated_circuit.name=Microchip +item.baseelectric.psu.name=Power Supply Unit +item.baseelectric.silicon_ingot.name=Silicon Ingot +item.baseelectric.silicon_mix.name=Silicon Blend +item.baseelectric.solder_mix.name=Solder Blend +item.baseelectric.solder.name=Solder +item.baseelectric.li_powder.name=Powdered Lithium +item.baseelectric.li_ingot.name=Lithium Ingot +item.baseelectric.li_nugget.name=Lithium Nugget +item.baseelectric.sulfur_powder.name=Powdered Sulfur +item.baseelectric.lead_acid_battery.name=Lead-Acid Battery +item.baseelectric.nickel_hydride_battery.name=Nickel-Metal Hydride Battery +item.baseelectric.alkaline_battery.name=Alkaline Battery +item.baseelectric.lithium_battery.name=Lithium-Ion Battery + +tile.baseelectric.electric_conduit.name=Electric Power Cable +tile.baseelectric.electric_track.name=Electric Scaffold +tile.baseelectric.electric_battery_array.name=Battery Array +tile.baseelectric.electric_crusher.name=Electric Rock Crusher +tile.baseelectric.laser_turret.name=Laser Defense Turret +tile.baseelectric.electric_drill.name=Electric Mining Drill +tile.baseelectric.electric_fabricator.name=Automated Assembler +tile.baseelectric.electric_furnace.name=Electric Arc Furnace +tile.baseelectric.electric_oven.name=Electric Oven +tile.baseelectric.electric_pcb_printer.name=PCB Printer +tile.baseelectric.geothermal_generator.name=Geothermal Generator +tile.baseelectric.hydroelectric_generator.name=Hydroelectric Generator +tile.baseelectric.photovoltaic_generator.name=Photovoltaic Generator +tile.baseelectric.steam_powered_generator.name=Steam-Powered Electric Generator +tile.baseelectric.growth_chamber.name=Growth Chamber +tile.baseelectric.growth_chamber_controller.name=Growth Chamber Control Unit +tile.baseelectric.li_ore.name=Lithium Ore +tile.baseelectric.sulfur_ore.name=Sulfur Ore +tile.baseelectric.led_bar.name=LED Bar + +tooltip.battery.charge=Charge +tooltip.battery.capacity=Capacity + +death.attack.laser=%1$s vaporized +death.attack.laser.player=%2$s vaporized %1$s +death.attack.propeller=%1$s was pulverized by a propeller. +death.attack.propeller.player=%2$s pushed %1$s into a propeller. + + +tile.baseelectric.electric_switch.name=Electric Switch +tile.baseelectric.electric_still.name=Electric Distiller +tile.baseelectric.electric_pump.name=Electric Pump +tile.baseelectric.plastic_refinery.name=Petro-Plastic Refinery +item.baseelectric.petrolplastic_ingot.name=Petro-Plastic Ingot +tile.baseelectric.pump_pipe_electric.name=Pump Pipe diff --git a/src/main/resources/assets/baseelectric/lang/en_CA.lang b/src/main/resources/assets/baseelectric/lang/en_CA.lang new file mode 100644 index 0000000..c20bc22 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/en_CA.lang @@ -0,0 +1,54 @@ +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.baseelectric.blank_circuit_board.name=Circuit Board (Blank) +item.baseelectric.control_circuit.name=Control Circuit +item.baseelectric.integrated_circuit.name=Microchip +item.baseelectric.psu.name=Power Supply Unit +item.baseelectric.silicon_ingot.name=Silicon Ingot +item.baseelectric.silicon_mix.name=Silicon Blend +item.baseelectric.solder_mix.name=Solder Blend +item.baseelectric.solder.name=Solder +item.baseelectric.li_powder.name=Powdered Lithium +item.baseelectric.li_ingot.name=Lithium Ingot +item.baseelectric.li_nugget.name=Lithium Nugget +item.baseelectric.sulfur_powder.name=Powdered Sulfur +item.baseelectric.lead_acid_battery.name=Lead-Acid Battery +item.baseelectric.nickel_hydride_battery.name=Nickel-Metal Hydride Battery +item.baseelectric.alkaline_battery.name=Alkaline Battery +item.baseelectric.lithium_battery.name=Lithium-Ion Battery + +tile.baseelectric.electric_conduit.name=Electric Power Cable +tile.baseelectric.electric_track.name=Electric Scaffold +tile.baseelectric.electric_battery_array.name=Battery Array +tile.baseelectric.electric_crusher.name=Electric Rock Crusher +tile.baseelectric.laser_turret.name=Laser Defense Turret +tile.baseelectric.electric_drill.name=Electric Mining Drill +tile.baseelectric.electric_fabricator.name=Automated Assembler +tile.baseelectric.electric_furnace.name=Electric Arc Furnace +tile.baseelectric.electric_oven.name=Electric Oven +tile.baseelectric.electric_pcb_printer.name=PCB Printer +tile.baseelectric.geothermal_generator.name=Geothermal Generator +tile.baseelectric.hydroelectric_generator.name=Hydroelectric Generator +tile.baseelectric.photovoltaic_generator.name=Photovoltaic Generator +tile.baseelectric.steam_powered_generator.name=Steam-Powered Electric Generator +tile.baseelectric.growth_chamber.name=Growth Chamber +tile.baseelectric.growth_chamber_controller.name=Growth Chamber Control Unit +tile.baseelectric.li_ore.name=Lithium Ore +tile.baseelectric.sulfur_ore.name=Sulfur Ore +tile.baseelectric.led_bar.name=LED Bar + +tooltip.battery.charge=Charge +tooltip.battery.capacity=Capacity + +death.attack.laser=%1$s vaporized +death.attack.laser.player=%2$s vaporized %1$s +death.attack.propeller=%1$s was pulverized by a propeller. +death.attack.propeller.player=%2$s pushed %1$s into a propeller. + + +tile.baseelectric.electric_switch.name=Electric Switch +tile.baseelectric.electric_still.name=Electric Distiller +tile.baseelectric.electric_pump.name=Electric Pump +tile.baseelectric.plastic_refinery.name=Petro-Plastic Refinery +item.baseelectric.petrolplastic_ingot.name=Petro-Plastic Ingot +tile.baseelectric.pump_pipe_electric.name=Pump Pipe diff --git a/src/main/resources/assets/baseelectric/lang/en_EN.lang b/src/main/resources/assets/baseelectric/lang/en_EN.lang new file mode 100644 index 0000000..733bb5f --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/en_EN.lang @@ -0,0 +1,54 @@ +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.baseelectric.blank_circuit_board.name=Circuit Board (Blank) +item.baseelectric.control_circuit.name=Control Circuit +item.baseelectric.integrated_circuit.name=Microchip +item.baseelectric.psu.name=Power Supply Unit +item.baseelectric.silicon_ingot.name=Silicon Ingot +item.baseelectric.silicon_mix.name=Silicon Blend +item.baseelectric.solder_mix.name=Solder Blend +item.baseelectric.solder.name=Solder +item.baseelectric.li_powder.name=Powdered Lithium +item.baseelectric.li_ingot.name=Lithium Ingot +item.baseelectric.li_nugget.name=Lithium Nugget +item.baseelectric.sulfur_powder.name=Powdered Sulfur +item.baseelectric.lead_acid_battery.name=Lead-Acid Battery +item.baseelectric.nickel_hydride_battery.name=Nickel-Metal Hydride Battery +item.baseelectric.alkaline_battery.name=Alkaline Battery +item.baseelectric.lithium_battery.name=Lithium-Ion Battery + +tile.baseelectric.electric_conduit.name=Electric Power Cable +tile.baseelectric.electric_track.name=Electric Scaffold +tile.baseelectric.electric_battery_array.name=Battery Array +tile.baseelectric.electric_crusher.name=Electric Rock Crusher +tile.baseelectric.laser_turret.name=Laser Turret +tile.baseelectric.electric_drill.name=Electric Mining Drill +tile.baseelectric.electric_fabricator.name=Automated Assembler +tile.baseelectric.electric_furnace.name=Electric Arc Furnace +tile.baseelectric.electric_oven.name=Electric Oven +tile.baseelectric.electric_pcb_printer.name=PCB Printer +tile.baseelectric.geothermal_generator.name=Geothermal Generator +tile.baseelectric.hydroelectric_generator.name=Hydroelectric Generator +tile.baseelectric.photovoltaic_generator.name=Photovoltaic Generator +tile.baseelectric.steam_powered_generator.name=Steam-Powered Electric Generator +tile.baseelectric.growth_chamber.name=Growth Chamber +tile.baseelectric.growth_chamber_controller.name=Growth Chamber Control Unit +tile.baseelectric.li_ore.name=Lithium Ore +tile.baseelectric.sulfur_ore.name=Sulfur Ore +tile.baseelectric.led_bar.name=LED Bar + +tooltip.battery.charge=Charge +tooltip.battery.capacity=Capacity + +death.attack.laser=%1$s vaporized +death.attack.laser.player=%2$s vaporized %1$s +death.attack.propeller=%1$s was pulverized by a propeller. +death.attack.propeller.player=%2$s pushed %1$s into a propeller. + + +tile.baseelectric.electric_switch.name=Electric Switch +tile.baseelectric.electric_still.name=Electric Distiller +tile.baseelectric.electric_pump.name=Electric Pump +tile.baseelectric.plastic_refinery.name=Petro-Plastic Refinery +item.baseelectric.petrolplastic_ingot.name=Petro-Plastic Ingot +tile.baseelectric.pump_pipe_electric.name=Pump Pipe diff --git a/src/main/resources/assets/baseelectric/lang/en_GB.lang b/src/main/resources/assets/baseelectric/lang/en_GB.lang new file mode 100644 index 0000000..c20bc22 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/en_GB.lang @@ -0,0 +1,54 @@ +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.baseelectric.blank_circuit_board.name=Circuit Board (Blank) +item.baseelectric.control_circuit.name=Control Circuit +item.baseelectric.integrated_circuit.name=Microchip +item.baseelectric.psu.name=Power Supply Unit +item.baseelectric.silicon_ingot.name=Silicon Ingot +item.baseelectric.silicon_mix.name=Silicon Blend +item.baseelectric.solder_mix.name=Solder Blend +item.baseelectric.solder.name=Solder +item.baseelectric.li_powder.name=Powdered Lithium +item.baseelectric.li_ingot.name=Lithium Ingot +item.baseelectric.li_nugget.name=Lithium Nugget +item.baseelectric.sulfur_powder.name=Powdered Sulfur +item.baseelectric.lead_acid_battery.name=Lead-Acid Battery +item.baseelectric.nickel_hydride_battery.name=Nickel-Metal Hydride Battery +item.baseelectric.alkaline_battery.name=Alkaline Battery +item.baseelectric.lithium_battery.name=Lithium-Ion Battery + +tile.baseelectric.electric_conduit.name=Electric Power Cable +tile.baseelectric.electric_track.name=Electric Scaffold +tile.baseelectric.electric_battery_array.name=Battery Array +tile.baseelectric.electric_crusher.name=Electric Rock Crusher +tile.baseelectric.laser_turret.name=Laser Defense Turret +tile.baseelectric.electric_drill.name=Electric Mining Drill +tile.baseelectric.electric_fabricator.name=Automated Assembler +tile.baseelectric.electric_furnace.name=Electric Arc Furnace +tile.baseelectric.electric_oven.name=Electric Oven +tile.baseelectric.electric_pcb_printer.name=PCB Printer +tile.baseelectric.geothermal_generator.name=Geothermal Generator +tile.baseelectric.hydroelectric_generator.name=Hydroelectric Generator +tile.baseelectric.photovoltaic_generator.name=Photovoltaic Generator +tile.baseelectric.steam_powered_generator.name=Steam-Powered Electric Generator +tile.baseelectric.growth_chamber.name=Growth Chamber +tile.baseelectric.growth_chamber_controller.name=Growth Chamber Control Unit +tile.baseelectric.li_ore.name=Lithium Ore +tile.baseelectric.sulfur_ore.name=Sulfur Ore +tile.baseelectric.led_bar.name=LED Bar + +tooltip.battery.charge=Charge +tooltip.battery.capacity=Capacity + +death.attack.laser=%1$s vaporized +death.attack.laser.player=%2$s vaporized %1$s +death.attack.propeller=%1$s was pulverized by a propeller. +death.attack.propeller.player=%2$s pushed %1$s into a propeller. + + +tile.baseelectric.electric_switch.name=Electric Switch +tile.baseelectric.electric_still.name=Electric Distiller +tile.baseelectric.electric_pump.name=Electric Pump +tile.baseelectric.plastic_refinery.name=Petro-Plastic Refinery +item.baseelectric.petrolplastic_ingot.name=Petro-Plastic Ingot +tile.baseelectric.pump_pipe_electric.name=Pump Pipe diff --git a/src/main/resources/assets/baseelectric/lang/en_PT.lang b/src/main/resources/assets/baseelectric/lang/en_PT.lang new file mode 100644 index 0000000..733bb5f --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/en_PT.lang @@ -0,0 +1,54 @@ +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.baseelectric.blank_circuit_board.name=Circuit Board (Blank) +item.baseelectric.control_circuit.name=Control Circuit +item.baseelectric.integrated_circuit.name=Microchip +item.baseelectric.psu.name=Power Supply Unit +item.baseelectric.silicon_ingot.name=Silicon Ingot +item.baseelectric.silicon_mix.name=Silicon Blend +item.baseelectric.solder_mix.name=Solder Blend +item.baseelectric.solder.name=Solder +item.baseelectric.li_powder.name=Powdered Lithium +item.baseelectric.li_ingot.name=Lithium Ingot +item.baseelectric.li_nugget.name=Lithium Nugget +item.baseelectric.sulfur_powder.name=Powdered Sulfur +item.baseelectric.lead_acid_battery.name=Lead-Acid Battery +item.baseelectric.nickel_hydride_battery.name=Nickel-Metal Hydride Battery +item.baseelectric.alkaline_battery.name=Alkaline Battery +item.baseelectric.lithium_battery.name=Lithium-Ion Battery + +tile.baseelectric.electric_conduit.name=Electric Power Cable +tile.baseelectric.electric_track.name=Electric Scaffold +tile.baseelectric.electric_battery_array.name=Battery Array +tile.baseelectric.electric_crusher.name=Electric Rock Crusher +tile.baseelectric.laser_turret.name=Laser Turret +tile.baseelectric.electric_drill.name=Electric Mining Drill +tile.baseelectric.electric_fabricator.name=Automated Assembler +tile.baseelectric.electric_furnace.name=Electric Arc Furnace +tile.baseelectric.electric_oven.name=Electric Oven +tile.baseelectric.electric_pcb_printer.name=PCB Printer +tile.baseelectric.geothermal_generator.name=Geothermal Generator +tile.baseelectric.hydroelectric_generator.name=Hydroelectric Generator +tile.baseelectric.photovoltaic_generator.name=Photovoltaic Generator +tile.baseelectric.steam_powered_generator.name=Steam-Powered Electric Generator +tile.baseelectric.growth_chamber.name=Growth Chamber +tile.baseelectric.growth_chamber_controller.name=Growth Chamber Control Unit +tile.baseelectric.li_ore.name=Lithium Ore +tile.baseelectric.sulfur_ore.name=Sulfur Ore +tile.baseelectric.led_bar.name=LED Bar + +tooltip.battery.charge=Charge +tooltip.battery.capacity=Capacity + +death.attack.laser=%1$s vaporized +death.attack.laser.player=%2$s vaporized %1$s +death.attack.propeller=%1$s was pulverized by a propeller. +death.attack.propeller.player=%2$s pushed %1$s into a propeller. + + +tile.baseelectric.electric_switch.name=Electric Switch +tile.baseelectric.electric_still.name=Electric Distiller +tile.baseelectric.electric_pump.name=Electric Pump +tile.baseelectric.plastic_refinery.name=Petro-Plastic Refinery +item.baseelectric.petrolplastic_ingot.name=Petro-Plastic Ingot +tile.baseelectric.pump_pipe_electric.name=Pump Pipe diff --git a/src/main/resources/assets/baseelectric/lang/en_US.lang b/src/main/resources/assets/baseelectric/lang/en_US.lang new file mode 100644 index 0000000..985dad9 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/en_US.lang @@ -0,0 +1,54 @@ +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.baseelectric.blank_circuit_board.name=Circuit Board (Blank) +item.baseelectric.control_circuit.name=Control Circuit +item.baseelectric.integrated_circuit.name=Microchip +item.baseelectric.psu.name=Power Supply Unit +item.baseelectric.silicon_ingot.name=Silicon Ingot +item.baseelectric.silicon_mix.name=Silicon Blend +item.baseelectric.solder_mix.name=Solder Blend +item.baseelectric.solder.name=Solder +item.baseelectric.li_powder.name=Powdered Lithium +item.baseelectric.li_ingot.name=Lithium Ingot +item.baseelectric.li_nugget.name=Lithium Nugget +item.baseelectric.sulfur_powder.name=Powdered Sulfur +item.baseelectric.lead_acid_battery.name=Lead-Acid Battery +item.baseelectric.nickel_hydride_battery.name=Nickel-Metal Hydride Battery +item.baseelectric.alkaline_battery.name=Alkaline Battery +item.baseelectric.lithium_battery.name=Lithium-Ion Battery + +tile.baseelectric.electric_conduit.name=Electric Power Cable +tile.baseelectric.electric_track.name=Electric Scaffold +tile.baseelectric.electric_battery_array.name=Battery Array +tile.baseelectric.electric_crusher.name=Electric Rock Crusher +tile.baseelectric.laser_turret.name=Laser Turret +tile.baseelectric.electric_drill.name=Electric Mining Drill +tile.baseelectric.electric_fabricator.name=Automated Assembler +tile.baseelectric.electric_furnace.name=Electric Arc Furnace +tile.baseelectric.electric_oven.name=Electric Oven +tile.baseelectric.electric_pcb_printer.name=PCB Printer +tile.baseelectric.geothermal_generator.name=Geothermal Generator +tile.baseelectric.hydroelectric_generator.name=Hydroelectric Generator +tile.baseelectric.photovoltaic_generator.name=Photovoltaic Generator +tile.baseelectric.steam_powered_generator.name=Steam-Powered Electric Generator +tile.baseelectric.growth_chamber.name=Growth Chamber +tile.baseelectric.growth_chamber_controller.name=Growth Chamber Control Unit +tile.baseelectric.li_ore.name=Lithium Ore +tile.baseelectric.sulfur_ore.name=Sulfur Ore +tile.baseelectric.led_bar.name=LED Bar + +tooltip.battery.charge=Charge +tooltip.battery.capacity=Capacity + +death.attack.laser=%1$s vaporized +death.attack.laser.player=%2$s vaporized %1$s +death.attack.propeller=%1$s was pulverized by a propeller. +death.attack.propeller.player=%2$s pushed %1$s into a propeller. + +tile.baseelectric.electric_switch.name=Electric Switch +tile.baseelectric.electric_still.name=Electric Distiller +tile.baseelectric.electric_pump.name=Electric Pump +tile.baseelectric.plastic_refinery.name=Petro-Plastic Refinery +item.baseelectric.petrolplastic_ingot.name=Petro-Plastic Ingot +tile.baseelectric.pump_pipe_electric.name=Pump Pipe + diff --git a/src/main/resources/assets/baseelectric/lang/es_ES.lang b/src/main/resources/assets/baseelectric/lang/es_ES.lang new file mode 100644 index 0000000..cd4aa18 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/es_ES.lang @@ -0,0 +1,55 @@ +language_support_goals=Inglés (en_US, en_EN, en_CA, es_ES, es_ES, en_PT), Español (es_MX, es_ES), chino (zh_CN), japonés (ja_JA), portugués (pt_BR), Alemán (de_DE), italiano (it_IT), coreano (ko_KR) + +item.baseelectric.blank_circuit_board.name=Placa de Circuito (Blanco) +item.baseelectric.control_circuit.name=Circuito de Computadora +item.baseelectric.integrated_circuit.name=Microchip +item.baseelectric.psu.name=Unidad de Fuente de Alimentación +item.baseelectric.silicon_ingot.name=Silicio Lingote +item.baseelectric.silicon_mix.name=Blend Silicio +item.baseelectric.solder_mix.name=Blend Soldadura +item.baseelectric.solder.name=Soldadura +item.baseelectric.li_powder.name=Polvo de Litio +item.baseelectric.li_ingot.name=Litio Lingote +item.baseelectric.li_nugget.name=Pepita de Litio +item.baseelectric.sulfur_powder.name=Azufre en Polvo +item.baseelectric.lead_acid_battery.name=Plomo-Ácido de la Batería +item.baseelectric.nickel_hydride_battery.name=Níquel e Hidruro Metálico +item.baseelectric.alkaline_battery.name=Batería Alcalina +item.baseelectric.lithium_battery.name=Batería de Litio-Ion + +tile.baseelectric.electric_conduit.name=Cable de Energía Eléctrica +tile.baseelectric.electric_track.name=Eléctrica Andamios +tile.baseelectric.electric_battery_array.name=Batería Matriz +tile.baseelectric.electric_crusher.name=Eléctrica de la Roca Trituradora +tile.baseelectric.laser_turret.name=Laser Defensa Torreta +tile.baseelectric.electric_drill.name=Eléctrica Minería Taladro +tile.baseelectric.electric_fabricator.name=Automatizado Ensamblador +tile.baseelectric.electric_furnace.name=Horno de Arco Eléctrico +tile.baseelectric.electric_oven.name=Horno Eléctrico +tile.baseelectric.electric_pcb_printer.name=PCB Impresora +tile.baseelectric.geothermal_generator.name=Geotérmica Generador +tile.baseelectric.hydroelectric_generator.name=Hidroeléctrico Generador +tile.baseelectric.photovoltaic_generator.name=Fotovoltaica Generador +tile.baseelectric.steam_powered_generator.name=a Vapor Generador Eléctrico +tile.baseelectric.growth_chamber.name=Cámara Crecimiento +tile.baseelectric.growth_chamber_controller.name=Unidad de Control de Crecimiento Cámara +tile.baseelectric.li_ore.name=Mineral de Litio +tile.baseelectric.sulfur_ore.name=Mineral de Azufre +tile.baseelectric.led_bar.name=Luz LED + +tooltip.battery.charge=Carga +tooltip.battery.capacity=Capacidad + +death.attack.laser=%1$s vaporiza +death.attack.laser.player=%2$s vaporizado s%1$s +death.attack.propeller=%1$s se pulverizan por una hélice. +death.attack.propeller.player=%2$s empujaron %1$s en la hélice. + + + +tile.baseelectric.electric_switch.name=Interruptor Eléctrico +tile.baseelectric.electric_still.name=Destilador Eléctrico +tile.baseelectric.electric_pump.name=Bomba Eléctrica +tile.baseelectric.plastic_refinery.name=Refinería de Plástico +item.baseelectric.petrolplastic_ingot.name=Petróleo Lingote de Plástico +tile.baseelectric.pump_pipe_electric.name=Tubería de la Bomba diff --git a/src/main/resources/assets/baseelectric/lang/es_MX.lang b/src/main/resources/assets/baseelectric/lang/es_MX.lang new file mode 100644 index 0000000..d54915b --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/es_MX.lang @@ -0,0 +1,53 @@ +language_support_goals=Inglés (en_US, en_EN, en_CA, es_ES, es_ES, en_PT), Español (es_MX, es_ES), chino (zh_CN), japonés (ja_JA), portugués (pt_BR), Alemán (de_DE), italiano (it_IT), coreano (ko_KR) + +item.baseelectric.blank_circuit_board.name=Placa de Circuito (Blanco) +item.baseelectric.control_circuit.name=Circuito de Computadora +item.baseelectric.integrated_circuit.name=Microchip +item.baseelectric.psu.name=Unidad de Fuente de Alimentación +item.baseelectric.silicon_ingot.name=Silicio Lingote +item.baseelectric.silicon_mix.name=Blend Silicio +item.baseelectric.solder_mix.name=Blend Soldadura +item.baseelectric.solder.name=Soldadura +item.baseelectric.li_powder.name=Polvo de Litio +item.baseelectric.li_ingot.name=Litio Lingote +item.baseelectric.li_nugget.name=Pepita de Litio +item.baseelectric.sulfur_powder.name=Azufre en Polvo +item.baseelectric.lead_acid_battery.name=Plomo-Ácido de la Batería +item.baseelectric.nickel_hydride_battery.name=Níquel e Hidruro Metálico +item.baseelectric.alkaline_battery.name=Batería Alcalina +item.baseelectric.lithium_battery.name=Batería de Litio-Ion + +tile.baseelectric.electric_conduit.name=Cable de Energía Eléctrica +tile.baseelectric.electric_track.name=Eléctrica Andamios +tile.baseelectric.electric_battery_array.name=Batería Matriz +tile.baseelectric.electric_crusher.name=Eléctrica de la Roca Trituradora +tile.baseelectric.laser_turret.name=Laser Defensa Torreta +tile.baseelectric.electric_drill.name=Eléctrica Minería Taladro +tile.baseelectric.electric_fabricator.name=Automatizado Ensamblador +tile.baseelectric.electric_furnace.name=Horno de Arco Eléctrico +tile.baseelectric.electric_oven.name=Horno Eléctrico +tile.baseelectric.electric_pcb_printer.name=PCB Impresora +tile.baseelectric.geothermal_generator.name=Geotérmica Generador +tile.baseelectric.hydroelectric_generator.name=Hidroeléctrico Generador +tile.baseelectric.photovoltaic_generator.name=Fotovoltaica Generador +tile.baseelectric.steam_powered_generator.name=a Vapor Generador Eléctrico +tile.baseelectric.growth_chamber.name=Cámara Crecimiento +tile.baseelectric.growth_chamber_controller.name=Unidad de Control de Crecimiento Cámara +tile.baseelectric.li_ore.name=Mineral de Litio +tile.baseelectric.sulfur_ore.name=Mineral de Azufre +tile.baseelectric.led_bar.name=Luz LED + +tooltip.battery.charge=Carga +tooltip.battery.capacity=Capacidad + +death.attack.laser=%1$s vaporiza +death.attack.laser.player=%2$s vaporizado s%1$s +death.attack.propeller=%1$s se pulverizan por una hélice. +death.attack.propeller.player=%2$s empujaron %1$s en la hélice. + +tile.baseelectric.electric_switch.name=Interruptor Eléctrico +tile.baseelectric.electric_still.name=Destilador Eléctrico +tile.baseelectric.electric_pump.name=Bomba Eléctrica +tile.baseelectric.plastic_refinery.name=Refinería de Plástico +item.baseelectric.petrolplastic_ingot.name=Petróleo Lingote de Plástico +tile.baseelectric.pump_pipe_electric.name=Tubería de la Bomba diff --git a/src/main/resources/assets/baseelectric/lang/it_IT.lang b/src/main/resources/assets/baseelectric/lang/it_IT.lang new file mode 100644 index 0000000..d0ecb20 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/it_IT.lang @@ -0,0 +1,53 @@ +language_support_goals=inglese (it, en_EN, en_CA, en_GB, en_AU, en_PT), spagnolo (es_MX, es_ES), cinese (zh_CN), giapponese (ja_JA), portoghese (pt_BR), tedesco (de_DE), italiano (it_IT), coreano (ko_KR) + +item.baseelectric.blank_circuit_board.name=Scheda di Circuito (Vuoto) +item.baseelectric.control_circuit.name=Circuito di Controllo +item.baseelectric.integrated_circuit.name=Microcircuito Integrato +item.baseelectric.psu.name=Alimentatore +item.baseelectric.silicon_ingot.name=Silicio Lingotto +item.baseelectric.silicon_mix.name=Silicio Miscela +item.baseelectric.solder_mix.name=Saldatura Miscela +item.baseelectric.solder.name=Saldatura +item.baseelectric.li_powder.name=Polvere di Litio +item.baseelectric.li_ingot.name=Litio Lingotto +item.baseelectric.li_nugget.name=Pepita d'Litio +item.baseelectric.sulfur_powder.name=Zolfo in Polvere +item.baseelectric.lead_acid_battery.name=Batteria al Piombo +item.baseelectric.nickel_hydride_battery.name=Ni-MH batteria +item.baseelectric.alkaline_battery.name=Batteria Alcalina +item.baseelectric.lithium_battery.name=Agli Ioni di Litio + +tile.baseelectric.electric_conduit.name=Cavo Alettrico di Alimentazione +tile.baseelectric.electric_track.name=Ponteggio Elettrico +tile.baseelectric.electric_battery_array.name=Array Batteria +tile.baseelectric.electric_crusher.name=Polverizzatore Masso a Elettrico Alimentata +tile.baseelectric.laser_turret.name=Laser Difesa Torretta +tile.baseelectric.electric_drill.name=Trapano Elettrico +tile.baseelectric.electric_fabricator.name=Fabbrica Automatizzata +tile.baseelectric.electric_furnace.name=Forno Elettrico ad Arco +tile.baseelectric.electric_oven.name=Forno Elettrico +tile.baseelectric.electric_pcb_printer.name=PCB Stampante +tile.baseelectric.geothermal_generator.name=Geotermica Generatore +tile.baseelectric.hydroelectric_generator.name=idroelettrica Generatore +tile.baseelectric.photovoltaic_generator.name=Fotovoltaico Generatore +tile.baseelectric.steam_powered_generator.name=Generatore Elettrico a Vapore +tile.baseelectric.growth_chamber.name=Camera di Crescita +tile.baseelectric.growth_chamber_controller.name=Controllore Camera di Crescita +tile.baseelectric.li_ore.name=Minerale di litio +tile.baseelectric.sulfur_ore.name=Minerale di Zolfo +tile.baseelectric.led_bar.name=Luce a led + +tooltip.battery.charge=Carica +tooltip.battery.capacity=Capacità + +death.attack.laser=%1$s vaporizzato +death.attack.laser.player=%2$s vaporizzati %1$s +death.attack.propeller=%1$s è stato polverizzato da un'elica. +death.attack.propeller.player=%2$s spinti %1$s nelle eliche. + +tile.baseelectric.electric_switch.name=Interruttore Elettrico +tile.baseelectric.electric_still.name=Distillatore Elettrico +tile.baseelectric.electric_pump.name=Pompa Elettricaa +tile.baseelectric.plastic_refinery.name=Raffineria Plastica +item.baseelectric.petrolplastic_ingot.name=Petrolio Plastica Lingotto +tile.baseelectric.pump_pipe_electric.name=Tubo Pompa diff --git a/src/main/resources/assets/baseelectric/lang/ja_JP.lang b/src/main/resources/assets/baseelectric/lang/ja_JP.lang new file mode 100644 index 0000000..e78529a --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/ja_JP.lang @@ -0,0 +1,54 @@ +language_support_goals = 英語 (en_US en_EN en_CA、en_GB, en_AU, en_PT), スペイン語 (es_MX、es_ES)、中国 (zh_CN)、日本語 (ja_JA)、ポルトガル (pt_BR)、ドイツ語 (de_DE)、イタリア語 (it_IT), 韓国語 (ko_KR) + +item.baseelectric.blank_circuit_board.name=回路基板 (空の) +item.baseelectric.control_circuit.name=コンピューター回路 +item.baseelectric.integrated_circuit.name=マイクロチップ +item.baseelectric.psu.name=電源ユニット +item.baseelectric.silicon_ingot.name=シリコン +item.baseelectric.silicon_mix.name=シリコンレシピ +item.baseelectric.solder_mix.name=はんだレシピ +item.baseelectric.solder.name=はんだ +item.baseelectric.li_powder.name=リチウム粉末 +item.baseelectric.li_ingot.name=リチウム金属 +item.baseelectric.li_nugget.name=リチウムナゲット +item.baseelectric.sulfur_powder.name=硫黄粉末 +item.baseelectric.lead_acid_battery.name=鉛蓄電池 +item.baseelectric.nickel_hydride_battery.name=ニッケル水素バッテリー +item.baseelectric.alkaline_battery.name=アルカリ電池 +item.baseelectric.lithium_battery.name=リチウムイオン電池 + +tile.baseelectric.electric_conduit.name=電線 +tile.baseelectric.electric_track.name=電動足場 +tile.baseelectric.electric_battery_array.name=電池貯蔵 +tile.baseelectric.electric_crusher.name=電気岩クラッシャー +tile.baseelectric.laser_turret.name=レーザー砲塔 +tile.baseelectric.electric_drill.name=電気ドリル +tile.baseelectric.electric_fabricator.name=ロボット工場 +tile.baseelectric.electric_furnace.name=電気炉 +tile.baseelectric.electric_oven.name=電気オーブン +tile.baseelectric.electric_pcb_printer.name=回路基板プリンター +tile.baseelectric.geothermal_generator.name=地熱発電 +tile.baseelectric.hydroelectric_generator.name=水力発電機 +tile.baseelectric.photovoltaic_generator.name=太陽電池パネル +tile.baseelectric.steam_powered_generator.name=蒸気駆動の発電機 +tile.baseelectric.growth_chamber.name=植物生長室 +tile.baseelectric.growth_chamber_controller.name=植物成長室コントローラ +tile.baseelectric.li_ore.name=リチウム 鉱石 +tile.baseelectric.sulfur_ore.name=硫黄鉱石 +tile.baseelectric.led_bar.name=LEDライト + +tooltip.battery.charge=量 +tooltip.battery.capacity=合計金額 + +death.attack.laser=%1$s気化 +蒸発 death.attack.laser.player=%2$sは%1$sを気化しました +death.attack.propeller=プロペラ殺さ%1$s +death.attack.propeller.player=%2$sはプロペラと%1$sを殺しました + + +tile.baseelectric.electric_switch.name=電気スイッチ +tile.baseelectric.electric_still.name=電気蒸留器 +tile.baseelectric.electric_pump.name=電気ポンプ +tile.baseelectric.plastic_refinery.name=プラスチック製油所 +item.baseelectric.petrolplastic_ingot.name=石油系プラスチックインゴット +tile.baseelectric.pump_pipe_electric.name=ポンプ配管 diff --git a/src/main/resources/assets/baseelectric/lang/ko_KO.lang b/src/main/resources/assets/baseelectric/lang/ko_KO.lang new file mode 100644 index 0000000..33a8195 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/ko_KO.lang @@ -0,0 +1,52 @@ +item.baseelectric.blank_circuit_board.name=회로 기판 (빈) +item.baseelectric.control_circuit.name=제어 회로 +item.baseelectric.integrated_circuit.name=마이크로 칩 +item.baseelectric.psu.name=전원 공급 장치 +item.baseelectric.silicon_ingot.name=실리콘 잉곳 +item.baseelectric.silicon_mix.name=실리콘 혼합 +item.baseelectric.solder_mix.name=솔더 혼합 +item.baseelectric.solder.name=솔더 +item.baseelectric.li_powder.name=분말 리튬 +item.baseelectric.li_ingot.name=리튬 잉곳 +item.baseelectric.li_nugget.name=리튬 너겟 +item.baseelectric.sulfur_powder.name=분말 유황 +item.baseelectric.lead_acid_battery.name=납 축전지 +item.baseelectric.nickel_hydride_battery.name=니켈 수소 배터리 +item.baseelectric.alkaline_battery.name=알카라인 배터리 +item.baseelectric.lithium_battery.name=리튬 이온 배터리 + +tile.baseelectric.electric_conduit.name=전력 케이블 +tile.baseelectric.electric_track.name=전기 비계 +tile.baseelectric.electric_battery_array.name=전지 어레이 +tile.baseelectric.electric_crusher.name=전기 락 크러셔 +tile.baseelectric.laser_turret.name=레이저 방어 터렛 +tile.baseelectric.electric_drill.name=전기 마이닝 드릴 +tile.baseelectric.electric_fabricator.name=자동 어셈블러 +tile.baseelectric.electric_furnace.name=전기로 +tile.baseelectric.electric_oven.name=전기 오븐 +tile.baseelectric.electric_pcb_printer.name=회로 기판 프린터 +tile.baseelectric.geothermal_generator.name=지열 발전기 +tile.baseelectric.hydroelectric_generator.name=수력 발전기 +tile.baseelectric.photovoltaic_generator.name=태양 광 발전기 +tile.baseelectric.steam_powered_generator.name=증기 발전기 +tile.baseelectric.growth_chamber.name=성장 상공 회의소 +tile.baseelectric.growth_chamber_controller.name=성장 챔버 제어 장치 +tile.baseelectric.li_ore.name=리튬 광석 +tile.baseelectric.sulfur_ore.name=유황 광석 +tile.baseelectric.led_bar.name=LED 조명 + +tooltip.battery.charge=요금 +tooltip.battery.capacity=생산 능력 + +death.attack.laser=%1$s이 (가) 증발 +death.attack.laser.player=%2$s의 증발 %1$s +death.attack.propeller=%1$s는 프로펠러에 의해 분쇄 하였다. +death.attack.propeller.player=%2$s는 프로펠러에 %1$s을 (를) 밀었다. + + +tile.baseelectric.electric_switch.name=전기 스위치 +tile.baseelectric.electric_still.name=전기 증류기 +tile.baseelectric.electric_pump.name=전기 펌프 +tile.baseelectric.plastic_refinery.name=플라스틱 정유 +item.baseelectric.petrolplastic_ingot.name=석유 수지 잉곳 +tile.baseelectric.pump_pipe_electric.name=펌프 파이프 diff --git a/src/main/resources/assets/baseelectric/lang/pt_BR.lang b/src/main/resources/assets/baseelectric/lang/pt_BR.lang new file mode 100644 index 0000000..772f2e2 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/pt_BR.lang @@ -0,0 +1,54 @@ +language_support_goals=inglês (en_US, en_EN, en_CA, en_GB, en_AU, en_PT), espanhol (es_MX, es_ES), chinês (zh_CN), japonês (ja_JA), Português (pt_BR), alemão (de_DE), italiano (it_IT), coreano (ko_KR) + +item.baseelectric.blank_circuit_board.name=Placa de Circuito (Vago) +item.baseelectric.control_circuit.name=Circuito de Controle +item.baseelectric.integrated_circuit.name=Circuito Integrado +item.baseelectric.psu.name=Unidade de Alimentação +item.baseelectric.silicon_ingot.name=Silício Lingote +item.baseelectric.silicon_mix.name=Mistura de Silício +item.baseelectric.solder_mix.name=Mistura de Solda +item.baseelectric.solder.name=Solda +item.baseelectric.li_powder.name=Pó de Lítio +item.baseelectric.li_ingot.name=Lítio Lingote +item.baseelectric.li_nugget.name=Pepita de Lítio +item.baseelectric.sulfur_powder.name=Enxofre em Pó +item.baseelectric.lead_acid_battery.name=Bateria de Chumbo Ácido +item.baseelectric.nickel_hydride_battery.name=Bateria Níquel-Hidreto Metálico +item.baseelectric.alkaline_battery.name=Bateria Alcalina +item.baseelectric.lithium_battery.name=Bateria de Lítio + +tile.baseelectric.electric_conduit.name=Fio Elétrico +tile.baseelectric.electric_track.name=Elétrica Andaime +tile.baseelectric.electric_battery_array.name=Armazenamento da Bateria +tile.baseelectric.electric_crusher.name=Triturador de Rocha Elétrica +tile.baseelectric.laser_turret.name=Torre de Arma a Laser +tile.baseelectric.electric_drill.name=Broca Mineração Elétrica +tile.baseelectric.electric_fabricator.name=Fábrica Automatizada +tile.baseelectric.electric_furnace.name=Forno Elétrico a Arco +tile.baseelectric.electric_oven.name=Forno Elétrico +tile.baseelectric.electric_pcb_printer.name=Impressora Circuito +tile.baseelectric.geothermal_generator.name=Gerador de Elétrico Geotérmica +tile.baseelectric.hydroelectric_generator.name=Gerador Hidrelétrico +tile.baseelectric.photovoltaic_generator.name=Painel Solar +tile.baseelectric.steam_powered_generator.name=a Vapor Gerador Elétrico +tile.baseelectric.growth_chamber.name=Câmara de Crescimento +tile.baseelectric.growth_chamber_controller.name=Unidade de Controle de Crescimento Câmara +tile.baseelectric.li_ore.name=Minério de Lítio +tile.baseelectric.sulfur_ore.name=Minério de Enxofre +tile.baseelectric.led_bar.name=Luz LED + +tooltip.battery.charge=Carga +tooltip.battery.capacity=Capacidade + +death.attack.laser=%1$S vaporizado +death.attack.laser.player=%2$s vaporizados %1$s +death.attack.propeller=%1$s foi pulverizado por uma hélice. +death.attack.propeller.player=%2$s empurrou %1$s em uma hélice. + + +tile.baseelectric.electric_switch.name=Chave Elétrica +tile.baseelectric.electric_still.name=Destilador Elétrico +tile.baseelectric.electric_pump.name=Bomba Elétrica +tile.baseelectric.plastic_refinery.name=Refinaria de Plástico +item.baseelectric.petrolplastic_ingot.name=Petróleo Plástico Lingote +tile.baseelectric.pump_pipe_electric.name=Tubo de Bomba diff --git a/src/main/resources/assets/baseelectric/lang/zh_CN.lang b/src/main/resources/assets/baseelectric/lang/zh_CN.lang new file mode 100644 index 0000000..13af6c5 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/zh_CN.lang @@ -0,0 +1,55 @@ +language_support_goals=英语（EN_US，的en_EN，en_CA，EN_GB，en_AU，en_PT），西班牙语（es_MX，es_ES），中国（zh_CN的），日本（ja_JA），葡萄牙语（PT_BR），德语（de_DE这个），意大利语（it_IT），韩国（ko_KR） + +item.baseelectric.blank_circuit_board.name=电路板（空白） +item.baseelectric.control_circuit.name=控制电路 +item.baseelectric.integrated_circuit.name=微芯片 +item.baseelectric.psu.name=电源单元 +item.baseelectric.silicon_ingot.name=硅锭 +item.baseelectric.silicon_mix.name=硅混合 +item.baseelectric.solder_mix.name=焊接混合 +item.baseelectric.solder.name=焊料 +item.baseelectric.li_powder.name=粉状锂 +item.baseelectric.li_ingot.name=锂锭 +item.baseelectric.li_nugget.name=锂掘金 +item.baseelectric.sulfur_powder.name=硫粉 +item.baseelectric.lead_acid_battery.name=铅酸蓄电池 +item.baseelectric.nickel_hydride_battery.name=镍氢电池 +item.baseelectric.alkaline_battery.name=碱性电池 +item.baseelectric.lithium_battery.name=锂离子电池 + +tile.baseelectric.electric_conduit.name=电力电缆 +tile.baseelectric.electric_track.name=电动脚手架 +tile.baseelectric.electric_battery_array.name=电池阵列 +tile.baseelectric.electric_crusher.name=电碎石机 +tile.baseelectric.laser_turret.name=激光防御炮塔 +tile.baseelectric.electric_drill.name=电矿钻 +tile.baseelectric.electric_fabricator.name=自动汇编 +tile.baseelectric.electric_furnace.name=电弧炉 +tile.baseelectric.electric_oven.name=电烤箱 +tile.baseelectric.electric_pcb_printer.name= 电路板打印机 +tile.baseelectric.geothermal_generator.name=热发电机 +tile.baseelectric.hydroelectric_generator.name=水轮发电机 +tile.baseelectric.photovoltaic_generator.name=光电发生器 +tile.baseelectric.steam_powered_generator.name=蒸汽为动力的电动发电机 +tile.baseelectric.growth_chamber.name=生长箱 +tile.baseelectric.growth_chamber_controller.name=生长箱控制单元 +tile.baseelectric.li_ore.name=锂矿 +tile.baseelectric.sulfur_ore.name=硫矿石 +tile.baseelectric.led_bar.name=LED燈 + +tooltip.battery.charge=充电 +tooltip.battery.capacity=容量 + +death.attack.laser=％1$s蒸发 +death.attack.laser.player=％2$s汽化％1$s +death.attack.propeller=％1$s被粉碎螺旋桨。 +death.attack.propeller.player=％2$s推％1$s转换为螺旋桨。 + + +tile.baseelectric.electric_switch.name=電器開關 +tile.baseelectric.electric_still.name=電熱蒸餾水 +tile.baseelectric.electric_pump.name=電動泵 +tile.baseelectric.plastic_refinery.name=塑料煉油廠 +item.baseelectric.petrolplastic_ingot.name=石油膠錠 +tile.baseelectric.pump_pipe_electric.name=泵管 + diff --git a/src/main/resources/assets/baseelectric/models/block/electric_battery_array.json b/src/main/resources/assets/baseelectric/models/block/electric_battery_array.json new file mode 100644 index 0000000..4cd33d4 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_battery_array.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_battery_array", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_0.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_0.json new file mode 100644 index 0000000..0771356 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_0.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_ensw", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_densuw.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_densuw.json new file mode 100644 index 0000000..daf68cd --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_densuw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_densuw", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_desuw.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_desuw.json new file mode 100644 index 0000000..a18647f --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_desuw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_desuw", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_dnu.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_dnu.json new file mode 100644 index 0000000..082bb93 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_dnu.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_dnu", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_ensw.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_ensw.json new file mode 100644 index 0000000..0771356 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_ensw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_ensw", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_n.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_n.json new file mode 100644 index 0000000..112f395 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_n.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_n", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_ns.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_ns.json new file mode 100644 index 0000000..cd5238e --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_ns.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_ns", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_nsuw.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_nsuw.json new file mode 100644 index 0000000..0758b1b --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_nsuw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_nsuw", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_nsw.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_nsw.json new file mode 100644 index 0000000..8d04319 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_nsw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_nsw", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_nuw.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_nuw.json new file mode 100644 index 0000000..450f9da --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_nuw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_nuw", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_nw.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_nw.json new file mode 100644 index 0000000..e252ae0 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_nw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_nw", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_crusher_off.json b/src/main/resources/assets/baseelectric/models/block/electric_crusher_off.json new file mode 100644 index 0000000..9384cc5 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_crusher_off.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_crusher_off", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_crusher_on.json b/src/main/resources/assets/baseelectric/models/block/electric_crusher_on.json new file mode 100644 index 0000000..b10d6f9 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_crusher_on.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_crusher_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_crusher_powered.json b/src/main/resources/assets/baseelectric/models/block/electric_crusher_powered.json new file mode 100644 index 0000000..29bb992 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_crusher_powered.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_crusher_powered", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_drill_base.json b/src/main/resources/assets/baseelectric/models/block/electric_drill_base.json similarity index 93% rename from src/main/resources/assets/electricadvantage/models/block/electric_drill_base.json rename to src/main/resources/assets/baseelectric/models/block/electric_drill_base.json index 917982f..b69cb83 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_drill_base.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_drill_base.json @@ -1,9 +1,9 @@ { "parent": "block/block", "textures": { - "particle": "electricadvantage:materials/machine_case", - "feet":"poweradvantage:materials/steel", - "side": "electricadvantage:materials/machine_case" + "particle": "baseelectric:materials/machine_case", + "feet":"basepower:materials/steel", + "side": "baseelectric:materials/machine_case" }, "elements": [ diff --git a/src/main/resources/assets/baseelectric/models/block/electric_drill_off.json b/src/main/resources/assets/baseelectric/models/block/electric_drill_off.json new file mode 100644 index 0000000..870a9af --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_drill_off.json @@ -0,0 +1,7 @@ +{ + "parent": "baseelectric:block/electric_drill_base", + "textures": { + "top": "baseelectric:blocks/electric_drill_off", + "bottom": "baseelectric:blocks/laser_drill_optic" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_drill_on.json b/src/main/resources/assets/baseelectric/models/block/electric_drill_on.json new file mode 100644 index 0000000..47fd2ec --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_drill_on.json @@ -0,0 +1,7 @@ +{ + "parent": "baseelectric:block/electric_drill_base", + "textures": { + "top": "baseelectric:blocks/electric_drill_on", + "bottom": "baseelectric:blocks/laser_drill_optic_on" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_fabricator_off.json b/src/main/resources/assets/baseelectric/models/block/electric_fabricator_off.json new file mode 100644 index 0000000..d00668c --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_fabricator_off.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_fabricator_off", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_fabricator_on.json b/src/main/resources/assets/baseelectric/models/block/electric_fabricator_on.json new file mode 100644 index 0000000..c9c2b8f --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_fabricator_on.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_fabricator_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_fabricator_powered.json b/src/main/resources/assets/baseelectric/models/block/electric_fabricator_powered.json new file mode 100644 index 0000000..2f19a58 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_fabricator_powered.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_fabricator_powered", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_furnace_off.json b/src/main/resources/assets/baseelectric/models/block/electric_furnace_off.json new file mode 100644 index 0000000..c5fcc99 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_furnace_off.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_furnace_off", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_furnace_on.json b/src/main/resources/assets/baseelectric/models/block/electric_furnace_on.json new file mode 100644 index 0000000..9101efc --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_furnace_on.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_furnace_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_furnace_powered.json b/src/main/resources/assets/baseelectric/models/block/electric_furnace_powered.json new file mode 100644 index 0000000..6f0d52b --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_furnace_powered.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_furnace_powered", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_machine_base.json b/src/main/resources/assets/baseelectric/models/block/electric_machine_base.json similarity index 90% rename from src/main/resources/assets/electricadvantage/models/block/electric_machine_base.json rename to src/main/resources/assets/baseelectric/models/block/electric_machine_base.json index d9b5072..065f242 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_machine_base.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_machine_base.json @@ -1,7 +1,7 @@ { "parent": "block/block", "textures": { - "particle": "electricadvantage:materials/machine_case" + "particle": "baseelectric:materials/machine_case" }, "elements": [ diff --git a/src/main/resources/assets/baseelectric/models/block/electric_oven_off.json b/src/main/resources/assets/baseelectric/models/block/electric_oven_off.json new file mode 100644 index 0000000..c390bed --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_oven_off.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_oven_off", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_oven_on.json b/src/main/resources/assets/baseelectric/models/block/electric_oven_on.json new file mode 100644 index 0000000..af61527 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_oven_on.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_oven_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_oven_powered.json b/src/main/resources/assets/baseelectric/models/block/electric_oven_powered.json new file mode 100644 index 0000000..42cd890 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_oven_powered.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_oven_powered", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_off.json b/src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_off.json new file mode 100644 index 0000000..20119fa --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_off.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_pcb_printer_off", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_on.json b/src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_on.json new file mode 100644 index 0000000..990c631 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_on.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_pcb_printer_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_powered.json b/src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_powered.json new file mode 100644 index 0000000..9090958 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_powered.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_pcb_printer_powered", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_pump_off.json b/src/main/resources/assets/baseelectric/models/block/electric_pump_off.json new file mode 100644 index 0000000..b5f3ed8 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_pump_off.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_pump_off", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_pump_on.json b/src/main/resources/assets/baseelectric/models/block/electric_pump_on.json new file mode 100644 index 0000000..975c7f9 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_pump_on.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_pump_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_pump_powered.json b/src/main/resources/assets/baseelectric/models/block/electric_pump_powered.json new file mode 100644 index 0000000..975c7f9 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_pump_powered.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_pump_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_still_off.json b/src/main/resources/assets/baseelectric/models/block/electric_still_off.json new file mode 100644 index 0000000..d493a87 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_still_off.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_still_off", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_still_on.json b/src/main/resources/assets/baseelectric/models/block/electric_still_on.json new file mode 100644 index 0000000..c1114df --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_still_on.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_still_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_still_powered.json b/src/main/resources/assets/baseelectric/models/block/electric_still_powered.json new file mode 100644 index 0000000..fa00b86 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_still_powered.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_still_powered", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_switch_off.json b/src/main/resources/assets/baseelectric/models/block/electric_switch_off.json new file mode 100644 index 0000000..da5800b --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_switch_off.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "baseelectric:blocks/electric_switch_off", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_switch_on.json b/src/main/resources/assets/baseelectric/models/block/electric_switch_on.json new file mode 100644 index 0000000..06f8209 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_switch_on.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "baseelectric:blocks/electric_switch_on", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_0.json b/src/main/resources/assets/baseelectric/models/block/electric_track_0.json similarity index 90% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_0.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_0.json index 719a169..ee1f638 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_0.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_0.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_densuw.json b/src/main/resources/assets/baseelectric/models/block/electric_track_densuw.json similarity index 95% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_densuw.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_densuw.json index 7072e69..01fa1f2 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_densuw.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_densuw.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "__comment": "down", diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_desuw.json b/src/main/resources/assets/baseelectric/models/block/electric_track_desuw.json similarity index 95% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_desuw.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_desuw.json index f3c0067..e02dc5a 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_desuw.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_desuw.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_dnu.json b/src/main/resources/assets/baseelectric/models/block/electric_track_dnu.json similarity index 94% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_dnu.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_dnu.json index e456531..c0e6adb 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_dnu.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_dnu.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_ensw.json b/src/main/resources/assets/baseelectric/models/block/electric_track_ensw.json similarity index 94% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_ensw.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_ensw.json index f117ed2..e6f32ab 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_ensw.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_ensw.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_n.json b/src/main/resources/assets/baseelectric/models/block/electric_track_n.json similarity index 93% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_n.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_n.json index bf50242..e8e811c 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_n.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_n.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "__comment": "north-south", diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_ns.json b/src/main/resources/assets/baseelectric/models/block/electric_track_ns.json similarity index 94% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_ns.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_ns.json index 0c3cd91..4fc026e 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_ns.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_ns.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "__comment": "north-south", diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_nsuw.json b/src/main/resources/assets/baseelectric/models/block/electric_track_nsuw.json similarity index 94% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_nsuw.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_nsuw.json index 5d68e98..7f084f6 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_nsuw.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_nsuw.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_nsw.json b/src/main/resources/assets/baseelectric/models/block/electric_track_nsw.json similarity index 93% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_nsw.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_nsw.json index 1459629..a796d3a 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_nsw.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_nsw.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_nuw.json b/src/main/resources/assets/baseelectric/models/block/electric_track_nuw.json similarity index 93% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_nuw.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_nuw.json index 27316f8..82adb35 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_nuw.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_nuw.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_nw.json b/src/main/resources/assets/baseelectric/models/block/electric_track_nw.json similarity index 92% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_nw.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_nw.json index f1a7196..831016b 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_nw.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_nw.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/baseelectric/models/block/geothermal_generator.json b/src/main/resources/assets/baseelectric/models/block/geothermal_generator.json new file mode 100644 index 0000000..6234d06 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/geothermal_generator.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/geothermal_generator_side", + "top": "baseelectric:blocks/geothermal_generator_top", + "bottom":"baseelectric:blocks/geothermal_generator_side", + "back": "baseelectric:blocks/geothermal_generator_side", + "side": "baseelectric:blocks/geothermal_generator_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/growth_chamber_controller.json b/src/main/resources/assets/baseelectric/models/block/growth_chamber_controller.json new file mode 100644 index 0000000..4df783e --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/growth_chamber_controller.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/growth_chamber_controller", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/growth_chamber_off.json b/src/main/resources/assets/baseelectric/models/block/growth_chamber_off.json new file mode 100644 index 0000000..3aa9144 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/growth_chamber_off.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/growth_chamber_off", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/growth_chamber_on.json b/src/main/resources/assets/baseelectric/models/block/growth_chamber_on.json new file mode 100644 index 0000000..92f30f1 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/growth_chamber_on.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/growth_chamber_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/growth_chamber_powered.json b/src/main/resources/assets/baseelectric/models/block/growth_chamber_powered.json new file mode 100644 index 0000000..fbc1bc4 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/growth_chamber_powered.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/growth_chamber_powered", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/hydroelectric_generator_off.json b/src/main/resources/assets/baseelectric/models/block/hydroelectric_generator_off.json new file mode 100644 index 0000000..750e47f --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/hydroelectric_generator_off.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/machine_side", + "top": "baseelectric:blocks/hydroelectric_generator_off", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_side", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/hydroelectric_generator_on.json b/src/main/resources/assets/baseelectric/models/block/hydroelectric_generator_on.json new file mode 100644 index 0000000..caef647 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/hydroelectric_generator_on.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/machine_side", + "top": "baseelectric:blocks/hydroelectric_generator_on", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_side", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/electricadvantage/models/block/laser_turret.json b/src/main/resources/assets/baseelectric/models/block/laser_turret.json similarity index 77% rename from src/main/resources/assets/electricadvantage/models/block/laser_turret.json rename to src/main/resources/assets/baseelectric/models/block/laser_turret.json index aa447e3..e08e5fa 100644 --- a/src/main/resources/assets/electricadvantage/models/block/laser_turret.json +++ b/src/main/resources/assets/baseelectric/models/block/laser_turret.json @@ -1,11 +1,11 @@ { "parent": "block/block", "textures": { - "bottom": "electricadvantage:blocks/laser_turret_base", - "top": "electricadvantage:blocks/laser_turret_base", - "side": "electricadvantage:blocks/laser_turret_base", - "shaft": "poweradvantage:materials/steel", - "particle": "poweradvantage:materials/steel" + "bottom": "baseelectric:blocks/laser_turret_base", + "top": "baseelectric:blocks/laser_turret_base", + "side": "baseelectric:blocks/laser_turret_base", + "shaft": "basepower:materials/steel", + "particle": "basepower:materials/steel" }, "elements": [ diff --git a/src/main/resources/assets/baseelectric/models/block/led_bar_off_densuw.json b/src/main/resources/assets/baseelectric/models/block/led_bar_off_densuw.json new file mode 100644 index 0000000..8e82870 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/led_bar_off_densuw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_densuw", + "textures": { + "texture": "baseelectric:blocks/led_bar_off", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/led_bar_off_desuw.json b/src/main/resources/assets/baseelectric/models/block/led_bar_off_desuw.json new file mode 100644 index 0000000..5c1c4fa --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/led_bar_off_desuw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_desuw", + "textures": { + "texture": "baseelectric:blocks/led_bar_off", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/led_bar_off_dnu.json b/src/main/resources/assets/baseelectric/models/block/led_bar_off_dnu.json new file mode 100644 index 0000000..bacd888 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/led_bar_off_dnu.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_dnu", + "textures": { + "texture": "baseelectric:blocks/led_bar_off", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/led_bar_off_ensw.json b/src/main/resources/assets/baseelectric/models/block/led_bar_off_ensw.json new file mode 100644 index 0000000..c501289 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/led_bar_off_ensw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_ensw", + "textures": { + "texture": "baseelectric:blocks/led_bar_off", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/led_bar_off_n.json b/src/main/resources/assets/baseelectric/models/block/led_bar_off_n.json new file mode 100644 index 0000000..adba88c --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/led_bar_off_n.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_n", + "textures": { + "texture": "baseelectric:blocks/led_bar_off", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/led_bar_off_ns.json b/src/main/resources/assets/baseelectric/models/block/led_bar_off_ns.json new file mode 100644 index 0000000..e427dbb --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/led_bar_off_ns.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_ns", + "textures": { + "texture": "baseelectric:blocks/led_bar_off", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/led_bar_off_nsuw.json b/src/main/resources/assets/baseelectric/models/block/led_bar_off_nsuw.json new file mode 100644 index 0000000..bbc2160 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/led_bar_off_nsuw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_nsuw", + "textures": { + "texture": "baseelectric:blocks/led_bar_off", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/led_bar_off_nsw.json b/src/main/resources/assets/baseelectric/models/block/led_bar_off_nsw.json new file mode 100644 index 0000000..0674e05 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/led_bar_off_nsw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_nsw", + "textures": { + "texture": "baseelectric:blocks/led_bar_off", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/led_bar_off_nuw.json b/src/main/resources/assets/baseelectric/models/block/led_bar_off_nuw.json new file mode 100644 index 0000000..a170043 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/led_bar_off_nuw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_nuw", + "textures": { + "texture": "baseelectric:blocks/led_bar_off", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/led_bar_off_nw.json b/src/main/resources/assets/baseelectric/models/block/led_bar_off_nw.json new file mode 100644 index 0000000..6cca400 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/led_bar_off_nw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_nw", + "textures": { + "texture": "baseelectric:blocks/led_bar_off", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/led_bar_on_densuw.json b/src/main/resources/assets/baseelectric/models/block/led_bar_on_densuw.json new file mode 100644 index 0000000..b266d61 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/led_bar_on_densuw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_densuw", + "textures": { + "texture": "baseelectric:blocks/led_bar_on", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/led_bar_on_desuw.json b/src/main/resources/assets/baseelectric/models/block/led_bar_on_desuw.json new file mode 100644 index 0000000..9809cdb --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/led_bar_on_desuw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_desuw", + "textures": { + "texture": "baseelectric:blocks/led_bar_on", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/led_bar_on_dnu.json b/src/main/resources/assets/baseelectric/models/block/led_bar_on_dnu.json new file mode 100644 index 0000000..e293e62 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/led_bar_on_dnu.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_dnu", + "textures": { + "texture": "baseelectric:blocks/led_bar_on", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/led_bar_on_ensw.json b/src/main/resources/assets/baseelectric/models/block/led_bar_on_ensw.json new file mode 100644 index 0000000..9ad8906 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/led_bar_on_ensw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_ensw", + "textures": { + "texture": "baseelectric:blocks/led_bar_on", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/led_bar_on_n.json b/src/main/resources/assets/baseelectric/models/block/led_bar_on_n.json new file mode 100644 index 0000000..348c1db --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/led_bar_on_n.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_n", + "textures": { + "texture": "baseelectric:blocks/led_bar_on", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/led_bar_on_ns.json b/src/main/resources/assets/baseelectric/models/block/led_bar_on_ns.json new file mode 100644 index 0000000..db77ddb --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/led_bar_on_ns.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_ns", + "textures": { + "texture": "baseelectric:blocks/led_bar_on", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/led_bar_on_nsuw.json b/src/main/resources/assets/baseelectric/models/block/led_bar_on_nsuw.json new file mode 100644 index 0000000..5e9aba3 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/led_bar_on_nsuw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_nsuw", + "textures": { + "texture": "baseelectric:blocks/led_bar_on", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/led_bar_on_nsw.json b/src/main/resources/assets/baseelectric/models/block/led_bar_on_nsw.json new file mode 100644 index 0000000..e837ecb --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/led_bar_on_nsw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_nsw", + "textures": { + "texture": "baseelectric:blocks/led_bar_on", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/led_bar_on_nuw.json b/src/main/resources/assets/baseelectric/models/block/led_bar_on_nuw.json new file mode 100644 index 0000000..9699047 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/led_bar_on_nuw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_nuw", + "textures": { + "texture": "baseelectric:blocks/led_bar_on", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/led_bar_on_nw.json b/src/main/resources/assets/baseelectric/models/block/led_bar_on_nw.json new file mode 100644 index 0000000..cc72d11 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/led_bar_on_nw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_nw", + "textures": { + "texture": "baseelectric:blocks/led_bar_on", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/electricadvantage/models/block/li_ore.json b/src/main/resources/assets/baseelectric/models/block/li_ore.json similarity index 50% rename from src/main/resources/assets/electricadvantage/models/block/li_ore.json rename to src/main/resources/assets/baseelectric/models/block/li_ore.json index f7e660c..541b7c7 100644 --- a/src/main/resources/assets/electricadvantage/models/block/li_ore.json +++ b/src/main/resources/assets/baseelectric/models/block/li_ore.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "electricadvantage:blocks/lithium_ore" - } -} +{ + "parent": "block/cube_all", + "textures": { + "all": "baseelectric:blocks/lithium_ore" + } +} diff --git a/src/main/resources/assets/electricadvantage/models/block/photovoltaic_generator.json b/src/main/resources/assets/baseelectric/models/block/photovoltaic_generator.json similarity index 50% rename from src/main/resources/assets/electricadvantage/models/block/photovoltaic_generator.json rename to src/main/resources/assets/baseelectric/models/block/photovoltaic_generator.json index 2668019..ebe34e3 100644 --- a/src/main/resources/assets/electricadvantage/models/block/photovoltaic_generator.json +++ b/src/main/resources/assets/baseelectric/models/block/photovoltaic_generator.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "electricadvantage:blocks/photovoltaic_cell" + "all": "baseelectric:blocks/photovoltaic_cell" } } diff --git a/src/main/resources/assets/baseelectric/models/block/plastic_refinery_off.json b/src/main/resources/assets/baseelectric/models/block/plastic_refinery_off.json new file mode 100644 index 0000000..454bb36 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/plastic_refinery_off.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/plastic_refinery_off", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/plastic_refinery_on.json b/src/main/resources/assets/baseelectric/models/block/plastic_refinery_on.json new file mode 100644 index 0000000..8bc96ee --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/plastic_refinery_on.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/plastic_refinery_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/plastic_refinery_powered.json b/src/main/resources/assets/baseelectric/models/block/plastic_refinery_powered.json new file mode 100644 index 0000000..8bc96ee --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/plastic_refinery_powered.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/plastic_refinery_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/steam_powered_generator_off.json b/src/main/resources/assets/baseelectric/models/block/steam_powered_generator_off.json new file mode 100644 index 0000000..664378f --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/steam_powered_generator_off.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/steam_powered_generator_off", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/baseelectric/models/block/steam_powered_generator_on.json b/src/main/resources/assets/baseelectric/models/block/steam_powered_generator_on.json new file mode 100644 index 0000000..e3cd40e --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/steam_powered_generator_on.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/steam_powered_generator_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/models/block/sulfur_ore.json b/src/main/resources/assets/baseelectric/models/block/sulfur_ore.json similarity index 52% rename from src/main/resources/assets/electricadvantage/models/block/sulfur_ore.json rename to src/main/resources/assets/baseelectric/models/block/sulfur_ore.json index e7e534c..aacc42b 100644 --- a/src/main/resources/assets/electricadvantage/models/block/sulfur_ore.json +++ b/src/main/resources/assets/baseelectric/models/block/sulfur_ore.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "electricadvantage:blocks/sulfur_ore" + "all": "baseelectric:blocks/sulfur_ore" } } \ No newline at end of file diff --git a/src/main/resources/assets/baseelectric/models/item/alkaline_battery.json b/src/main/resources/assets/baseelectric/models/item/alkaline_battery.json new file mode 100644 index 0000000..14f7e50 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/alkaline_battery.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/battery_base", + "textures": { + "item_texture": "baseelectric:items/alkaline_battery" + } +} diff --git a/src/main/resources/assets/electricadvantage/models/item/battery_base.json b/src/main/resources/assets/baseelectric/models/item/battery_base.json similarity index 91% rename from src/main/resources/assets/electricadvantage/models/item/battery_base.json rename to src/main/resources/assets/baseelectric/models/item/battery_base.json index 62326fd..43bda84 100644 --- a/src/main/resources/assets/electricadvantage/models/item/battery_base.json +++ b/src/main/resources/assets/baseelectric/models/item/battery_base.json @@ -1,7 +1,7 @@ { "parent": "block/block", "textures": { - "particle": "electricadvantage:materials/machine_case" + "particle": "baseelectric:materials/machine_case" }, "ambientocclusion": false, "elements": [ diff --git a/src/main/resources/assets/baseelectric/models/item/blank_circuit_board.json b/src/main/resources/assets/baseelectric/models/item/blank_circuit_board.json new file mode 100644 index 0000000..7007c26 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/blank_circuit_board.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "item_texture": "baseelectric:items/blank_circuit_board" + } +} diff --git a/src/main/resources/assets/baseelectric/models/item/control_circuit.json b/src/main/resources/assets/baseelectric/models/item/control_circuit.json new file mode 100644 index 0000000..1b603b6 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/control_circuit.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "item_texture": "baseelectric:items/control_circuit" + } +} diff --git a/src/main/resources/assets/baseelectric/models/item/electric_battery_array.json b/src/main/resources/assets/baseelectric/models/item/electric_battery_array.json new file mode 100644 index 0000000..2f202dd --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/electric_battery_array.json @@ -0,0 +1,4 @@ +{ + "parent": "baseelectric:block/electric_battery_array", + "ambientocclusion": false +} diff --git a/src/main/resources/assets/baseelectric/models/item/electric_conduit.json b/src/main/resources/assets/baseelectric/models/item/electric_conduit.json new file mode 100644 index 0000000..ab519e6 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/electric_conduit.json @@ -0,0 +1,4 @@ +{ + "parent": "baseelectric:block/electric_conduit_ns", + "ambientocclusion": false +} \ No newline at end of file diff --git a/src/main/resources/assets/baseelectric/models/item/electric_crusher.json b/src/main/resources/assets/baseelectric/models/item/electric_crusher.json new file mode 100644 index 0000000..5986985 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/electric_crusher.json @@ -0,0 +1,4 @@ +{ + "parent": "baseelectric:block/electric_crusher_off", + "ambientocclusion": false +} diff --git a/src/main/resources/assets/baseelectric/models/item/electric_drill.json b/src/main/resources/assets/baseelectric/models/item/electric_drill.json new file mode 100644 index 0000000..7eaaf0c --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/electric_drill.json @@ -0,0 +1,4 @@ +{ + "parent": "baseelectric:block/electric_drill_off", + "ambientocclusion": false +} diff --git a/src/main/resources/assets/baseelectric/models/item/electric_fabricator.json b/src/main/resources/assets/baseelectric/models/item/electric_fabricator.json new file mode 100644 index 0000000..6829af0 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/electric_fabricator.json @@ -0,0 +1,4 @@ +{ + "parent": "baseelectric:block/electric_fabricator_off", + "ambientocclusion": false +} diff --git a/src/main/resources/assets/baseelectric/models/item/electric_furnace.json b/src/main/resources/assets/baseelectric/models/item/electric_furnace.json new file mode 100644 index 0000000..807954a --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/electric_furnace.json @@ -0,0 +1,4 @@ +{ + "parent": "baseelectric:block/electric_furnace_off", + "ambientocclusion": false +} diff --git a/src/main/resources/assets/baseelectric/models/item/electric_oven.json b/src/main/resources/assets/baseelectric/models/item/electric_oven.json new file mode 100644 index 0000000..6bf2693 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/electric_oven.json @@ -0,0 +1,4 @@ +{ + "parent": "baseelectric:block/electric_oven_off", + "ambientocclusion": false +} diff --git a/src/main/resources/assets/baseelectric/models/item/electric_pcb_printer.json b/src/main/resources/assets/baseelectric/models/item/electric_pcb_printer.json new file mode 100644 index 0000000..213a9e6 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/electric_pcb_printer.json @@ -0,0 +1,4 @@ +{ + "parent": "baseelectric:block/electric_pcb_printer_off", + "ambientocclusion": false +} diff --git a/src/main/resources/assets/baseelectric/models/item/electric_pump.json b/src/main/resources/assets/baseelectric/models/item/electric_pump.json new file mode 100644 index 0000000..7e2cd9a --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/electric_pump.json @@ -0,0 +1,4 @@ +{ + "parent": "baseelectric:block/electric_pump_off", + "ambientocclusion": false +} diff --git a/src/main/resources/assets/baseelectric/models/item/electric_still.json b/src/main/resources/assets/baseelectric/models/item/electric_still.json new file mode 100644 index 0000000..84bde3a --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/electric_still.json @@ -0,0 +1,4 @@ +{ + "parent": "baseelectric:block/electric_still_off", + "ambientocclusion": false +} diff --git a/src/main/resources/assets/baseelectric/models/item/electric_switch.json b/src/main/resources/assets/baseelectric/models/item/electric_switch.json new file mode 100644 index 0000000..c280188 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/electric_switch.json @@ -0,0 +1,3 @@ +{ + "parent": "baseelectric:block/electric_switch_on" +} \ No newline at end of file diff --git a/src/main/resources/assets/baseelectric/models/item/electric_track.json b/src/main/resources/assets/baseelectric/models/item/electric_track.json new file mode 100644 index 0000000..c15e692 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/electric_track.json @@ -0,0 +1,4 @@ +{ + "parent": "baseelectric:block/electric_track_ns", + "ambientocclusion": false +} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/models/item/generic_item.json b/src/main/resources/assets/baseelectric/models/item/generic_item.json similarity index 100% rename from src/main/resources/assets/electricadvantage/models/item/generic_item.json rename to src/main/resources/assets/baseelectric/models/item/generic_item.json diff --git a/src/main/resources/assets/baseelectric/models/item/geothermal_generator.json b/src/main/resources/assets/baseelectric/models/item/geothermal_generator.json new file mode 100644 index 0000000..cce63b0 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/geothermal_generator.json @@ -0,0 +1,4 @@ +{ + "parent": "baseelectric:block/geothermal_generator", + "ambientocclusion": false +} diff --git a/src/main/resources/assets/baseelectric/models/item/growth_chamber.json b/src/main/resources/assets/baseelectric/models/item/growth_chamber.json new file mode 100644 index 0000000..27c3286 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/growth_chamber.json @@ -0,0 +1,4 @@ +{ + "parent": "baseelectric:block/growth_chamber_off", + "ambientocclusion": false +} diff --git a/src/main/resources/assets/baseelectric/models/item/growth_chamber_controller.json b/src/main/resources/assets/baseelectric/models/item/growth_chamber_controller.json new file mode 100644 index 0000000..c5fbecc --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/growth_chamber_controller.json @@ -0,0 +1,4 @@ +{ + "parent": "baseelectric:block/growth_chamber_controller", + "ambientocclusion": false +} diff --git a/src/main/resources/assets/baseelectric/models/item/hydroelectric_generator.json b/src/main/resources/assets/baseelectric/models/item/hydroelectric_generator.json new file mode 100644 index 0000000..2a13854 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/hydroelectric_generator.json @@ -0,0 +1,4 @@ +{ + "parent": "baseelectric:block/hydroelectric_generator_off", + "ambientocclusion": false +} diff --git a/src/main/resources/assets/baseelectric/models/item/integrated_circuit.json b/src/main/resources/assets/baseelectric/models/item/integrated_circuit.json new file mode 100644 index 0000000..65bec67 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/integrated_circuit.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "item_texture": "baseelectric:items/integrated_circuit" + } +} diff --git a/src/main/resources/assets/electricadvantage/models/item/laser_turret.json b/src/main/resources/assets/baseelectric/models/item/laser_turret.json similarity index 81% rename from src/main/resources/assets/electricadvantage/models/item/laser_turret.json rename to src/main/resources/assets/baseelectric/models/item/laser_turret.json index 63cfdd5..f667f62 100644 --- a/src/main/resources/assets/electricadvantage/models/item/laser_turret.json +++ b/src/main/resources/assets/baseelectric/models/item/laser_turret.json @@ -1,12 +1,12 @@ { "parent": "block/block", "textures": { - "bottom": "electricadvantage:blocks/laser_turret_base", - "top": "electricadvantage:blocks/laser_turret_base", - "side": "electricadvantage:blocks/laser_turret_base", - "shaft": "poweradvantage:materials/steel", - "head": "electricadvantage:entity/laser_turret", - "particle": "poweradvantage:materials/steel" + "bottom": "baseelectric:blocks/laser_turret_base", + "top": "baseelectric:blocks/laser_turret_base", + "side": "baseelectric:blocks/laser_turret_base", + "shaft": "basepower:materials/steel", + "head": "baseelectric:entity/laser_turret", + "particle": "basepower:materials/steel" }, "elements": [ diff --git a/src/main/resources/assets/electricadvantage/models/item/laser_turret_evil.json b/src/main/resources/assets/baseelectric/models/item/laser_turret_evil.json similarity index 81% rename from src/main/resources/assets/electricadvantage/models/item/laser_turret_evil.json rename to src/main/resources/assets/baseelectric/models/item/laser_turret_evil.json index 63cfdd5..f667f62 100644 --- a/src/main/resources/assets/electricadvantage/models/item/laser_turret_evil.json +++ b/src/main/resources/assets/baseelectric/models/item/laser_turret_evil.json @@ -1,12 +1,12 @@ { "parent": "block/block", "textures": { - "bottom": "electricadvantage:blocks/laser_turret_base", - "top": "electricadvantage:blocks/laser_turret_base", - "side": "electricadvantage:blocks/laser_turret_base", - "shaft": "poweradvantage:materials/steel", - "head": "electricadvantage:entity/laser_turret", - "particle": "poweradvantage:materials/steel" + "bottom": "baseelectric:blocks/laser_turret_base", + "top": "baseelectric:blocks/laser_turret_base", + "side": "baseelectric:blocks/laser_turret_base", + "shaft": "basepower:materials/steel", + "head": "baseelectric:entity/laser_turret", + "particle": "basepower:materials/steel" }, "elements": [ diff --git a/src/main/resources/assets/baseelectric/models/item/lead_acid_battery.json b/src/main/resources/assets/baseelectric/models/item/lead_acid_battery.json new file mode 100644 index 0000000..e24b4c9 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/lead_acid_battery.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/battery_base", + "textures": { + "item_texture": "baseelectric:items/lead_acid_battery" + } +} diff --git a/src/main/resources/assets/baseelectric/models/item/led_bar.json b/src/main/resources/assets/baseelectric/models/item/led_bar.json new file mode 100644 index 0000000..82a0c05 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/led_bar.json @@ -0,0 +1,4 @@ +{ + "parent": "baseelectric:block/led_bar_on_ns", + "ambientocclusion": false +} \ No newline at end of file diff --git a/src/main/resources/assets/baseelectric/models/item/li_ingot.json b/src/main/resources/assets/baseelectric/models/item/li_ingot.json new file mode 100644 index 0000000..ef16f08 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/li_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "item_texture": "baseelectric:items/li_ingot" + } +} diff --git a/src/main/resources/assets/baseelectric/models/item/li_nugget.json b/src/main/resources/assets/baseelectric/models/item/li_nugget.json new file mode 100644 index 0000000..db0876d --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/li_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "item_texture": "baseelectric:items/li_nugget" + } +} diff --git a/src/main/resources/assets/baseelectric/models/item/li_ore.json b/src/main/resources/assets/baseelectric/models/item/li_ore.json new file mode 100644 index 0000000..905935b --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/li_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "baseelectric:block/li_ore" +} diff --git a/src/main/resources/assets/baseelectric/models/item/li_powder.json b/src/main/resources/assets/baseelectric/models/item/li_powder.json new file mode 100644 index 0000000..cf74f90 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/li_powder.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "item_texture": "baseelectric:items/li_powder" + } +} diff --git a/src/main/resources/assets/baseelectric/models/item/lithium_battery.json b/src/main/resources/assets/baseelectric/models/item/lithium_battery.json new file mode 100644 index 0000000..f1e7a57 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/lithium_battery.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/battery_base", + "textures": { + "item_texture": "baseelectric:items/lithium_battery" + } +} diff --git a/src/main/resources/assets/baseelectric/models/item/nickel_hydride_battery.json b/src/main/resources/assets/baseelectric/models/item/nickel_hydride_battery.json new file mode 100644 index 0000000..0c38ded --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/nickel_hydride_battery.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/battery_base", + "textures": { + "item_texture": "baseelectric:items/nickel_hydride_battery" + } +} diff --git a/src/main/resources/assets/baseelectric/models/item/petrolplastic_ingot.json b/src/main/resources/assets/baseelectric/models/item/petrolplastic_ingot.json new file mode 100644 index 0000000..37e77a2 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/petrolplastic_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "item_texture": "baseelectric:items/petrolplastic_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/baseelectric/models/item/photovoltaic_generator.json b/src/main/resources/assets/baseelectric/models/item/photovoltaic_generator.json new file mode 100644 index 0000000..ddf4902 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/photovoltaic_generator.json @@ -0,0 +1,4 @@ +{ + "parent": "baseelectric:block/photovoltaic_generator", + "ambientocclusion": false +} diff --git a/src/main/resources/assets/baseelectric/models/item/plastic_refinery.json b/src/main/resources/assets/baseelectric/models/item/plastic_refinery.json new file mode 100644 index 0000000..f7632a7 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/plastic_refinery.json @@ -0,0 +1,4 @@ +{ + "parent": "baseelectric:block/plastic_refinery_off", + "ambientocclusion": false +} diff --git a/src/main/resources/assets/baseelectric/models/item/psu.json b/src/main/resources/assets/baseelectric/models/item/psu.json new file mode 100644 index 0000000..2f4273d --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/psu.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "item_texture": "baseelectric:items/psu" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/baseelectric/models/item/pump_pipe_electric.json b/src/main/resources/assets/baseelectric/models/item/pump_pipe_electric.json new file mode 100644 index 0000000..2cfca62 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/pump_pipe_electric.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/baseelectric/models/item/silicon_ingot.json b/src/main/resources/assets/baseelectric/models/item/silicon_ingot.json new file mode 100644 index 0000000..aab40a1 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/silicon_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "item_texture": "baseelectric:items/silicon_ingot" + } +} diff --git a/src/main/resources/assets/baseelectric/models/item/silicon_mix.json b/src/main/resources/assets/baseelectric/models/item/silicon_mix.json new file mode 100644 index 0000000..e71b18a --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/silicon_mix.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "item_texture": "baseelectric:items/silicon_mix" + } +} diff --git a/src/main/resources/assets/baseelectric/models/item/solder.json b/src/main/resources/assets/baseelectric/models/item/solder.json new file mode 100644 index 0000000..99e1676 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/solder.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "item_texture": "baseelectric:items/solder" + } +} diff --git a/src/main/resources/assets/baseelectric/models/item/solder_mix.json b/src/main/resources/assets/baseelectric/models/item/solder_mix.json new file mode 100644 index 0000000..51194b8 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/solder_mix.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "item_texture": "baseelectric:items/solder_mix" + } +} diff --git a/src/main/resources/assets/baseelectric/models/item/steam_powered_generator.json b/src/main/resources/assets/baseelectric/models/item/steam_powered_generator.json new file mode 100644 index 0000000..3363433 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/steam_powered_generator.json @@ -0,0 +1,4 @@ +{ + "parent": "baseelectric:block/steam_powered_generator_off", + "ambientocclusion": false +} \ No newline at end of file diff --git a/src/main/resources/assets/baseelectric/models/item/sulfur_ore.json b/src/main/resources/assets/baseelectric/models/item/sulfur_ore.json new file mode 100644 index 0000000..1299c73 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/sulfur_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "baseelectric:block/sulfur_ore" +} \ No newline at end of file diff --git a/src/main/resources/assets/baseelectric/models/item/sulfur_powder.json b/src/main/resources/assets/baseelectric/models/item/sulfur_powder.json new file mode 100644 index 0000000..b1b679d --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/sulfur_powder.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "baseelectric:items/sulfur_powder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_battery_array.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_battery_array.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_battery_array.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_battery_array.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_conduit.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_conduit.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_conduit.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_conduit.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_crusher_off.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_crusher_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_crusher_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_crusher_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_crusher_on.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_crusher_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_crusher_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_crusher_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_crusher_on.png.mcmeta b/src/main/resources/assets/baseelectric/textures/blocks/electric_crusher_on.png.mcmeta similarity index 88% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_crusher_on.png.mcmeta rename to src/main/resources/assets/baseelectric/textures/blocks/electric_crusher_on.png.mcmeta index 72c98b9..dd1bedb 100644 --- a/src/main/resources/assets/electricadvantage/textures/blocks/electric_crusher_on.png.mcmeta +++ b/src/main/resources/assets/baseelectric/textures/blocks/electric_crusher_on.png.mcmeta @@ -1,3 +1,3 @@ -{ - "animation": {} -} +{ + "animation": {} +} diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_crusher_powered.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_crusher_powered.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_crusher_powered.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_crusher_powered.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_drill_off.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_drill_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_drill_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_drill_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_drill_on.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_drill_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_drill_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_drill_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_drill_powered.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_drill_powered.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_drill_powered.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_drill_powered.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_fabricator_off.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_fabricator_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_fabricator_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_fabricator_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_fabricator_on.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_fabricator_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_fabricator_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_fabricator_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_fabricator_on.png.mcmeta b/src/main/resources/assets/baseelectric/textures/blocks/electric_fabricator_on.png.mcmeta similarity index 91% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_fabricator_on.png.mcmeta rename to src/main/resources/assets/baseelectric/textures/blocks/electric_fabricator_on.png.mcmeta index 8e23b64..5c072b7 100644 --- a/src/main/resources/assets/electricadvantage/textures/blocks/electric_fabricator_on.png.mcmeta +++ b/src/main/resources/assets/baseelectric/textures/blocks/electric_fabricator_on.png.mcmeta @@ -1,16 +1,16 @@ -{ - "animation": { - "frametime": 24, - "interpolate": false, - "frames": [ - 0, - 1, - 3, - 2, - 1, - 3, - 0, - 2 - ] - } -} +{ + "animation": { + "frametime": 24, + "interpolate": false, + "frames": [ + 0, + 1, + 3, + 2, + 1, + 3, + 0, + 2 + ] + } +} diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_fabricator_powered.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_fabricator_powered.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_fabricator_powered.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_fabricator_powered.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_furnace_off.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_furnace_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_furnace_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_furnace_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_furnace_on.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_furnace_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_furnace_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_furnace_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_furnace_powered.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_furnace_powered.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_furnace_powered.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_furnace_powered.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_oven_off.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_oven_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_oven_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_oven_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_oven_on.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_oven_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_oven_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_oven_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_oven_powered.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_oven_powered.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_oven_powered.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_oven_powered.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_pcb_printer_off.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_pcb_printer_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_pcb_printer_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_pcb_printer_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_pcb_printer_on.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_pcb_printer_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_pcb_printer_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_pcb_printer_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_pcb_printer_powered.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_pcb_printer_powered.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_pcb_printer_powered.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_pcb_printer_powered.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_pump_off.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_pump_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_pump_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_pump_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_pump_on.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_pump_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_pump_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_pump_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_still_off.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_still_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_still_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_still_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_still_on.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_still_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_still_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_still_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_still_on.png.mcmeta b/src/main/resources/assets/baseelectric/textures/blocks/electric_still_on.png.mcmeta similarity index 88% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_still_on.png.mcmeta rename to src/main/resources/assets/baseelectric/textures/blocks/electric_still_on.png.mcmeta index 72c98b9..dd1bedb 100644 --- a/src/main/resources/assets/electricadvantage/textures/blocks/electric_still_on.png.mcmeta +++ b/src/main/resources/assets/baseelectric/textures/blocks/electric_still_on.png.mcmeta @@ -1,3 +1,3 @@ -{ - "animation": {} -} +{ + "animation": {} +} diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_still_powered.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_still_powered.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_still_powered.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_still_powered.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_switch_off.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_switch_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_switch_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_switch_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_switch_on.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_switch_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_switch_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_switch_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/growth_chamber_controller.png b/src/main/resources/assets/baseelectric/textures/blocks/growth_chamber_controller.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/growth_chamber_controller.png rename to src/main/resources/assets/baseelectric/textures/blocks/growth_chamber_controller.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/growth_chamber_off.png b/src/main/resources/assets/baseelectric/textures/blocks/growth_chamber_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/growth_chamber_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/growth_chamber_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/growth_chamber_on.png b/src/main/resources/assets/baseelectric/textures/blocks/growth_chamber_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/growth_chamber_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/growth_chamber_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/growth_chamber_powered.png b/src/main/resources/assets/baseelectric/textures/blocks/growth_chamber_powered.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/growth_chamber_powered.png rename to src/main/resources/assets/baseelectric/textures/blocks/growth_chamber_powered.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/hydroelectric_generator_off.png b/src/main/resources/assets/baseelectric/textures/blocks/hydroelectric_generator_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/hydroelectric_generator_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/hydroelectric_generator_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/hydroelectric_generator_on.png b/src/main/resources/assets/baseelectric/textures/blocks/hydroelectric_generator_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/hydroelectric_generator_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/hydroelectric_generator_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/hydroelectric_generator_on.png.mcmeta b/src/main/resources/assets/baseelectric/textures/blocks/hydroelectric_generator_on.png.mcmeta similarity index 88% rename from src/main/resources/assets/electricadvantage/textures/blocks/hydroelectric_generator_on.png.mcmeta rename to src/main/resources/assets/baseelectric/textures/blocks/hydroelectric_generator_on.png.mcmeta index 72c98b9..dd1bedb 100644 --- a/src/main/resources/assets/electricadvantage/textures/blocks/hydroelectric_generator_on.png.mcmeta +++ b/src/main/resources/assets/baseelectric/textures/blocks/hydroelectric_generator_on.png.mcmeta @@ -1,3 +1,3 @@ -{ - "animation": {} -} +{ + "animation": {} +} diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/laser_drill_optic.png b/src/main/resources/assets/baseelectric/textures/blocks/laser_drill_optic.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/laser_drill_optic.png rename to src/main/resources/assets/baseelectric/textures/blocks/laser_drill_optic.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/laser_drill_optic_on.png b/src/main/resources/assets/baseelectric/textures/blocks/laser_drill_optic_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/laser_drill_optic_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/laser_drill_optic_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/laser_turret_base.png b/src/main/resources/assets/baseelectric/textures/blocks/laser_turret_base.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/laser_turret_base.png rename to src/main/resources/assets/baseelectric/textures/blocks/laser_turret_base.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/led_bar_off.png b/src/main/resources/assets/baseelectric/textures/blocks/led_bar_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/led_bar_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/led_bar_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/led_bar_on.png b/src/main/resources/assets/baseelectric/textures/blocks/led_bar_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/led_bar_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/led_bar_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/lithium_ore.png b/src/main/resources/assets/baseelectric/textures/blocks/lithium_ore.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/lithium_ore.png rename to src/main/resources/assets/baseelectric/textures/blocks/lithium_ore.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/machine_back.png b/src/main/resources/assets/baseelectric/textures/blocks/machine_back.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/machine_back.png rename to src/main/resources/assets/baseelectric/textures/blocks/machine_back.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/machine_side.png b/src/main/resources/assets/baseelectric/textures/blocks/machine_side.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/machine_side.png rename to src/main/resources/assets/baseelectric/textures/blocks/machine_side.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/machine_top.png b/src/main/resources/assets/baseelectric/textures/blocks/machine_top.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/machine_top.png rename to src/main/resources/assets/baseelectric/textures/blocks/machine_top.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/photovoltaic_cell.png b/src/main/resources/assets/baseelectric/textures/blocks/photovoltaic_cell.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/photovoltaic_cell.png rename to src/main/resources/assets/baseelectric/textures/blocks/photovoltaic_cell.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/plastic_refinery_off.png b/src/main/resources/assets/baseelectric/textures/blocks/plastic_refinery_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/plastic_refinery_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/plastic_refinery_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/plastic_refinery_on.png b/src/main/resources/assets/baseelectric/textures/blocks/plastic_refinery_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/plastic_refinery_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/plastic_refinery_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/steam_powered_generator_off.png b/src/main/resources/assets/baseelectric/textures/blocks/steam_powered_generator_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/steam_powered_generator_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/steam_powered_generator_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/steam_powered_generator_on.png b/src/main/resources/assets/baseelectric/textures/blocks/steam_powered_generator_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/steam_powered_generator_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/steam_powered_generator_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/steam_powered_generator_on.png.mcmeta b/src/main/resources/assets/baseelectric/textures/blocks/steam_powered_generator_on.png.mcmeta similarity index 88% rename from src/main/resources/assets/electricadvantage/textures/blocks/steam_powered_generator_on.png.mcmeta rename to src/main/resources/assets/baseelectric/textures/blocks/steam_powered_generator_on.png.mcmeta index 72c98b9..dd1bedb 100644 --- a/src/main/resources/assets/electricadvantage/textures/blocks/steam_powered_generator_on.png.mcmeta +++ b/src/main/resources/assets/baseelectric/textures/blocks/steam_powered_generator_on.png.mcmeta @@ -1,3 +1,3 @@ -{ - "animation": {} -} +{ + "animation": {} +} diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/sulfur_ore.png b/src/main/resources/assets/baseelectric/textures/blocks/sulfur_ore.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/sulfur_ore.png rename to src/main/resources/assets/baseelectric/textures/blocks/sulfur_ore.png diff --git a/src/main/resources/assets/electricadvantage/textures/entity/hydroturbine.png b/src/main/resources/assets/baseelectric/textures/entity/hydroturbine.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/entity/hydroturbine.png rename to src/main/resources/assets/baseelectric/textures/entity/hydroturbine.png diff --git a/src/main/resources/assets/electricadvantage/textures/entity/laser_turret.png b/src/main/resources/assets/baseelectric/textures/entity/laser_turret.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/entity/laser_turret.png rename to src/main/resources/assets/baseelectric/textures/entity/laser_turret.png diff --git a/src/main/resources/assets/electricadvantage/textures/entity/windturbine.png b/src/main/resources/assets/baseelectric/textures/entity/windturbine.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/entity/windturbine.png rename to src/main/resources/assets/baseelectric/textures/entity/windturbine.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/electric_battery_array_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/electric_battery_array_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/electric_battery_array_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/electric_battery_array_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/electric_crusher_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/electric_crusher_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/electric_crusher_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/electric_crusher_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/electric_drill_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/electric_drill_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/electric_drill_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/electric_drill_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/electric_fabricator_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/electric_fabricator_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/electric_fabricator_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/electric_fabricator_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/electric_furnace_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/electric_furnace_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/electric_furnace_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/electric_furnace_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/electric_generator_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/electric_generator_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/electric_generator_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/electric_generator_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/electric_machine_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/electric_machine_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/electric_machine_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/electric_machine_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/electric_oven_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/electric_oven_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/electric_oven_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/electric_oven_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/electric_pump_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/electric_pump_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/electric_pump_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/electric_pump_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/electric_still_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/electric_still_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/electric_still_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/electric_still_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/geothermal_generator_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/geothermal_generator_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/geothermal_generator_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/geothermal_generator_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/growth_chamber_controller_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/growth_chamber_controller_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/growth_chamber_controller_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/growth_chamber_controller_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/growth_chamber_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/growth_chamber_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/growth_chamber_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/growth_chamber_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/pcb_printer_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/pcb_printer_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/pcb_printer_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/pcb_printer_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/plastic_refinery_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/plastic_refinery_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/plastic_refinery_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/plastic_refinery_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/alkaline_battery.png b/src/main/resources/assets/baseelectric/textures/items/alkaline_battery.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/alkaline_battery.png rename to src/main/resources/assets/baseelectric/textures/items/alkaline_battery.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/blank_circuit_board.png b/src/main/resources/assets/baseelectric/textures/items/blank_circuit_board.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/blank_circuit_board.png rename to src/main/resources/assets/baseelectric/textures/items/blank_circuit_board.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/control_circuit.png b/src/main/resources/assets/baseelectric/textures/items/control_circuit.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/control_circuit.png rename to src/main/resources/assets/baseelectric/textures/items/control_circuit.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/integrated_circuit.png b/src/main/resources/assets/baseelectric/textures/items/integrated_circuit.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/integrated_circuit.png rename to src/main/resources/assets/baseelectric/textures/items/integrated_circuit.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/lead_acid_battery.png b/src/main/resources/assets/baseelectric/textures/items/lead_acid_battery.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/lead_acid_battery.png rename to src/main/resources/assets/baseelectric/textures/items/lead_acid_battery.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/li_ingot.png b/src/main/resources/assets/baseelectric/textures/items/li_ingot.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/li_ingot.png rename to src/main/resources/assets/baseelectric/textures/items/li_ingot.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/li_nugget.png b/src/main/resources/assets/baseelectric/textures/items/li_nugget.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/li_nugget.png rename to src/main/resources/assets/baseelectric/textures/items/li_nugget.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/li_powder.png b/src/main/resources/assets/baseelectric/textures/items/li_powder.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/li_powder.png rename to src/main/resources/assets/baseelectric/textures/items/li_powder.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/lithium_battery.png b/src/main/resources/assets/baseelectric/textures/items/lithium_battery.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/lithium_battery.png rename to src/main/resources/assets/baseelectric/textures/items/lithium_battery.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/nickel_hydride_battery.png b/src/main/resources/assets/baseelectric/textures/items/nickel_hydride_battery.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/nickel_hydride_battery.png rename to src/main/resources/assets/baseelectric/textures/items/nickel_hydride_battery.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/petrolplastic_ingot.png b/src/main/resources/assets/baseelectric/textures/items/petrolplastic_ingot.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/petrolplastic_ingot.png rename to src/main/resources/assets/baseelectric/textures/items/petrolplastic_ingot.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/psu.png b/src/main/resources/assets/baseelectric/textures/items/psu.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/psu.png rename to src/main/resources/assets/baseelectric/textures/items/psu.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/silicon_ingot.png b/src/main/resources/assets/baseelectric/textures/items/silicon_ingot.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/silicon_ingot.png rename to src/main/resources/assets/baseelectric/textures/items/silicon_ingot.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/silicon_mix.png b/src/main/resources/assets/baseelectric/textures/items/silicon_mix.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/silicon_mix.png rename to src/main/resources/assets/baseelectric/textures/items/silicon_mix.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/solder.png b/src/main/resources/assets/baseelectric/textures/items/solder.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/solder.png rename to src/main/resources/assets/baseelectric/textures/items/solder.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/solder_mix.png b/src/main/resources/assets/baseelectric/textures/items/solder_mix.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/solder_mix.png rename to src/main/resources/assets/baseelectric/textures/items/solder_mix.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/sulfur_powder.png b/src/main/resources/assets/baseelectric/textures/items/sulfur_powder.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/sulfur_powder.png rename to src/main/resources/assets/baseelectric/textures/items/sulfur_powder.png diff --git a/src/main/resources/assets/electricadvantage/textures/materials/laser_beam.png b/src/main/resources/assets/baseelectric/textures/materials/laser_beam.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/materials/laser_beam.png rename to src/main/resources/assets/baseelectric/textures/materials/laser_beam.png diff --git a/src/main/resources/assets/electricadvantage/textures/materials/machine_case.png b/src/main/resources/assets/baseelectric/textures/materials/machine_case.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/materials/machine_case.png rename to src/main/resources/assets/baseelectric/textures/materials/machine_case.png diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_battery_array.json b/src/main/resources/assets/electricadvantage/blockstates/electric_battery_array.json deleted file mode 100644 index 3a42457..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_battery_array.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "active=true,facing=east": { "model": "electricadvantage:electric_battery_array", "y": 90 }, - "active=true,facing=north": { "model": "electricadvantage:electric_battery_array" }, - "active=true,facing=south": { "model": "electricadvantage:electric_battery_array", "y": 180 }, - "active=true,facing=west": { "model": "electricadvantage:electric_battery_array", "y": 270 }, - "active=false,facing=east": { "model": "electricadvantage:electric_battery_array", "y": 90 }, - "active=false,facing=north": { "model": "electricadvantage:electric_battery_array" }, - "active=false,facing=south": { "model": "electricadvantage:electric_battery_array", "y": 180 }, - "active=false,facing=west": { "model": "electricadvantage:electric_battery_array", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_conduit.json b/src/main/resources/assets/electricadvantage/blockstates/electric_conduit.json deleted file mode 100644 index f4d4d67..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_conduit.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": "electricadvantage:electric_conduit_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=false,west=false": { "model": "electricadvantage:electric_conduit_n", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=false,west=false": { "model": "electricadvantage:electric_conduit_n", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=false,west=false": { "model": "electricadvantage:electric_conduit_n", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=false,west=false": { "model": "electricadvantage:electric_conduit_n", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=true,west=false": { "model": "electricadvantage:electric_conduit_n", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=false,west=true": { "model": "electricadvantage:electric_conduit_n", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=false,west=false": { "model": "electricadvantage:electric_conduit_nw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=false,west=false": { "model": "electricadvantage:electric_conduit_nw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=false,west=false": { "model": "electricadvantage:electric_conduit_nw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=true,west=false": { "model": "electricadvantage:electric_conduit_ns", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=false,west=true": { "model": "electricadvantage:electric_conduit_nw", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=false,west=false": { "model": "electricadvantage:electric_conduit_nw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=false,west=false": { "model": "electricadvantage:electric_conduit_nw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=true,west=false": { "model": "electricadvantage:electric_conduit_nw", "x": 270, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=false,west=true": { "model": "electricadvantage:electric_conduit_ns", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=false,west=false": { "model": "electricadvantage:electric_conduit_ns", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=true,west=false": { "model": "electricadvantage:electric_conduit_nw", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=false,west=true": { "model": "electricadvantage:electric_conduit_nw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=true,west=false": { "model": "electricadvantage:electric_conduit_nw", "x": 270, "y": 270, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=false,west=true": { "model": "electricadvantage:electric_conduit_nw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=true,west=true": { "model": "electricadvantage:electric_conduit_nw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=false,west=false": { "model": "electricadvantage:electric_conduit_nuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=false,west=false": { "model": "electricadvantage:electric_conduit_nuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=true,west=false": { "model": "electricadvantage:electric_conduit_dnu", "x": 0, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=false,west=true": { "model": "electricadvantage:electric_conduit_dnu", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=false,west=false": { "model": "electricadvantage:electric_conduit_dnu", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=true,west=false": { "model": "electricadvantage:electric_conduit_dnu", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=false,west=true": { "model": "electricadvantage:electric_conduit_nuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=true,west=false": { "model": "electricadvantage:electric_conduit_dnu", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=false,west=true": { "model": "electricadvantage:electric_conduit_nuw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=true,west=true": { "model": "electricadvantage:electric_conduit_dnu", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=false,west=false": { "model": "electricadvantage:electric_conduit_nsw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=true,west=false": { "model": "electricadvantage:electric_conduit_nuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=false,west=true": { "model": "electricadvantage:electric_conduit_nsw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=true,west=false": { "model": "electricadvantage:electric_conduit_nuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=false,west=true": { "model": "electricadvantage:electric_conduit_nsw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=true,west=true": { "model": "electricadvantage:electric_conduit_dnu", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=true,west=false": { "model": "electricadvantage:electric_conduit_dnu", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=false,west=true": { "model": "electricadvantage:electric_conduit_nsw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=true,west=true": { "model": "electricadvantage:electric_conduit_nuw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=true,west=true": { "model": "electricadvantage:electric_conduit_nuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=false,west=false": { "model": "electricadvantage:electric_conduit_nsuw", "x": 180, "y": 180, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=true,west=false": { "model": "electricadvantage:electric_conduit_nsuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=false,west=true": { "model": "electricadvantage:electric_conduit_nsuw", "x": 180, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=true,west=false": { "model": "electricadvantage:electric_conduit_nsuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=false,west=true": { "model": "electricadvantage:electric_conduit_nsuw", "x": 180, "y": 270, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=true,west=true": { "model": "electricadvantage:electric_conduit_ensw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=true,west=false": { "model": "electricadvantage:electric_conduit_ensw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=false,west=true": { "model": "electricadvantage:electric_conduit_nsuw", "x": 180, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=true,west=true": { "model": "electricadvantage:electric_conduit_nsuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=true,west=true": { "model": "electricadvantage:electric_conduit_nsuw", "x": 90, "y": 270, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=true,west=false": { "model": "electricadvantage:electric_conduit_nsuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=false,west=true": { "model": "electricadvantage:electric_conduit_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=true,west=true": { "model": "electricadvantage:electric_conduit_nsuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=true,west=true": { "model": "electricadvantage:electric_conduit_nsuw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=true,west=true": { "model": "electricadvantage:electric_conduit_nsuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=true,west=false": { "model": "electricadvantage:electric_conduit_desuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=false,west=true": { "model": "electricadvantage:electric_conduit_desuw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=true,west=true": { "model": "electricadvantage:electric_conduit_desuw", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=true,west=true": { "model": "electricadvantage:electric_conduit_desuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=true,west=true": { "model": "electricadvantage:electric_conduit_desuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=true,west=true": { "model": "electricadvantage:electric_conduit_desuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=true,west=true": { "model": "electricadvantage:electric_conduit_densuw", "x": 0, "y": 0, "uvlock": false } - - } -} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_crusher.json b/src/main/resources/assets/electricadvantage/blockstates/electric_crusher.json deleted file mode 100644 index c61f389..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_crusher.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:electric_crusher_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:electric_crusher_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:electric_crusher_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:electric_crusher_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:electric_crusher_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:electric_crusher_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:electric_crusher_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:electric_crusher_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:electric_crusher_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:electric_crusher_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:electric_crusher_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:electric_crusher_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:electric_crusher_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:electric_crusher_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:electric_crusher_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:electric_crusher_on", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_drill.json b/src/main/resources/assets/electricadvantage/blockstates/electric_drill.json deleted file mode 100644 index 2040964..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_drill.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "active=true,facing=up": { "model": "electricadvantage:electric_drill_on", "x":270 }, - "active=true,facing=down": { "model": "electricadvantage:electric_drill_on", "x": 90 }, - "active=true,facing=east": { "model": "electricadvantage:electric_drill_on", "y": 90 }, - "active=true,facing=north": { "model": "electricadvantage:electric_drill_on" }, - "active=true,facing=south": { "model": "electricadvantage:electric_drill_on", "y": 180 }, - "active=true,facing=west": { "model": "electricadvantage:electric_drill_on", "y": 270 }, - "active=false,facing=up": { "model": "electricadvantage:electric_drill_off", "x":270 }, - "active=false,facing=down": { "model": "electricadvantage:electric_drill_off", "x": 90 }, - "active=false,facing=east": { "model": "electricadvantage:electric_drill_off", "y": 90 }, - "active=false,facing=north": { "model": "electricadvantage:electric_drill_off" }, - "active=false,facing=south": { "model": "electricadvantage:electric_drill_off", "y": 180 }, - "active=false,facing=west": { "model": "electricadvantage:electric_drill_off", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_fabricator.json b/src/main/resources/assets/electricadvantage/blockstates/electric_fabricator.json deleted file mode 100644 index 22904b8..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_fabricator.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:electric_fabricator_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:electric_fabricator_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:electric_fabricator_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:electric_fabricator_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:electric_fabricator_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:electric_fabricator_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:electric_fabricator_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:electric_fabricator_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:electric_fabricator_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:electric_fabricator_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:electric_fabricator_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:electric_fabricator_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:electric_fabricator_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:electric_fabricator_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:electric_fabricator_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:electric_fabricator_on", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_furnace.json b/src/main/resources/assets/electricadvantage/blockstates/electric_furnace.json deleted file mode 100644 index 13cf5b5..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_furnace.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:electric_furnace_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:electric_furnace_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:electric_furnace_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:electric_furnace_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:electric_furnace_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:electric_furnace_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:electric_furnace_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:electric_furnace_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:electric_furnace_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:electric_furnace_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:electric_furnace_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:electric_furnace_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:electric_furnace_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:electric_furnace_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:electric_furnace_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:electric_furnace_on", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_oven.json b/src/main/resources/assets/electricadvantage/blockstates/electric_oven.json deleted file mode 100644 index d084fc3..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_oven.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:electric_oven_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:electric_oven_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:electric_oven_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:electric_oven_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:electric_oven_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:electric_oven_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:electric_oven_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:electric_oven_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:electric_oven_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:electric_oven_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:electric_oven_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:electric_oven_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:electric_oven_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:electric_oven_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:electric_oven_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:electric_oven_on", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_pcb_printer.json b/src/main/resources/assets/electricadvantage/blockstates/electric_pcb_printer.json deleted file mode 100644 index 63c4448..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_pcb_printer.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:electric_pcb_printer_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:electric_pcb_printer_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:electric_pcb_printer_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:electric_pcb_printer_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:electric_pcb_printer_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:electric_pcb_printer_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:electric_pcb_printer_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:electric_pcb_printer_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:electric_pcb_printer_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:electric_pcb_printer_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:electric_pcb_printer_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:electric_pcb_printer_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:electric_pcb_printer_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:electric_pcb_printer_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:electric_pcb_printer_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:electric_pcb_printer_on", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_pump.json b/src/main/resources/assets/electricadvantage/blockstates/electric_pump.json deleted file mode 100644 index a9b2b80..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_pump.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:electric_pump_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:electric_pump_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:electric_pump_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:electric_pump_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:electric_pump_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:electric_pump_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:electric_pump_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:electric_pump_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:electric_pump_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:electric_pump_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:electric_pump_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:electric_pump_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:electric_pump_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:electric_pump_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:electric_pump_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:electric_pump_on", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_still.json b/src/main/resources/assets/electricadvantage/blockstates/electric_still.json deleted file mode 100644 index 78121b3..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_still.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:electric_still_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:electric_still_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:electric_still_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:electric_still_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:electric_still_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:electric_still_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:electric_still_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:electric_still_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:electric_still_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:electric_still_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:electric_still_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:electric_still_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:electric_still_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:electric_still_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:electric_still_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:electric_still_on", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_switch.json b/src/main/resources/assets/electricadvantage/blockstates/electric_switch.json deleted file mode 100644 index 321a2e9..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_switch.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "active=false": { "model": "electricadvantage:electric_switch_off"}, - "active=true": { "model": "electricadvantage:electric_switch_on"} - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_track.json b/src/main/resources/assets/electricadvantage/blockstates/electric_track.json deleted file mode 100644 index d233151..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_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": "electricadvantage:electric_track_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=false,west=false": { "model": "electricadvantage:electric_track_n", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=false,west=false": { "model": "electricadvantage:electric_track_n", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=false,west=false": { "model": "electricadvantage:electric_track_n", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=false,west=false": { "model": "electricadvantage:electric_track_n", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=true,west=false": { "model": "electricadvantage:electric_track_n", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=false,west=true": { "model": "electricadvantage:electric_track_n", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=false,west=false": { "model": "electricadvantage:electric_track_nw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=false,west=false": { "model": "electricadvantage:electric_track_nw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=false,west=false": { "model": "electricadvantage:electric_track_nw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=true,west=false": { "model": "electricadvantage:electric_track_ns", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=false,west=true": { "model": "electricadvantage:electric_track_nw", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=false,west=false": { "model": "electricadvantage:electric_track_nw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=false,west=false": { "model": "electricadvantage:electric_track_nw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=true,west=false": { "model": "electricadvantage:electric_track_nw", "x": 270, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=false,west=true": { "model": "electricadvantage:electric_track_ns", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=false,west=false": { "model": "electricadvantage:electric_track_ns", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=true,west=false": { "model": "electricadvantage:electric_track_nw", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=false,west=true": { "model": "electricadvantage:electric_track_nw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=true,west=false": { "model": "electricadvantage:electric_track_nw", "x": 270, "y": 270, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=false,west=true": { "model": "electricadvantage:electric_track_nw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=true,west=true": { "model": "electricadvantage:electric_track_nw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=false,west=false": { "model": "electricadvantage:electric_track_nuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=false,west=false": { "model": "electricadvantage:electric_track_nuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=true,west=false": { "model": "electricadvantage:electric_track_dnu", "x": 0, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=false,west=true": { "model": "electricadvantage:electric_track_dnu", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=false,west=false": { "model": "electricadvantage:electric_track_dnu", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=true,west=false": { "model": "electricadvantage:electric_track_dnu", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=false,west=true": { "model": "electricadvantage:electric_track_nuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=true,west=false": { "model": "electricadvantage:electric_track_dnu", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=false,west=true": { "model": "electricadvantage:electric_track_nuw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=true,west=true": { "model": "electricadvantage:electric_track_dnu", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=false,west=false": { "model": "electricadvantage:electric_track_nsw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=true,west=false": { "model": "electricadvantage:electric_track_nuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=false,west=true": { "model": "electricadvantage:electric_track_nsw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=true,west=false": { "model": "electricadvantage:electric_track_nuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=false,west=true": { "model": "electricadvantage:electric_track_nsw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=true,west=true": { "model": "electricadvantage:electric_track_dnu", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=true,west=false": { "model": "electricadvantage:electric_track_dnu", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=false,west=true": { "model": "electricadvantage:electric_track_nsw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=true,west=true": { "model": "electricadvantage:electric_track_nuw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=true,west=true": { "model": "electricadvantage:electric_track_nuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=false,west=false": { "model": "electricadvantage:electric_track_nsuw", "x": 180, "y": 180, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=true,west=false": { "model": "electricadvantage:electric_track_nsuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=false,west=true": { "model": "electricadvantage:electric_track_nsuw", "x": 180, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=true,west=false": { "model": "electricadvantage:electric_track_nsuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=false,west=true": { "model": "electricadvantage:electric_track_nsuw", "x": 180, "y": 270, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=true,west=true": { "model": "electricadvantage:electric_track_ensw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=true,west=false": { "model": "electricadvantage:electric_track_ensw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=false,west=true": { "model": "electricadvantage:electric_track_nsuw", "x": 180, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=true,west=true": { "model": "electricadvantage:electric_track_nsuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=true,west=true": { "model": "electricadvantage:electric_track_nsuw", "x": 90, "y": 270, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=true,west=false": { "model": "electricadvantage:electric_track_nsuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=false,west=true": { "model": "electricadvantage:electric_track_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=true,west=true": { "model": "electricadvantage:electric_track_nsuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=true,west=true": { "model": "electricadvantage:electric_track_nsuw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=true,west=true": { "model": "electricadvantage:electric_track_nsuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=true,west=false": { "model": "electricadvantage:electric_track_desuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=false,west=true": { "model": "electricadvantage:electric_track_desuw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=true,west=true": { "model": "electricadvantage:electric_track_desuw", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=true,west=true": { "model": "electricadvantage:electric_track_desuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=true,west=true": { "model": "electricadvantage:electric_track_desuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=true,west=true": { "model": "electricadvantage:electric_track_desuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=true,west=true": { "model": "electricadvantage:electric_track_densuw", "x": 0, "y": 0, "uvlock": false } - - } -} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/blockstates/geothermal_generator.json b/src/main/resources/assets/electricadvantage/blockstates/geothermal_generator.json deleted file mode 100644 index ef7db1a..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/geothermal_generator.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "active=true,facing=east": { "model": "electricadvantage:geothermal_generator", "y": 90 }, - "active=true,facing=north": { "model": "electricadvantage:geothermal_generator" }, - "active=true,facing=south": { "model": "electricadvantage:geothermal_generator", "y": 180 }, - "active=true,facing=west": { "model": "electricadvantage:geothermal_generator", "y": 270 }, - "active=false,facing=east": { "model": "electricadvantage:geothermal_generator", "y": 90 }, - "active=false,facing=north": { "model": "electricadvantage:geothermal_generator" }, - "active=false,facing=south": { "model": "electricadvantage:geothermal_generator", "y": 180 }, - "active=false,facing=west": { "model": "electricadvantage:geothermal_generator", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/growth_chamber.json b/src/main/resources/assets/electricadvantage/blockstates/growth_chamber.json deleted file mode 100644 index 676a59b..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/growth_chamber.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:growth_chamber_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:growth_chamber_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:growth_chamber_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:growth_chamber_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:growth_chamber_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:growth_chamber_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:growth_chamber_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:growth_chamber_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:growth_chamber_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:growth_chamber_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:growth_chamber_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:growth_chamber_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:growth_chamber_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:growth_chamber_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:growth_chamber_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:growth_chamber_on", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/growth_chamber_controller.json b/src/main/resources/assets/electricadvantage/blockstates/growth_chamber_controller.json deleted file mode 100644 index 39e4d21..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/growth_chamber_controller.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "electricadvantage:growth_chamber_controller", "y": 90 }, - "facing=north": { "model": "electricadvantage:growth_chamber_controller" }, - "facing=south": { "model": "electricadvantage:growth_chamber_controller", "y": 180 }, - "facing=west": { "model": "electricadvantage:growth_chamber_controller", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/hydroelectric_generator.json b/src/main/resources/assets/electricadvantage/blockstates/hydroelectric_generator.json deleted file mode 100644 index af7dee5..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/hydroelectric_generator.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "active=true,facing=east": { "model": "electricadvantage:hydroelectric_generator_on", "y": 90 }, - "active=true,facing=north": { "model": "electricadvantage:hydroelectric_generator_on" }, - "active=true,facing=south": { "model": "electricadvantage:hydroelectric_generator_on", "y": 180 }, - "active=true,facing=west": { "model": "electricadvantage:hydroelectric_generator_on", "y": 270 }, - "active=false,facing=east": { "model": "electricadvantage:hydroelectric_generator_off", "y": 90 }, - "active=false,facing=north": { "model": "electricadvantage:hydroelectric_generator_off" }, - "active=false,facing=south": { "model": "electricadvantage:hydroelectric_generator_off", "y": 180 }, - "active=false,facing=west": { "model": "electricadvantage:hydroelectric_generator_off", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/laser_turret.json b/src/main/resources/assets/electricadvantage/blockstates/laser_turret.json deleted file mode 100644 index 2ef9b07..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/laser_turret.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:laser_turret", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:laser_turret" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:laser_turret", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:laser_turret", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:laser_turret", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:laser_turret" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:laser_turret", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:laser_turret", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:laser_turret", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:laser_turret" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:laser_turret", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:laser_turret", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:laser_turret", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:laser_turret" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:laser_turret", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:laser_turret", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/laser_turret_evil.json b/src/main/resources/assets/electricadvantage/blockstates/laser_turret_evil.json deleted file mode 100644 index 2ef9b07..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/laser_turret_evil.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:laser_turret", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:laser_turret" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:laser_turret", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:laser_turret", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:laser_turret", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:laser_turret" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:laser_turret", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:laser_turret", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:laser_turret", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:laser_turret" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:laser_turret", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:laser_turret", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:laser_turret", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:laser_turret" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:laser_turret", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:laser_turret", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/led_bar.json b/src/main/resources/assets/electricadvantage/blockstates/led_bar.json deleted file mode 100644 index 2d13c59..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/led_bar.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "__comment": "blockstate parameters MUST be in alphabetical order!", - "variants": { - "down=false,east=false,lit=false,north=false,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_off_n", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=false,north=false,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_off_n", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,lit=false,north=false,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_off_n", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,lit=false,north=true,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_off_n", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,lit=false,north=false,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_off_n", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=false,lit=false,north=false,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_off_n", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,lit=false,north=false,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_off_n", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,lit=false,north=false,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_off_nw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=false,lit=false,north=true,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_off_nw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,lit=false,north=false,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_off_nw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,lit=false,north=false,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_off_ns", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=false,north=false,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_off_nw", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,lit=false,north=true,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_off_nw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,lit=false,north=false,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_off_nw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,lit=false,north=false,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_off_nw", "x": 270, "y": 180, "uvlock": false }, - "down=false,east=true,lit=false,north=false,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_off_ns", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,lit=false,north=true,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_off_ns", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,lit=false,north=true,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_off_nw", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,lit=false,north=true,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_off_nw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,lit=false,north=false,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_off_nw", "x": 270, "y": 270, "uvlock": false }, - "down=false,east=false,lit=false,north=false,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_off_nw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,lit=false,north=false,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_off_nw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,lit=false,north=true,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_off_nuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,lit=false,north=false,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_off_nuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,lit=false,north=false,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_off_dnu", "x": 0, "y": 90, "uvlock": false }, - "down=true,east=true,lit=false,north=false,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_off_dnu", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,lit=false,north=true,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_off_dnu", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=false,north=true,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_off_dnu", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,lit=false,north=true,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_off_nuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=false,north=false,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_off_dnu", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=false,lit=false,north=false,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_off_nuw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,lit=false,north=false,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_off_dnu", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,lit=false,north=true,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_off_nsw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,lit=false,north=true,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_off_nuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,lit=false,north=true,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_off_nsw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,lit=false,north=false,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_off_nuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,lit=false,north=false,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_off_nsw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,lit=false,north=false,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_off_dnu", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,lit=false,north=true,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_off_dnu", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,lit=false,north=true,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_off_nsw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,lit=false,north=true,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_off_nuw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,lit=false,north=false,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_off_nuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,lit=false,north=true,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_off_nsuw", "x": 180, "y": 180, "uvlock": false }, - "down=true,east=true,lit=false,north=true,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_off_nsuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,lit=false,north=true,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_off_nsuw", "x": 180, "y": 90, "uvlock": false }, - "down=true,east=true,lit=false,north=false,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_off_nsuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,lit=false,north=false,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_off_nsuw", "x": 180, "y": 270, "uvlock": false }, - "down=true,east=true,lit=false,north=false,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_off_ensw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=false,north=true,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_off_ensw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,lit=false,north=true,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_off_nsuw", "x": 180, "y": 0, "uvlock": false }, - "down=true,east=false,lit=false,north=true,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_off_nsuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=false,north=false,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_off_nsuw", "x": 90, "y": 270, "uvlock": false }, - "down=false,east=true,lit=false,north=true,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_off_nsuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,lit=false,north=true,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_off_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=true,lit=false,north=true,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_off_nsuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,lit=false,north=false,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_off_nsuw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,lit=false,north=true,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_off_nsuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=true,lit=false,north=true,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_off_desuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,lit=false,north=true,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_off_desuw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,lit=false,north=true,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_off_desuw", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=true,lit=false,north=false,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_off_desuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,lit=false,north=true,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_off_desuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,lit=false,north=true,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_off_desuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=true,lit=false,north=true,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_off_densuw", "x": 0, "y": 0, "uvlock": false }, - - "down=false,east=false,lit=true,north=false,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_on_n", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=true,north=false,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_on_n", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,lit=true,north=false,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_on_n", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,lit=true,north=true,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_on_n", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,lit=true,north=false,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_on_n", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=false,lit=true,north=false,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_on_n", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,lit=true,north=false,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_on_n", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,lit=true,north=false,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_on_nw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=false,lit=true,north=true,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_on_nw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,lit=true,north=false,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_on_nw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,lit=true,north=false,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_on_ns", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=true,north=false,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_on_nw", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,lit=true,north=true,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_on_nw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,lit=true,north=false,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_on_nw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,lit=true,north=false,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_on_nw", "x": 270, "y": 180, "uvlock": false }, - "down=false,east=true,lit=true,north=false,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_on_ns", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,lit=true,north=true,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_on_ns", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,lit=true,north=true,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_on_nw", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,lit=true,north=true,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_on_nw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,lit=true,north=false,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_on_nw", "x": 270, "y": 270, "uvlock": false }, - "down=false,east=false,lit=true,north=false,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_on_nw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,lit=true,north=false,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_on_nw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,lit=true,north=true,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_on_nuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,lit=true,north=false,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_on_nuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,lit=true,north=false,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_on_dnu", "x": 0, "y": 90, "uvlock": false }, - "down=true,east=true,lit=true,north=false,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_on_dnu", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,lit=true,north=true,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_on_dnu", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=true,north=true,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_on_dnu", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,lit=true,north=true,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_on_nuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=true,north=false,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_on_dnu", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=false,lit=true,north=false,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_on_nuw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,lit=true,north=false,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_on_dnu", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,lit=true,north=true,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_on_nsw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,lit=true,north=true,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_on_nuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,lit=true,north=true,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_on_nsw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,lit=true,north=false,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_on_nuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,lit=true,north=false,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_on_nsw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,lit=true,north=false,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_on_dnu", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,lit=true,north=true,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_on_dnu", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,lit=true,north=true,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_on_nsw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,lit=true,north=true,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_on_nuw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,lit=true,north=false,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_on_nuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,lit=true,north=true,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_on_nsuw", "x": 180, "y": 180, "uvlock": false }, - "down=true,east=true,lit=true,north=true,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_on_nsuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,lit=true,north=true,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_on_nsuw", "x": 180, "y": 90, "uvlock": false }, - "down=true,east=true,lit=true,north=false,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_on_nsuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,lit=true,north=false,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_on_nsuw", "x": 180, "y": 270, "uvlock": false }, - "down=true,east=true,lit=true,north=false,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_on_ensw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=true,north=true,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_on_ensw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,lit=true,north=true,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_on_nsuw", "x": 180, "y": 0, "uvlock": false }, - "down=true,east=false,lit=true,north=true,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_on_nsuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=true,north=false,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_on_nsuw", "x": 90, "y": 270, "uvlock": false }, - "down=false,east=true,lit=true,north=true,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_on_nsuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,lit=true,north=true,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_on_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=true,lit=true,north=true,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_on_nsuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,lit=true,north=false,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_on_nsuw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,lit=true,north=true,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_on_nsuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=true,lit=true,north=true,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_on_desuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,lit=true,north=true,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_on_desuw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,lit=true,north=true,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_on_desuw", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=true,lit=true,north=false,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_on_desuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,lit=true,north=true,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_on_desuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,lit=true,north=true,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_on_desuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=true,lit=true,north=true,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_on_densuw", "x": 0, "y": 0, "uvlock": false } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/blockstates/li_ore.json b/src/main/resources/assets/electricadvantage/blockstates/li_ore.json deleted file mode 100644 index a47608f..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/li_ore.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "electricadvantage:li_ore" } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/photovoltaic_generator.json b/src/main/resources/assets/electricadvantage/blockstates/photovoltaic_generator.json deleted file mode 100644 index 78fbb88..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/photovoltaic_generator.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "active=true,facing=east": { "model": "electricadvantage:photovoltaic_generator", "y": 90 }, - "active=true,facing=north": { "model": "electricadvantage:photovoltaic_generator" }, - "active=true,facing=south": { "model": "electricadvantage:photovoltaic_generator", "y": 180 }, - "active=true,facing=west": { "model": "electricadvantage:photovoltaic_generator", "y": 270 }, - "active=false,facing=east": { "model": "electricadvantage:photovoltaic_generator", "y": 90 }, - "active=false,facing=north": { "model": "electricadvantage:photovoltaic_generator" }, - "active=false,facing=south": { "model": "electricadvantage:photovoltaic_generator", "y": 180 }, - "active=false,facing=west": { "model": "electricadvantage:photovoltaic_generator", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/plastic_refinery.json b/src/main/resources/assets/electricadvantage/blockstates/plastic_refinery.json deleted file mode 100644 index 049b48a..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/plastic_refinery.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:plastic_refinery_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:plastic_refinery_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:plastic_refinery_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:plastic_refinery_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:plastic_refinery_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:plastic_refinery_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:plastic_refinery_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:plastic_refinery_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:plastic_refinery_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:plastic_refinery_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:plastic_refinery_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:plastic_refinery_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:plastic_refinery_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:plastic_refinery_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:plastic_refinery_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:plastic_refinery_on", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/pump_pipe_electric.json b/src/main/resources/assets/electricadvantage/blockstates/pump_pipe_electric.json deleted file mode 100644 index ee18552..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/pump_pipe_electric.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/electricadvantage/blockstates/steam_powered_generator.json b/src/main/resources/assets/electricadvantage/blockstates/steam_powered_generator.json deleted file mode 100644 index 3bccce9..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/steam_powered_generator.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "active=true,facing=east": { "model": "electricadvantage:steam_powered_generator_on", "y": 90 }, - "active=true,facing=north": { "model": "electricadvantage:steam_powered_generator_on" }, - "active=true,facing=south": { "model": "electricadvantage:steam_powered_generator_on", "y": 180 }, - "active=true,facing=west": { "model": "electricadvantage:steam_powered_generator_on", "y": 270 }, - "active=false,facing=east": { "model": "electricadvantage:steam_powered_generator_off", "y": 90 }, - "active=false,facing=north": { "model": "electricadvantage:steam_powered_generator_off" }, - "active=false,facing=south": { "model": "electricadvantage:steam_powered_generator_off", "y": 180 }, - "active=false,facing=west": { "model": "electricadvantage:steam_powered_generator_off", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/sulfur_ore.json b/src/main/resources/assets/electricadvantage/blockstates/sulfur_ore.json deleted file mode 100644 index 424b8a2..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/sulfur_ore.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "electricadvantage:sulfur_ore" } - } -} diff --git a/src/main/resources/assets/electricadvantage/lang/de_DE.lang b/src/main/resources/assets/electricadvantage/lang/de_DE.lang deleted file mode 100644 index 6ccb63d..0000000 --- a/src/main/resources/assets/electricadvantage/lang/de_DE.lang +++ /dev/null @@ -1,54 +0,0 @@ -language_support_goals=Englisch (en_US, de_DE, en_CA, de_DE, en_AU, en_PT), Spanisch (es_MX, es_ES), Chinesisch (zh_CN), Japanisch (ja_JA), Portugiesisch (pt_BR), Deutsch (de_DE), Italienisch (it_IT), Koreanisch (ko_KR) - -item.electricadvantage.blank_circuit_board.name=Leiterplatte (Leer) -item.electricadvantage.control_circuit.name=Steuerstromkreis -item.electricadvantage.integrated_circuit.name=Mikrochip -item.electricadvantage.psu.name=Netzteil -item.electricadvantage.silicon_ingot.name=Silizium-Ingots -item.electricadvantage.silicon_mix.name=Silizium-Mischung -item.electricadvantage.solder_mix.name=Lötmetall Mischung -item.electricadvantage.solder.name=Lötmetall -item.electricadvantage.li_powder.name=Pulverisierte Lithium -item.electricadvantage.li_ingot.name=Lithium-Barren -item.electricadvantage.li_nugget.name=Lithium Nugget -item.electricadvantage.sulfur_powder.name=Schwefelpulver -item.electricadvantage.lead_acid_battery.name=Blei-Säure-Batterie -item.electricadvantage.nickel_hydride_battery.name=Nickel-Metallhydrid-Batterie -item.electricadvantage.alkaline_battery.name=Alkali-Batterie -item.electricadvantage.lithium_battery.name=Lithium-Ionen-Batterie - -tile.electricadvantage.electric_conduit.name=Elektrischen Draht -tile.electricadvantage.electric_track.name=Elektro-Gerüst -tile.electricadvantage.electric_battery_array.name=Batterie Array -tile.electricadvantage.electric_crusher.name=Elektrische Felsen-Zerkleinerungsmaschine -tile.electricadvantage.laser_turret.name=Laser-Verteidigung Waffe -tile.electricadvantage.electric_drill.name=Laser Bohrer -tile.electricadvantage.electric_fabricator.name=Automatisierte Fabrik -tile.electricadvantage.electric_furnace.name=Lichtbogenofen -tile.electricadvantage.electric_oven.name=Elektro-Ofen -tile.electricadvantage.electric_pcb_printer.name=PCB Drucker -tile.electricadvantage.geothermal_generator.name=Geothermal Generator -tile.electricadvantage.hydroelectric_generator.name=Hydroelectric Generator -tile.electricadvantage.photovoltaic_generator.name=Photovoltaik-Generator -tile.electricadvantage.steam_powered_generator.name=Pumpenlose Stromerzeuger -tile.electricadvantage.growth_chamber.name=Wachstumskammer -tile.electricadvantage.growth_chamber_controller.name=Wachstumskammer Steuereinheit -tile.electricadvantage.li_ore.name=Lithiumerz -tile.electricadvantage.sulfur_ore.name=Schwefelerz -tile.electricadvantage.led_bar.name=LED Draht - -tooltip.battery.charge=Lade -tooltip.battery.capacity=Kapazität - -death.attack.laser=%1$s verdampft -death.attack.laser.player=%2$s verdampft %1$s -death.attack.propeller=%1$s wurde von einem Propeller pulverisiert. -death.attack.propeller.player=%2$s geschoben %1$s in einen Propeller. - - -tile.electricadvantage.electric_switch.name=Elektrische Schalter -tile.electricadvantage.electric_still.name=Elektro Brennerei -tile.electricadvantage.electric_pump.name=Elektropumpe -tile.electricadvantage.plastic_refinery.name=Kunststoff-Raffinerie -item.electricadvantage.petrolplastic_ingot.name=Erdöl Kunststoff Barren -tile.electricadvantage.pump_pipe_electric.name=Pumpenrohr diff --git a/src/main/resources/assets/electricadvantage/lang/en_AU.lang b/src/main/resources/assets/electricadvantage/lang/en_AU.lang deleted file mode 100644 index e300e57..0000000 --- a/src/main/resources/assets/electricadvantage/lang/en_AU.lang +++ /dev/null @@ -1,54 +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.electricadvantage.blank_circuit_board.name=Circuit Board (Blank) -item.electricadvantage.control_circuit.name=Control Circuit -item.electricadvantage.integrated_circuit.name=Microchip -item.electricadvantage.psu.name=Power Supply Unit -item.electricadvantage.silicon_ingot.name=Silicon Ingot -item.electricadvantage.silicon_mix.name=Silicon Blend -item.electricadvantage.solder_mix.name=Solder Blend -item.electricadvantage.solder.name=Solder -item.electricadvantage.li_powder.name=Powdered Lithium -item.electricadvantage.li_ingot.name=Lithium Ingot -item.electricadvantage.li_nugget.name=Lithium Nugget -item.electricadvantage.sulfur_powder.name=Powdered Sulfur -item.electricadvantage.lead_acid_battery.name=Lead-Acid Battery -item.electricadvantage.nickel_hydride_battery.name=Nickel-Metal Hydride Battery -item.electricadvantage.alkaline_battery.name=Alkaline Battery -item.electricadvantage.lithium_battery.name=Lithium-Ion Battery - -tile.electricadvantage.electric_conduit.name=Electric Power Cable -tile.electricadvantage.electric_track.name=Electric Scaffold -tile.electricadvantage.electric_battery_array.name=Battery Array -tile.electricadvantage.electric_crusher.name=Electric Rock Crusher -tile.electricadvantage.laser_turret.name=Laser Defense Turret -tile.electricadvantage.electric_drill.name=Electric Mining Drill -tile.electricadvantage.electric_fabricator.name=Automated Assembler -tile.electricadvantage.electric_furnace.name=Electric Arc Furnace -tile.electricadvantage.electric_oven.name=Electric Oven -tile.electricadvantage.electric_pcb_printer.name=PCB Printer -tile.electricadvantage.geothermal_generator.name=Geothermal Generator -tile.electricadvantage.hydroelectric_generator.name=Hydroelectric Generator -tile.electricadvantage.photovoltaic_generator.name=Photovoltaic Generator -tile.electricadvantage.steam_powered_generator.name=Steam-Powered Electric Generator -tile.electricadvantage.growth_chamber.name=Growth Chamber -tile.electricadvantage.growth_chamber_controller.name=Growth Chamber Control Unit -tile.electricadvantage.li_ore.name=Lithium Ore -tile.electricadvantage.sulfur_ore.name=Sulfur Ore -tile.electricadvantage.led_bar.name=LED Bar - -tooltip.battery.charge=Charge -tooltip.battery.capacity=Capacity - -death.attack.laser=%1$s vaporized -death.attack.laser.player=%2$s vaporized %1$s -death.attack.propeller=%1$s was pulverized by a propeller. -death.attack.propeller.player=%2$s pushed %1$s into a propeller. - - -tile.electricadvantage.electric_switch.name=Electric Switch -tile.electricadvantage.electric_still.name=Electric Distiller -tile.electricadvantage.electric_pump.name=Electric Pump -tile.electricadvantage.plastic_refinery.name=Petro-Plastic Refinery -item.electricadvantage.petrolplastic_ingot.name=Petro-Plastic Ingot -tile.electricadvantage.pump_pipe_electric.name=Pump Pipe diff --git a/src/main/resources/assets/electricadvantage/lang/en_CA.lang b/src/main/resources/assets/electricadvantage/lang/en_CA.lang deleted file mode 100644 index e300e57..0000000 --- a/src/main/resources/assets/electricadvantage/lang/en_CA.lang +++ /dev/null @@ -1,54 +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.electricadvantage.blank_circuit_board.name=Circuit Board (Blank) -item.electricadvantage.control_circuit.name=Control Circuit -item.electricadvantage.integrated_circuit.name=Microchip -item.electricadvantage.psu.name=Power Supply Unit -item.electricadvantage.silicon_ingot.name=Silicon Ingot -item.electricadvantage.silicon_mix.name=Silicon Blend -item.electricadvantage.solder_mix.name=Solder Blend -item.electricadvantage.solder.name=Solder -item.electricadvantage.li_powder.name=Powdered Lithium -item.electricadvantage.li_ingot.name=Lithium Ingot -item.electricadvantage.li_nugget.name=Lithium Nugget -item.electricadvantage.sulfur_powder.name=Powdered Sulfur -item.electricadvantage.lead_acid_battery.name=Lead-Acid Battery -item.electricadvantage.nickel_hydride_battery.name=Nickel-Metal Hydride Battery -item.electricadvantage.alkaline_battery.name=Alkaline Battery -item.electricadvantage.lithium_battery.name=Lithium-Ion Battery - -tile.electricadvantage.electric_conduit.name=Electric Power Cable -tile.electricadvantage.electric_track.name=Electric Scaffold -tile.electricadvantage.electric_battery_array.name=Battery Array -tile.electricadvantage.electric_crusher.name=Electric Rock Crusher -tile.electricadvantage.laser_turret.name=Laser Defense Turret -tile.electricadvantage.electric_drill.name=Electric Mining Drill -tile.electricadvantage.electric_fabricator.name=Automated Assembler -tile.electricadvantage.electric_furnace.name=Electric Arc Furnace -tile.electricadvantage.electric_oven.name=Electric Oven -tile.electricadvantage.electric_pcb_printer.name=PCB Printer -tile.electricadvantage.geothermal_generator.name=Geothermal Generator -tile.electricadvantage.hydroelectric_generator.name=Hydroelectric Generator -tile.electricadvantage.photovoltaic_generator.name=Photovoltaic Generator -tile.electricadvantage.steam_powered_generator.name=Steam-Powered Electric Generator -tile.electricadvantage.growth_chamber.name=Growth Chamber -tile.electricadvantage.growth_chamber_controller.name=Growth Chamber Control Unit -tile.electricadvantage.li_ore.name=Lithium Ore -tile.electricadvantage.sulfur_ore.name=Sulfur Ore -tile.electricadvantage.led_bar.name=LED Bar - -tooltip.battery.charge=Charge -tooltip.battery.capacity=Capacity - -death.attack.laser=%1$s vaporized -death.attack.laser.player=%2$s vaporized %1$s -death.attack.propeller=%1$s was pulverized by a propeller. -death.attack.propeller.player=%2$s pushed %1$s into a propeller. - - -tile.electricadvantage.electric_switch.name=Electric Switch -tile.electricadvantage.electric_still.name=Electric Distiller -tile.electricadvantage.electric_pump.name=Electric Pump -tile.electricadvantage.plastic_refinery.name=Petro-Plastic Refinery -item.electricadvantage.petrolplastic_ingot.name=Petro-Plastic Ingot -tile.electricadvantage.pump_pipe_electric.name=Pump Pipe diff --git a/src/main/resources/assets/electricadvantage/lang/en_EN.lang b/src/main/resources/assets/electricadvantage/lang/en_EN.lang deleted file mode 100644 index 3fde5ab..0000000 --- a/src/main/resources/assets/electricadvantage/lang/en_EN.lang +++ /dev/null @@ -1,54 +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.electricadvantage.blank_circuit_board.name=Circuit Board (Blank) -item.electricadvantage.control_circuit.name=Control Circuit -item.electricadvantage.integrated_circuit.name=Microchip -item.electricadvantage.psu.name=Power Supply Unit -item.electricadvantage.silicon_ingot.name=Silicon Ingot -item.electricadvantage.silicon_mix.name=Silicon Blend -item.electricadvantage.solder_mix.name=Solder Blend -item.electricadvantage.solder.name=Solder -item.electricadvantage.li_powder.name=Powdered Lithium -item.electricadvantage.li_ingot.name=Lithium Ingot -item.electricadvantage.li_nugget.name=Lithium Nugget -item.electricadvantage.sulfur_powder.name=Powdered Sulfur -item.electricadvantage.lead_acid_battery.name=Lead-Acid Battery -item.electricadvantage.nickel_hydride_battery.name=Nickel-Metal Hydride Battery -item.electricadvantage.alkaline_battery.name=Alkaline Battery -item.electricadvantage.lithium_battery.name=Lithium-Ion Battery - -tile.electricadvantage.electric_conduit.name=Electric Power Cable -tile.electricadvantage.electric_track.name=Electric Scaffold -tile.electricadvantage.electric_battery_array.name=Battery Array -tile.electricadvantage.electric_crusher.name=Electric Rock Crusher -tile.electricadvantage.laser_turret.name=Laser Turret -tile.electricadvantage.electric_drill.name=Electric Mining Drill -tile.electricadvantage.electric_fabricator.name=Automated Assembler -tile.electricadvantage.electric_furnace.name=Electric Arc Furnace -tile.electricadvantage.electric_oven.name=Electric Oven -tile.electricadvantage.electric_pcb_printer.name=PCB Printer -tile.electricadvantage.geothermal_generator.name=Geothermal Generator -tile.electricadvantage.hydroelectric_generator.name=Hydroelectric Generator -tile.electricadvantage.photovoltaic_generator.name=Photovoltaic Generator -tile.electricadvantage.steam_powered_generator.name=Steam-Powered Electric Generator -tile.electricadvantage.growth_chamber.name=Growth Chamber -tile.electricadvantage.growth_chamber_controller.name=Growth Chamber Control Unit -tile.electricadvantage.li_ore.name=Lithium Ore -tile.electricadvantage.sulfur_ore.name=Sulfur Ore -tile.electricadvantage.led_bar.name=LED Bar - -tooltip.battery.charge=Charge -tooltip.battery.capacity=Capacity - -death.attack.laser=%1$s vaporized -death.attack.laser.player=%2$s vaporized %1$s -death.attack.propeller=%1$s was pulverized by a propeller. -death.attack.propeller.player=%2$s pushed %1$s into a propeller. - - -tile.electricadvantage.electric_switch.name=Electric Switch -tile.electricadvantage.electric_still.name=Electric Distiller -tile.electricadvantage.electric_pump.name=Electric Pump -tile.electricadvantage.plastic_refinery.name=Petro-Plastic Refinery -item.electricadvantage.petrolplastic_ingot.name=Petro-Plastic Ingot -tile.electricadvantage.pump_pipe_electric.name=Pump Pipe diff --git a/src/main/resources/assets/electricadvantage/lang/en_GB.lang b/src/main/resources/assets/electricadvantage/lang/en_GB.lang deleted file mode 100644 index e300e57..0000000 --- a/src/main/resources/assets/electricadvantage/lang/en_GB.lang +++ /dev/null @@ -1,54 +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.electricadvantage.blank_circuit_board.name=Circuit Board (Blank) -item.electricadvantage.control_circuit.name=Control Circuit -item.electricadvantage.integrated_circuit.name=Microchip -item.electricadvantage.psu.name=Power Supply Unit -item.electricadvantage.silicon_ingot.name=Silicon Ingot -item.electricadvantage.silicon_mix.name=Silicon Blend -item.electricadvantage.solder_mix.name=Solder Blend -item.electricadvantage.solder.name=Solder -item.electricadvantage.li_powder.name=Powdered Lithium -item.electricadvantage.li_ingot.name=Lithium Ingot -item.electricadvantage.li_nugget.name=Lithium Nugget -item.electricadvantage.sulfur_powder.name=Powdered Sulfur -item.electricadvantage.lead_acid_battery.name=Lead-Acid Battery -item.electricadvantage.nickel_hydride_battery.name=Nickel-Metal Hydride Battery -item.electricadvantage.alkaline_battery.name=Alkaline Battery -item.electricadvantage.lithium_battery.name=Lithium-Ion Battery - -tile.electricadvantage.electric_conduit.name=Electric Power Cable -tile.electricadvantage.electric_track.name=Electric Scaffold -tile.electricadvantage.electric_battery_array.name=Battery Array -tile.electricadvantage.electric_crusher.name=Electric Rock Crusher -tile.electricadvantage.laser_turret.name=Laser Defense Turret -tile.electricadvantage.electric_drill.name=Electric Mining Drill -tile.electricadvantage.electric_fabricator.name=Automated Assembler -tile.electricadvantage.electric_furnace.name=Electric Arc Furnace -tile.electricadvantage.electric_oven.name=Electric Oven -tile.electricadvantage.electric_pcb_printer.name=PCB Printer -tile.electricadvantage.geothermal_generator.name=Geothermal Generator -tile.electricadvantage.hydroelectric_generator.name=Hydroelectric Generator -tile.electricadvantage.photovoltaic_generator.name=Photovoltaic Generator -tile.electricadvantage.steam_powered_generator.name=Steam-Powered Electric Generator -tile.electricadvantage.growth_chamber.name=Growth Chamber -tile.electricadvantage.growth_chamber_controller.name=Growth Chamber Control Unit -tile.electricadvantage.li_ore.name=Lithium Ore -tile.electricadvantage.sulfur_ore.name=Sulfur Ore -tile.electricadvantage.led_bar.name=LED Bar - -tooltip.battery.charge=Charge -tooltip.battery.capacity=Capacity - -death.attack.laser=%1$s vaporized -death.attack.laser.player=%2$s vaporized %1$s -death.attack.propeller=%1$s was pulverized by a propeller. -death.attack.propeller.player=%2$s pushed %1$s into a propeller. - - -tile.electricadvantage.electric_switch.name=Electric Switch -tile.electricadvantage.electric_still.name=Electric Distiller -tile.electricadvantage.electric_pump.name=Electric Pump -tile.electricadvantage.plastic_refinery.name=Petro-Plastic Refinery -item.electricadvantage.petrolplastic_ingot.name=Petro-Plastic Ingot -tile.electricadvantage.pump_pipe_electric.name=Pump Pipe diff --git a/src/main/resources/assets/electricadvantage/lang/en_PT.lang b/src/main/resources/assets/electricadvantage/lang/en_PT.lang deleted file mode 100644 index 3fde5ab..0000000 --- a/src/main/resources/assets/electricadvantage/lang/en_PT.lang +++ /dev/null @@ -1,54 +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.electricadvantage.blank_circuit_board.name=Circuit Board (Blank) -item.electricadvantage.control_circuit.name=Control Circuit -item.electricadvantage.integrated_circuit.name=Microchip -item.electricadvantage.psu.name=Power Supply Unit -item.electricadvantage.silicon_ingot.name=Silicon Ingot -item.electricadvantage.silicon_mix.name=Silicon Blend -item.electricadvantage.solder_mix.name=Solder Blend -item.electricadvantage.solder.name=Solder -item.electricadvantage.li_powder.name=Powdered Lithium -item.electricadvantage.li_ingot.name=Lithium Ingot -item.electricadvantage.li_nugget.name=Lithium Nugget -item.electricadvantage.sulfur_powder.name=Powdered Sulfur -item.electricadvantage.lead_acid_battery.name=Lead-Acid Battery -item.electricadvantage.nickel_hydride_battery.name=Nickel-Metal Hydride Battery -item.electricadvantage.alkaline_battery.name=Alkaline Battery -item.electricadvantage.lithium_battery.name=Lithium-Ion Battery - -tile.electricadvantage.electric_conduit.name=Electric Power Cable -tile.electricadvantage.electric_track.name=Electric Scaffold -tile.electricadvantage.electric_battery_array.name=Battery Array -tile.electricadvantage.electric_crusher.name=Electric Rock Crusher -tile.electricadvantage.laser_turret.name=Laser Turret -tile.electricadvantage.electric_drill.name=Electric Mining Drill -tile.electricadvantage.electric_fabricator.name=Automated Assembler -tile.electricadvantage.electric_furnace.name=Electric Arc Furnace -tile.electricadvantage.electric_oven.name=Electric Oven -tile.electricadvantage.electric_pcb_printer.name=PCB Printer -tile.electricadvantage.geothermal_generator.name=Geothermal Generator -tile.electricadvantage.hydroelectric_generator.name=Hydroelectric Generator -tile.electricadvantage.photovoltaic_generator.name=Photovoltaic Generator -tile.electricadvantage.steam_powered_generator.name=Steam-Powered Electric Generator -tile.electricadvantage.growth_chamber.name=Growth Chamber -tile.electricadvantage.growth_chamber_controller.name=Growth Chamber Control Unit -tile.electricadvantage.li_ore.name=Lithium Ore -tile.electricadvantage.sulfur_ore.name=Sulfur Ore -tile.electricadvantage.led_bar.name=LED Bar - -tooltip.battery.charge=Charge -tooltip.battery.capacity=Capacity - -death.attack.laser=%1$s vaporized -death.attack.laser.player=%2$s vaporized %1$s -death.attack.propeller=%1$s was pulverized by a propeller. -death.attack.propeller.player=%2$s pushed %1$s into a propeller. - - -tile.electricadvantage.electric_switch.name=Electric Switch -tile.electricadvantage.electric_still.name=Electric Distiller -tile.electricadvantage.electric_pump.name=Electric Pump -tile.electricadvantage.plastic_refinery.name=Petro-Plastic Refinery -item.electricadvantage.petrolplastic_ingot.name=Petro-Plastic Ingot -tile.electricadvantage.pump_pipe_electric.name=Pump Pipe diff --git a/src/main/resources/assets/electricadvantage/lang/en_US.lang b/src/main/resources/assets/electricadvantage/lang/en_US.lang deleted file mode 100644 index a96ef0b..0000000 --- a/src/main/resources/assets/electricadvantage/lang/en_US.lang +++ /dev/null @@ -1,54 +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.electricadvantage.blank_circuit_board.name=Circuit Board (Blank) -item.electricadvantage.control_circuit.name=Control Circuit -item.electricadvantage.integrated_circuit.name=Microchip -item.electricadvantage.psu.name=Power Supply Unit -item.electricadvantage.silicon_ingot.name=Silicon Ingot -item.electricadvantage.silicon_mix.name=Silicon Blend -item.electricadvantage.solder_mix.name=Solder Blend -item.electricadvantage.solder.name=Solder -item.electricadvantage.li_powder.name=Powdered Lithium -item.electricadvantage.li_ingot.name=Lithium Ingot -item.electricadvantage.li_nugget.name=Lithium Nugget -item.electricadvantage.sulfur_powder.name=Powdered Sulfur -item.electricadvantage.lead_acid_battery.name=Lead-Acid Battery -item.electricadvantage.nickel_hydride_battery.name=Nickel-Metal Hydride Battery -item.electricadvantage.alkaline_battery.name=Alkaline Battery -item.electricadvantage.lithium_battery.name=Lithium-Ion Battery - -tile.electricadvantage.electric_conduit.name=Electric Power Cable -tile.electricadvantage.electric_track.name=Electric Scaffold -tile.electricadvantage.electric_battery_array.name=Battery Array -tile.electricadvantage.electric_crusher.name=Electric Rock Crusher -tile.electricadvantage.laser_turret.name=Laser Turret -tile.electricadvantage.electric_drill.name=Electric Mining Drill -tile.electricadvantage.electric_fabricator.name=Automated Assembler -tile.electricadvantage.electric_furnace.name=Electric Arc Furnace -tile.electricadvantage.electric_oven.name=Electric Oven -tile.electricadvantage.electric_pcb_printer.name=PCB Printer -tile.electricadvantage.geothermal_generator.name=Geothermal Generator -tile.electricadvantage.hydroelectric_generator.name=Hydroelectric Generator -tile.electricadvantage.photovoltaic_generator.name=Photovoltaic Generator -tile.electricadvantage.steam_powered_generator.name=Steam-Powered Electric Generator -tile.electricadvantage.growth_chamber.name=Growth Chamber -tile.electricadvantage.growth_chamber_controller.name=Growth Chamber Control Unit -tile.electricadvantage.li_ore.name=Lithium Ore -tile.electricadvantage.sulfur_ore.name=Sulfur Ore -tile.electricadvantage.led_bar.name=LED Bar - -tooltip.battery.charge=Charge -tooltip.battery.capacity=Capacity - -death.attack.laser=%1$s vaporized -death.attack.laser.player=%2$s vaporized %1$s -death.attack.propeller=%1$s was pulverized by a propeller. -death.attack.propeller.player=%2$s pushed %1$s into a propeller. - -tile.electricadvantage.electric_switch.name=Electric Switch -tile.electricadvantage.electric_still.name=Electric Distiller -tile.electricadvantage.electric_pump.name=Electric Pump -tile.electricadvantage.plastic_refinery.name=Petro-Plastic Refinery -item.electricadvantage.petrolplastic_ingot.name=Petro-Plastic Ingot -tile.electricadvantage.pump_pipe_electric.name=Pump Pipe - diff --git a/src/main/resources/assets/electricadvantage/lang/es_ES.lang b/src/main/resources/assets/electricadvantage/lang/es_ES.lang deleted file mode 100644 index da6a1c0..0000000 --- a/src/main/resources/assets/electricadvantage/lang/es_ES.lang +++ /dev/null @@ -1,55 +0,0 @@ -language_support_goals=Inglés (en_US, en_EN, en_CA, es_ES, es_ES, en_PT), Español (es_MX, es_ES), chino (zh_CN), japonés (ja_JA), portugués (pt_BR), Alemán (de_DE), italiano (it_IT), coreano (ko_KR) - -item.electricadvantage.blank_circuit_board.name=Placa de Circuito (Blanco) -item.electricadvantage.control_circuit.name=Circuito de Computadora -item.electricadvantage.integrated_circuit.name=Microchip -item.electricadvantage.psu.name=Unidad de Fuente de Alimentación -item.electricadvantage.silicon_ingot.name=Silicio Lingote -item.electricadvantage.silicon_mix.name=Blend Silicio -item.electricadvantage.solder_mix.name=Blend Soldadura -item.electricadvantage.solder.name=Soldadura -item.electricadvantage.li_powder.name=Polvo de Litio -item.electricadvantage.li_ingot.name=Litio Lingote -item.electricadvantage.li_nugget.name=Pepita de Litio -item.electricadvantage.sulfur_powder.name=Azufre en Polvo -item.electricadvantage.lead_acid_battery.name=Plomo-Ácido de la Batería -item.electricadvantage.nickel_hydride_battery.name=Níquel e Hidruro Metálico -item.electricadvantage.alkaline_battery.name=Batería Alcalina -item.electricadvantage.lithium_battery.name=Batería de Litio-Ion - -tile.electricadvantage.electric_conduit.name=Cable de Energía Eléctrica -tile.electricadvantage.electric_track.name=Eléctrica Andamios -tile.electricadvantage.electric_battery_array.name=Batería Matriz -tile.electricadvantage.electric_crusher.name=Eléctrica de la Roca Trituradora -tile.electricadvantage.laser_turret.name=Laser Defensa Torreta -tile.electricadvantage.electric_drill.name=Eléctrica Minería Taladro -tile.electricadvantage.electric_fabricator.name=Automatizado Ensamblador -tile.electricadvantage.electric_furnace.name=Horno de Arco Eléctrico -tile.electricadvantage.electric_oven.name=Horno Eléctrico -tile.electricadvantage.electric_pcb_printer.name=PCB Impresora -tile.electricadvantage.geothermal_generator.name=Geotérmica Generador -tile.electricadvantage.hydroelectric_generator.name=Hidroeléctrico Generador -tile.electricadvantage.photovoltaic_generator.name=Fotovoltaica Generador -tile.electricadvantage.steam_powered_generator.name=a Vapor Generador Eléctrico -tile.electricadvantage.growth_chamber.name=Cámara Crecimiento -tile.electricadvantage.growth_chamber_controller.name=Unidad de Control de Crecimiento Cámara -tile.electricadvantage.li_ore.name=Mineral de Litio -tile.electricadvantage.sulfur_ore.name=Mineral de Azufre -tile.electricadvantage.led_bar.name=Luz LED - -tooltip.battery.charge=Carga -tooltip.battery.capacity=Capacidad - -death.attack.laser=%1$s vaporiza -death.attack.laser.player=%2$s vaporizado s%1$s -death.attack.propeller=%1$s se pulverizan por una hélice. -death.attack.propeller.player=%2$s empujaron %1$s en la hélice. - - - -tile.electricadvantage.electric_switch.name=Interruptor Eléctrico -tile.electricadvantage.electric_still.name=Destilador Eléctrico -tile.electricadvantage.electric_pump.name=Bomba Eléctrica -tile.electricadvantage.plastic_refinery.name=Refinería de Plástico -item.electricadvantage.petrolplastic_ingot.name=Petróleo Lingote de Plástico -tile.electricadvantage.pump_pipe_electric.name=Tubería de la Bomba diff --git a/src/main/resources/assets/electricadvantage/lang/es_MX.lang b/src/main/resources/assets/electricadvantage/lang/es_MX.lang deleted file mode 100644 index 186cc6f..0000000 --- a/src/main/resources/assets/electricadvantage/lang/es_MX.lang +++ /dev/null @@ -1,53 +0,0 @@ -language_support_goals=Inglés (en_US, en_EN, en_CA, es_ES, es_ES, en_PT), Español (es_MX, es_ES), chino (zh_CN), japonés (ja_JA), portugués (pt_BR), Alemán (de_DE), italiano (it_IT), coreano (ko_KR) - -item.electricadvantage.blank_circuit_board.name=Placa de Circuito (Blanco) -item.electricadvantage.control_circuit.name=Circuito de Computadora -item.electricadvantage.integrated_circuit.name=Microchip -item.electricadvantage.psu.name=Unidad de Fuente de Alimentación -item.electricadvantage.silicon_ingot.name=Silicio Lingote -item.electricadvantage.silicon_mix.name=Blend Silicio -item.electricadvantage.solder_mix.name=Blend Soldadura -item.electricadvantage.solder.name=Soldadura -item.electricadvantage.li_powder.name=Polvo de Litio -item.electricadvantage.li_ingot.name=Litio Lingote -item.electricadvantage.li_nugget.name=Pepita de Litio -item.electricadvantage.sulfur_powder.name=Azufre en Polvo -item.electricadvantage.lead_acid_battery.name=Plomo-Ácido de la Batería -item.electricadvantage.nickel_hydride_battery.name=Níquel e Hidruro Metálico -item.electricadvantage.alkaline_battery.name=Batería Alcalina -item.electricadvantage.lithium_battery.name=Batería de Litio-Ion - -tile.electricadvantage.electric_conduit.name=Cable de Energía Eléctrica -tile.electricadvantage.electric_track.name=Eléctrica Andamios -tile.electricadvantage.electric_battery_array.name=Batería Matriz -tile.electricadvantage.electric_crusher.name=Eléctrica de la Roca Trituradora -tile.electricadvantage.laser_turret.name=Laser Defensa Torreta -tile.electricadvantage.electric_drill.name=Eléctrica Minería Taladro -tile.electricadvantage.electric_fabricator.name=Automatizado Ensamblador -tile.electricadvantage.electric_furnace.name=Horno de Arco Eléctrico -tile.electricadvantage.electric_oven.name=Horno Eléctrico -tile.electricadvantage.electric_pcb_printer.name=PCB Impresora -tile.electricadvantage.geothermal_generator.name=Geotérmica Generador -tile.electricadvantage.hydroelectric_generator.name=Hidroeléctrico Generador -tile.electricadvantage.photovoltaic_generator.name=Fotovoltaica Generador -tile.electricadvantage.steam_powered_generator.name=a Vapor Generador Eléctrico -tile.electricadvantage.growth_chamber.name=Cámara Crecimiento -tile.electricadvantage.growth_chamber_controller.name=Unidad de Control de Crecimiento Cámara -tile.electricadvantage.li_ore.name=Mineral de Litio -tile.electricadvantage.sulfur_ore.name=Mineral de Azufre -tile.electricadvantage.led_bar.name=Luz LED - -tooltip.battery.charge=Carga -tooltip.battery.capacity=Capacidad - -death.attack.laser=%1$s vaporiza -death.attack.laser.player=%2$s vaporizado s%1$s -death.attack.propeller=%1$s se pulverizan por una hélice. -death.attack.propeller.player=%2$s empujaron %1$s en la hélice. - -tile.electricadvantage.electric_switch.name=Interruptor Eléctrico -tile.electricadvantage.electric_still.name=Destilador Eléctrico -tile.electricadvantage.electric_pump.name=Bomba Eléctrica -tile.electricadvantage.plastic_refinery.name=Refinería de Plástico -item.electricadvantage.petrolplastic_ingot.name=Petróleo Lingote de Plástico -tile.electricadvantage.pump_pipe_electric.name=Tubería de la Bomba diff --git a/src/main/resources/assets/electricadvantage/lang/it_IT.lang b/src/main/resources/assets/electricadvantage/lang/it_IT.lang deleted file mode 100644 index 7920979..0000000 --- a/src/main/resources/assets/electricadvantage/lang/it_IT.lang +++ /dev/null @@ -1,53 +0,0 @@ -language_support_goals=inglese (it, en_EN, en_CA, en_GB, en_AU, en_PT), spagnolo (es_MX, es_ES), cinese (zh_CN), giapponese (ja_JA), portoghese (pt_BR), tedesco (de_DE), italiano (it_IT), coreano (ko_KR) - -item.electricadvantage.blank_circuit_board.name=Scheda di Circuito (Vuoto) -item.electricadvantage.control_circuit.name=Circuito di Controllo -item.electricadvantage.integrated_circuit.name=Microcircuito Integrato -item.electricadvantage.psu.name=Alimentatore -item.electricadvantage.silicon_ingot.name=Silicio Lingotto -item.electricadvantage.silicon_mix.name=Silicio Miscela -item.electricadvantage.solder_mix.name=Saldatura Miscela -item.electricadvantage.solder.name=Saldatura -item.electricadvantage.li_powder.name=Polvere di Litio -item.electricadvantage.li_ingot.name=Litio Lingotto -item.electricadvantage.li_nugget.name=Pepita d'Litio -item.electricadvantage.sulfur_powder.name=Zolfo in Polvere -item.electricadvantage.lead_acid_battery.name=Batteria al Piombo -item.electricadvantage.nickel_hydride_battery.name=Ni-MH batteria -item.electricadvantage.alkaline_battery.name=Batteria Alcalina -item.electricadvantage.lithium_battery.name=Agli Ioni di Litio - -tile.electricadvantage.electric_conduit.name=Cavo Alettrico di Alimentazione -tile.electricadvantage.electric_track.name=Ponteggio Elettrico -tile.electricadvantage.electric_battery_array.name=Array Batteria -tile.electricadvantage.electric_crusher.name=Polverizzatore Masso a Elettrico Alimentata -tile.electricadvantage.laser_turret.name=Laser Difesa Torretta -tile.electricadvantage.electric_drill.name=Trapano Elettrico -tile.electricadvantage.electric_fabricator.name=Fabbrica Automatizzata -tile.electricadvantage.electric_furnace.name=Forno Elettrico ad Arco -tile.electricadvantage.electric_oven.name=Forno Elettrico -tile.electricadvantage.electric_pcb_printer.name=PCB Stampante -tile.electricadvantage.geothermal_generator.name=Geotermica Generatore -tile.electricadvantage.hydroelectric_generator.name=idroelettrica Generatore -tile.electricadvantage.photovoltaic_generator.name=Fotovoltaico Generatore -tile.electricadvantage.steam_powered_generator.name=Generatore Elettrico a Vapore -tile.electricadvantage.growth_chamber.name=Camera di Crescita -tile.electricadvantage.growth_chamber_controller.name=Controllore Camera di Crescita -tile.electricadvantage.li_ore.name=Minerale di litio -tile.electricadvantage.sulfur_ore.name=Minerale di Zolfo -tile.electricadvantage.led_bar.name=Luce a led - -tooltip.battery.charge=Carica -tooltip.battery.capacity=Capacità - -death.attack.laser=%1$s vaporizzato -death.attack.laser.player=%2$s vaporizzati %1$s -death.attack.propeller=%1$s è stato polverizzato da un'elica. -death.attack.propeller.player=%2$s spinti %1$s nelle eliche. - -tile.electricadvantage.electric_switch.name=Interruttore Elettrico -tile.electricadvantage.electric_still.name=Distillatore Elettrico -tile.electricadvantage.electric_pump.name=Pompa Elettricaa -tile.electricadvantage.plastic_refinery.name=Raffineria Plastica -item.electricadvantage.petrolplastic_ingot.name=Petrolio Plastica Lingotto -tile.electricadvantage.pump_pipe_electric.name=Tubo Pompa diff --git a/src/main/resources/assets/electricadvantage/lang/ja_JP.lang b/src/main/resources/assets/electricadvantage/lang/ja_JP.lang deleted file mode 100644 index e7b4f33..0000000 --- a/src/main/resources/assets/electricadvantage/lang/ja_JP.lang +++ /dev/null @@ -1,54 +0,0 @@ -language_support_goals = 英語 (en_US en_EN en_CA、en_GB, en_AU, en_PT), スペイン語 (es_MX、es_ES)、中国 (zh_CN)、日本語 (ja_JA)、ポルトガル (pt_BR)、ドイツ語 (de_DE)、イタリア語 (it_IT), 韓国語 (ko_KR) - -item.electricadvantage.blank_circuit_board.name=回路基板 (空の) -item.electricadvantage.control_circuit.name=コンピューター回路 -item.electricadvantage.integrated_circuit.name=マイクロチップ -item.electricadvantage.psu.name=電源ユニット -item.electricadvantage.silicon_ingot.name=シリコン -item.electricadvantage.silicon_mix.name=シリコンレシピ -item.electricadvantage.solder_mix.name=はんだレシピ -item.electricadvantage.solder.name=はんだ -item.electricadvantage.li_powder.name=リチウム粉末 -item.electricadvantage.li_ingot.name=リチウム金属 -item.electricadvantage.li_nugget.name=リチウムナゲット -item.electricadvantage.sulfur_powder.name=硫黄粉末 -item.electricadvantage.lead_acid_battery.name=鉛蓄電池 -item.electricadvantage.nickel_hydride_battery.name=ニッケル水素バッテリー -item.electricadvantage.alkaline_battery.name=アルカリ電池 -item.electricadvantage.lithium_battery.name=リチウムイオン電池 - -tile.electricadvantage.electric_conduit.name=電線 -tile.electricadvantage.electric_track.name=電動足場 -tile.electricadvantage.electric_battery_array.name=電池貯蔵 -tile.electricadvantage.electric_crusher.name=電気岩クラッシャー -tile.electricadvantage.laser_turret.name=レーザー砲塔 -tile.electricadvantage.electric_drill.name=電気ドリル -tile.electricadvantage.electric_fabricator.name=ロボット工場 -tile.electricadvantage.electric_furnace.name=電気炉 -tile.electricadvantage.electric_oven.name=電気オーブン -tile.electricadvantage.electric_pcb_printer.name=回路基板プリンター -tile.electricadvantage.geothermal_generator.name=地熱発電 -tile.electricadvantage.hydroelectric_generator.name=水力発電機 -tile.electricadvantage.photovoltaic_generator.name=太陽電池パネル -tile.electricadvantage.steam_powered_generator.name=蒸気駆動の発電機 -tile.electricadvantage.growth_chamber.name=植物生長室 -tile.electricadvantage.growth_chamber_controller.name=植物成長室コントローラ -tile.electricadvantage.li_ore.name=リチウム 鉱石 -tile.electricadvantage.sulfur_ore.name=硫黄鉱石 -tile.electricadvantage.led_bar.name=LEDライト - -tooltip.battery.charge=量 -tooltip.battery.capacity=合計金額 - -death.attack.laser=%1$s気化 -蒸発 death.attack.laser.player=%2$sは%1$sを気化しました -death.attack.propeller=プロペラ殺さ%1$s -death.attack.propeller.player=%2$sはプロペラと%1$sを殺しました - - -tile.electricadvantage.electric_switch.name=電気スイッチ -tile.electricadvantage.electric_still.name=電気蒸留器 -tile.electricadvantage.electric_pump.name=電気ポンプ -tile.electricadvantage.plastic_refinery.name=プラスチック製油所 -item.electricadvantage.petrolplastic_ingot.name=石油系プラスチックインゴット -tile.electricadvantage.pump_pipe_electric.name=ポンプ配管 diff --git a/src/main/resources/assets/electricadvantage/lang/ko_KO.lang b/src/main/resources/assets/electricadvantage/lang/ko_KO.lang deleted file mode 100644 index f5dcd3f..0000000 --- a/src/main/resources/assets/electricadvantage/lang/ko_KO.lang +++ /dev/null @@ -1,52 +0,0 @@ -item.electricadvantage.blank_circuit_board.name=회로 기판 (빈) -item.electricadvantage.control_circuit.name=제어 회로 -item.electricadvantage.integrated_circuit.name=마이크로 칩 -item.electricadvantage.psu.name=전원 공급 장치 -item.electricadvantage.silicon_ingot.name=실리콘 잉곳 -item.electricadvantage.silicon_mix.name=실리콘 혼합 -item.electricadvantage.solder_mix.name=솔더 혼합 -item.electricadvantage.solder.name=솔더 -item.electricadvantage.li_powder.name=분말 리튬 -item.electricadvantage.li_ingot.name=리튬 잉곳 -item.electricadvantage.li_nugget.name=리튬 너겟 -item.electricadvantage.sulfur_powder.name=분말 유황 -item.electricadvantage.lead_acid_battery.name=납 축전지 -item.electricadvantage.nickel_hydride_battery.name=니켈 수소 배터리 -item.electricadvantage.alkaline_battery.name=알카라인 배터리 -item.electricadvantage.lithium_battery.name=리튬 이온 배터리 - -tile.electricadvantage.electric_conduit.name=전력 케이블 -tile.electricadvantage.electric_track.name=전기 비계 -tile.electricadvantage.electric_battery_array.name=전지 어레이 -tile.electricadvantage.electric_crusher.name=전기 락 크러셔 -tile.electricadvantage.laser_turret.name=레이저 방어 터렛 -tile.electricadvantage.electric_drill.name=전기 마이닝 드릴 -tile.electricadvantage.electric_fabricator.name=자동 어셈블러 -tile.electricadvantage.electric_furnace.name=전기로 -tile.electricadvantage.electric_oven.name=전기 오븐 -tile.electricadvantage.electric_pcb_printer.name=회로 기판 프린터 -tile.electricadvantage.geothermal_generator.name=지열 발전기 -tile.electricadvantage.hydroelectric_generator.name=수력 발전기 -tile.electricadvantage.photovoltaic_generator.name=태양 광 발전기 -tile.electricadvantage.steam_powered_generator.name=증기 발전기 -tile.electricadvantage.growth_chamber.name=성장 상공 회의소 -tile.electricadvantage.growth_chamber_controller.name=성장 챔버 제어 장치 -tile.electricadvantage.li_ore.name=리튬 광석 -tile.electricadvantage.sulfur_ore.name=유황 광석 -tile.electricadvantage.led_bar.name=LED 조명 - -tooltip.battery.charge=요금 -tooltip.battery.capacity=생산 능력 - -death.attack.laser=%1$s이 (가) 증발 -death.attack.laser.player=%2$s의 증발 %1$s -death.attack.propeller=%1$s는 프로펠러에 의해 분쇄 하였다. -death.attack.propeller.player=%2$s는 프로펠러에 %1$s을 (를) 밀었다. - - -tile.electricadvantage.electric_switch.name=전기 스위치 -tile.electricadvantage.electric_still.name=전기 증류기 -tile.electricadvantage.electric_pump.name=전기 펌프 -tile.electricadvantage.plastic_refinery.name=플라스틱 정유 -item.electricadvantage.petrolplastic_ingot.name=석유 수지 잉곳 -tile.electricadvantage.pump_pipe_electric.name=펌프 파이프 diff --git a/src/main/resources/assets/electricadvantage/lang/pt_BR.lang b/src/main/resources/assets/electricadvantage/lang/pt_BR.lang deleted file mode 100644 index 8bd8c91..0000000 --- a/src/main/resources/assets/electricadvantage/lang/pt_BR.lang +++ /dev/null @@ -1,54 +0,0 @@ -language_support_goals=inglês (en_US, en_EN, en_CA, en_GB, en_AU, en_PT), espanhol (es_MX, es_ES), chinês (zh_CN), japonês (ja_JA), Português (pt_BR), alemão (de_DE), italiano (it_IT), coreano (ko_KR) - -item.electricadvantage.blank_circuit_board.name=Placa de Circuito (Vago) -item.electricadvantage.control_circuit.name=Circuito de Controle -item.electricadvantage.integrated_circuit.name=Circuito Integrado -item.electricadvantage.psu.name=Unidade de Alimentação -item.electricadvantage.silicon_ingot.name=Silício Lingote -item.electricadvantage.silicon_mix.name=Mistura de Silício -item.electricadvantage.solder_mix.name=Mistura de Solda -item.electricadvantage.solder.name=Solda -item.electricadvantage.li_powder.name=Pó de Lítio -item.electricadvantage.li_ingot.name=Lítio Lingote -item.electricadvantage.li_nugget.name=Pepita de Lítio -item.electricadvantage.sulfur_powder.name=Enxofre em Pó -item.electricadvantage.lead_acid_battery.name=Bateria de Chumbo Ácido -item.electricadvantage.nickel_hydride_battery.name=Bateria Níquel-Hidreto Metálico -item.electricadvantage.alkaline_battery.name=Bateria Alcalina -item.electricadvantage.lithium_battery.name=Bateria de Lítio - -tile.electricadvantage.electric_conduit.name=Fio Elétrico -tile.electricadvantage.electric_track.name=Elétrica Andaime -tile.electricadvantage.electric_battery_array.name=Armazenamento da Bateria -tile.electricadvantage.electric_crusher.name=Triturador de Rocha Elétrica -tile.electricadvantage.laser_turret.name=Torre de Arma a Laser -tile.electricadvantage.electric_drill.name=Broca Mineração Elétrica -tile.electricadvantage.electric_fabricator.name=Fábrica Automatizada -tile.electricadvantage.electric_furnace.name=Forno Elétrico a Arco -tile.electricadvantage.electric_oven.name=Forno Elétrico -tile.electricadvantage.electric_pcb_printer.name=Impressora Circuito -tile.electricadvantage.geothermal_generator.name=Gerador de Elétrico Geotérmica -tile.electricadvantage.hydroelectric_generator.name=Gerador Hidrelétrico -tile.electricadvantage.photovoltaic_generator.name=Painel Solar -tile.electricadvantage.steam_powered_generator.name=a Vapor Gerador Elétrico -tile.electricadvantage.growth_chamber.name=Câmara de Crescimento -tile.electricadvantage.growth_chamber_controller.name=Unidade de Controle de Crescimento Câmara -tile.electricadvantage.li_ore.name=Minério de Lítio -tile.electricadvantage.sulfur_ore.name=Minério de Enxofre -tile.electricadvantage.led_bar.name=Luz LED - -tooltip.battery.charge=Carga -tooltip.battery.capacity=Capacidade - -death.attack.laser=%1$S vaporizado -death.attack.laser.player=%2$s vaporizados %1$s -death.attack.propeller=%1$s foi pulverizado por uma hélice. -death.attack.propeller.player=%2$s empurrou %1$s em uma hélice. - - -tile.electricadvantage.electric_switch.name=Chave Elétrica -tile.electricadvantage.electric_still.name=Destilador Elétrico -tile.electricadvantage.electric_pump.name=Bomba Elétrica -tile.electricadvantage.plastic_refinery.name=Refinaria de Plástico -item.electricadvantage.petrolplastic_ingot.name=Petróleo Plástico Lingote -tile.electricadvantage.pump_pipe_electric.name=Tubo de Bomba diff --git a/src/main/resources/assets/electricadvantage/lang/zh_CN.lang b/src/main/resources/assets/electricadvantage/lang/zh_CN.lang deleted file mode 100644 index 55971ff..0000000 --- a/src/main/resources/assets/electricadvantage/lang/zh_CN.lang +++ /dev/null @@ -1,55 +0,0 @@ -language_support_goals=英语（EN_US，的en_EN，en_CA，EN_GB，en_AU，en_PT），西班牙语（es_MX，es_ES），中国（zh_CN的），日本（ja_JA），葡萄牙语（PT_BR），德语（de_DE这个），意大利语（it_IT），韩国（ko_KR） - -item.electricadvantage.blank_circuit_board.name=电路板（空白） -item.electricadvantage.control_circuit.name=控制电路 -item.electricadvantage.integrated_circuit.name=微芯片 -item.electricadvantage.psu.name=电源单元 -item.electricadvantage.silicon_ingot.name=硅锭 -item.electricadvantage.silicon_mix.name=硅混合 -item.electricadvantage.solder_mix.name=焊接混合 -item.electricadvantage.solder.name=焊料 -item.electricadvantage.li_powder.name=粉状锂 -item.electricadvantage.li_ingot.name=锂锭 -item.electricadvantage.li_nugget.name=锂掘金 -item.electricadvantage.sulfur_powder.name=硫粉 -item.electricadvantage.lead_acid_battery.name=铅酸蓄电池 -item.electricadvantage.nickel_hydride_battery.name=镍氢电池 -item.electricadvantage.alkaline_battery.name=碱性电池 -item.electricadvantage.lithium_battery.name=锂离子电池 - -tile.electricadvantage.electric_conduit.name=电力电缆 -tile.electricadvantage.electric_track.name=电动脚手架 -tile.electricadvantage.electric_battery_array.name=电池阵列 -tile.electricadvantage.electric_crusher.name=电碎石机 -tile.electricadvantage.laser_turret.name=激光防御炮塔 -tile.electricadvantage.electric_drill.name=电矿钻 -tile.electricadvantage.electric_fabricator.name=自动汇编 -tile.electricadvantage.electric_furnace.name=电弧炉 -tile.electricadvantage.electric_oven.name=电烤箱 -tile.electricadvantage.electric_pcb_printer.name= 电路板打印机 -tile.electricadvantage.geothermal_generator.name=热发电机 -tile.electricadvantage.hydroelectric_generator.name=水轮发电机 -tile.electricadvantage.photovoltaic_generator.name=光电发生器 -tile.electricadvantage.steam_powered_generator.name=蒸汽为动力的电动发电机 -tile.electricadvantage.growth_chamber.name=生长箱 -tile.electricadvantage.growth_chamber_controller.name=生长箱控制单元 -tile.electricadvantage.li_ore.name=锂矿 -tile.electricadvantage.sulfur_ore.name=硫矿石 -tile.electricadvantage.led_bar.name=LED燈 - -tooltip.battery.charge=充电 -tooltip.battery.capacity=容量 - -death.attack.laser=％1$s蒸发 -death.attack.laser.player=％2$s汽化％1$s -death.attack.propeller=％1$s被粉碎螺旋桨。 -death.attack.propeller.player=％2$s推％1$s转换为螺旋桨。 - - -tile.electricadvantage.electric_switch.name=電器開關 -tile.electricadvantage.electric_still.name=電熱蒸餾水 -tile.electricadvantage.electric_pump.name=電動泵 -tile.electricadvantage.plastic_refinery.name=塑料煉油廠 -item.electricadvantage.petrolplastic_ingot.name=石油膠錠 -tile.electricadvantage.pump_pipe_electric.name=泵管 - diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_battery_array.json b/src/main/resources/assets/electricadvantage/models/block/electric_battery_array.json deleted file mode 100644 index 3d42d60..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_battery_array.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_battery_array", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_0.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_0.json deleted file mode 100644 index 35ae031..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_0.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_ensw", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_densuw.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_densuw.json deleted file mode 100644 index 6e81d07..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_densuw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_densuw", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_desuw.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_desuw.json deleted file mode 100644 index 5926a15..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_desuw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_desuw", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_dnu.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_dnu.json deleted file mode 100644 index b8c0078..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_dnu.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_dnu", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_ensw.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_ensw.json deleted file mode 100644 index 35ae031..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_ensw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_ensw", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_n.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_n.json deleted file mode 100644 index 01b0692..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_n.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_n", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_ns.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_ns.json deleted file mode 100644 index bc70545..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_ns.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_ns", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nsuw.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nsuw.json deleted file mode 100644 index 08913ad..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nsuw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_nsuw", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nsw.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nsw.json deleted file mode 100644 index 83e661f..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nsw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_nsw", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nuw.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nuw.json deleted file mode 100644 index 37e7296..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nuw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_nuw", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nw.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nw.json deleted file mode 100644 index bbdc488..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_nw", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_crusher_off.json b/src/main/resources/assets/electricadvantage/models/block/electric_crusher_off.json deleted file mode 100644 index 48e1794..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_crusher_off.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_crusher_off", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_crusher_on.json b/src/main/resources/assets/electricadvantage/models/block/electric_crusher_on.json deleted file mode 100644 index 971881c..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_crusher_on.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_crusher_on", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_crusher_powered.json b/src/main/resources/assets/electricadvantage/models/block/electric_crusher_powered.json deleted file mode 100644 index dab4d02..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_crusher_powered.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_crusher_powered", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_drill_off.json b/src/main/resources/assets/electricadvantage/models/block/electric_drill_off.json deleted file mode 100644 index 93365be..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_drill_off.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_drill_base", - "textures": { - "top": "electricadvantage:blocks/electric_drill_off", - "bottom": "electricadvantage:blocks/laser_drill_optic" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_drill_on.json b/src/main/resources/assets/electricadvantage/models/block/electric_drill_on.json deleted file mode 100644 index f227a8e..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_drill_on.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_drill_base", - "textures": { - "top": "electricadvantage:blocks/electric_drill_on", - "bottom": "electricadvantage:blocks/laser_drill_optic_on" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_fabricator_off.json b/src/main/resources/assets/electricadvantage/models/block/electric_fabricator_off.json deleted file mode 100644 index 18ea194..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_fabricator_off.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_fabricator_off", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_fabricator_on.json b/src/main/resources/assets/electricadvantage/models/block/electric_fabricator_on.json deleted file mode 100644 index a078546..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_fabricator_on.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_fabricator_on", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_fabricator_powered.json b/src/main/resources/assets/electricadvantage/models/block/electric_fabricator_powered.json deleted file mode 100644 index 2d36d3f..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_fabricator_powered.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_fabricator_powered", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_furnace_off.json b/src/main/resources/assets/electricadvantage/models/block/electric_furnace_off.json deleted file mode 100644 index 1572af5..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_furnace_off.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_furnace_off", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_furnace_on.json b/src/main/resources/assets/electricadvantage/models/block/electric_furnace_on.json deleted file mode 100644 index 7566f40..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_furnace_on.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_furnace_on", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_furnace_powered.json b/src/main/resources/assets/electricadvantage/models/block/electric_furnace_powered.json deleted file mode 100644 index 6f2da39..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_furnace_powered.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_furnace_powered", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_oven_off.json b/src/main/resources/assets/electricadvantage/models/block/electric_oven_off.json deleted file mode 100644 index 6bcc5ca..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_oven_off.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_oven_off", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_oven_on.json b/src/main/resources/assets/electricadvantage/models/block/electric_oven_on.json deleted file mode 100644 index 5ecce52..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_oven_on.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_oven_on", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_oven_powered.json b/src/main/resources/assets/electricadvantage/models/block/electric_oven_powered.json deleted file mode 100644 index 3ca23f9..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_oven_powered.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_oven_powered", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_off.json b/src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_off.json deleted file mode 100644 index 2255595..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_off.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_pcb_printer_off", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_on.json b/src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_on.json deleted file mode 100644 index f150a30..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_on.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_pcb_printer_on", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_powered.json b/src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_powered.json deleted file mode 100644 index c9c2cee..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_powered.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_pcb_printer_powered", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_pump_off.json b/src/main/resources/assets/electricadvantage/models/block/electric_pump_off.json deleted file mode 100644 index 6606e1d..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_pump_off.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_pump_off", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_pump_on.json b/src/main/resources/assets/electricadvantage/models/block/electric_pump_on.json deleted file mode 100644 index 0333dc1..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_pump_on.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_pump_on", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_pump_powered.json b/src/main/resources/assets/electricadvantage/models/block/electric_pump_powered.json deleted file mode 100644 index 0333dc1..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_pump_powered.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_pump_on", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_still_off.json b/src/main/resources/assets/electricadvantage/models/block/electric_still_off.json deleted file mode 100644 index 4c86573..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_still_off.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_still_off", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_still_on.json b/src/main/resources/assets/electricadvantage/models/block/electric_still_on.json deleted file mode 100644 index 99e5d84..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_still_on.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_still_on", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_still_powered.json b/src/main/resources/assets/electricadvantage/models/block/electric_still_powered.json deleted file mode 100644 index 87b8ee9..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_still_powered.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_still_powered", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_switch_off.json b/src/main/resources/assets/electricadvantage/models/block/electric_switch_off.json deleted file mode 100644 index 4b89d53..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_switch_off.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "electricadvantage:blocks/electric_switch_off", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_switch_on.json b/src/main/resources/assets/electricadvantage/models/block/electric_switch_on.json deleted file mode 100644 index b9d3e78..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_switch_on.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "electricadvantage:blocks/electric_switch_on", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/geothermal_generator.json b/src/main/resources/assets/electricadvantage/models/block/geothermal_generator.json deleted file mode 100644 index 41b8d6a..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/geothermal_generator.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/geothermal_generator_side", - "top": "electricadvantage:blocks/geothermal_generator_top", - "bottom":"electricadvantage:blocks/geothermal_generator_side", - "back": "electricadvantage:blocks/geothermal_generator_side", - "side": "electricadvantage:blocks/geothermal_generator_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/growth_chamber_controller.json b/src/main/resources/assets/electricadvantage/models/block/growth_chamber_controller.json deleted file mode 100644 index 13691ac..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/growth_chamber_controller.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/growth_chamber_controller", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/growth_chamber_off.json b/src/main/resources/assets/electricadvantage/models/block/growth_chamber_off.json deleted file mode 100644 index 7e5904d..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/growth_chamber_off.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/growth_chamber_off", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/growth_chamber_on.json b/src/main/resources/assets/electricadvantage/models/block/growth_chamber_on.json deleted file mode 100644 index 3b16e96..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/growth_chamber_on.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/growth_chamber_on", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/growth_chamber_powered.json b/src/main/resources/assets/electricadvantage/models/block/growth_chamber_powered.json deleted file mode 100644 index 35f67d0..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/growth_chamber_powered.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/growth_chamber_powered", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/hydroelectric_generator_off.json b/src/main/resources/assets/electricadvantage/models/block/hydroelectric_generator_off.json deleted file mode 100644 index bf38aa2..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/hydroelectric_generator_off.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/machine_side", - "top": "electricadvantage:blocks/hydroelectric_generator_off", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_side", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/hydroelectric_generator_on.json b/src/main/resources/assets/electricadvantage/models/block/hydroelectric_generator_on.json deleted file mode 100644 index 269e7c0..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/hydroelectric_generator_on.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/machine_side", - "top": "electricadvantage:blocks/hydroelectric_generator_on", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_side", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/led_bar_off_densuw.json b/src/main/resources/assets/electricadvantage/models/block/led_bar_off_densuw.json deleted file mode 100644 index 23466fc..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/led_bar_off_densuw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_densuw", - "textures": { - "texture": "electricadvantage:blocks/led_bar_off", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/led_bar_off_desuw.json b/src/main/resources/assets/electricadvantage/models/block/led_bar_off_desuw.json deleted file mode 100644 index 2efead2..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/led_bar_off_desuw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_desuw", - "textures": { - "texture": "electricadvantage:blocks/led_bar_off", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/led_bar_off_dnu.json b/src/main/resources/assets/electricadvantage/models/block/led_bar_off_dnu.json deleted file mode 100644 index 868a5e8..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/led_bar_off_dnu.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_dnu", - "textures": { - "texture": "electricadvantage:blocks/led_bar_off", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/led_bar_off_ensw.json b/src/main/resources/assets/electricadvantage/models/block/led_bar_off_ensw.json deleted file mode 100644 index c674481..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/led_bar_off_ensw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_ensw", - "textures": { - "texture": "electricadvantage:blocks/led_bar_off", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/led_bar_off_n.json b/src/main/resources/assets/electricadvantage/models/block/led_bar_off_n.json deleted file mode 100644 index 0fc830e..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/led_bar_off_n.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_n", - "textures": { - "texture": "electricadvantage:blocks/led_bar_off", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/led_bar_off_ns.json b/src/main/resources/assets/electricadvantage/models/block/led_bar_off_ns.json deleted file mode 100644 index ca52052..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/led_bar_off_ns.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_ns", - "textures": { - "texture": "electricadvantage:blocks/led_bar_off", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/led_bar_off_nsuw.json b/src/main/resources/assets/electricadvantage/models/block/led_bar_off_nsuw.json deleted file mode 100644 index 64a25d2..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/led_bar_off_nsuw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_nsuw", - "textures": { - "texture": "electricadvantage:blocks/led_bar_off", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/led_bar_off_nsw.json b/src/main/resources/assets/electricadvantage/models/block/led_bar_off_nsw.json deleted file mode 100644 index 5a29b9a..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/led_bar_off_nsw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_nsw", - "textures": { - "texture": "electricadvantage:blocks/led_bar_off", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/led_bar_off_nuw.json b/src/main/resources/assets/electricadvantage/models/block/led_bar_off_nuw.json deleted file mode 100644 index 04d5256..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/led_bar_off_nuw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_nuw", - "textures": { - "texture": "electricadvantage:blocks/led_bar_off", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/led_bar_off_nw.json b/src/main/resources/assets/electricadvantage/models/block/led_bar_off_nw.json deleted file mode 100644 index b3fe21a..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/led_bar_off_nw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_nw", - "textures": { - "texture": "electricadvantage:blocks/led_bar_off", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/led_bar_on_densuw.json b/src/main/resources/assets/electricadvantage/models/block/led_bar_on_densuw.json deleted file mode 100644 index 3741344..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/led_bar_on_densuw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_densuw", - "textures": { - "texture": "electricadvantage:blocks/led_bar_on", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/led_bar_on_desuw.json b/src/main/resources/assets/electricadvantage/models/block/led_bar_on_desuw.json deleted file mode 100644 index a164317..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/led_bar_on_desuw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_desuw", - "textures": { - "texture": "electricadvantage:blocks/led_bar_on", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/led_bar_on_dnu.json b/src/main/resources/assets/electricadvantage/models/block/led_bar_on_dnu.json deleted file mode 100644 index 0315246..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/led_bar_on_dnu.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_dnu", - "textures": { - "texture": "electricadvantage:blocks/led_bar_on", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/led_bar_on_ensw.json b/src/main/resources/assets/electricadvantage/models/block/led_bar_on_ensw.json deleted file mode 100644 index 3bb9645..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/led_bar_on_ensw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_ensw", - "textures": { - "texture": "electricadvantage:blocks/led_bar_on", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/led_bar_on_n.json b/src/main/resources/assets/electricadvantage/models/block/led_bar_on_n.json deleted file mode 100644 index ca1a495..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/led_bar_on_n.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_n", - "textures": { - "texture": "electricadvantage:blocks/led_bar_on", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/led_bar_on_ns.json b/src/main/resources/assets/electricadvantage/models/block/led_bar_on_ns.json deleted file mode 100644 index f27e494..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/led_bar_on_ns.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_ns", - "textures": { - "texture": "electricadvantage:blocks/led_bar_on", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/led_bar_on_nsuw.json b/src/main/resources/assets/electricadvantage/models/block/led_bar_on_nsuw.json deleted file mode 100644 index 456571a..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/led_bar_on_nsuw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_nsuw", - "textures": { - "texture": "electricadvantage:blocks/led_bar_on", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/led_bar_on_nsw.json b/src/main/resources/assets/electricadvantage/models/block/led_bar_on_nsw.json deleted file mode 100644 index c1852e7..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/led_bar_on_nsw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_nsw", - "textures": { - "texture": "electricadvantage:blocks/led_bar_on", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/led_bar_on_nuw.json b/src/main/resources/assets/electricadvantage/models/block/led_bar_on_nuw.json deleted file mode 100644 index c675f66..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/led_bar_on_nuw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_nuw", - "textures": { - "texture": "electricadvantage:blocks/led_bar_on", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/led_bar_on_nw.json b/src/main/resources/assets/electricadvantage/models/block/led_bar_on_nw.json deleted file mode 100644 index 4ee7788..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/led_bar_on_nw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_nw", - "textures": { - "texture": "electricadvantage:blocks/led_bar_on", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/plastic_refinery_off.json b/src/main/resources/assets/electricadvantage/models/block/plastic_refinery_off.json deleted file mode 100644 index bc1b3c1..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/plastic_refinery_off.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/plastic_refinery_off", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/plastic_refinery_on.json b/src/main/resources/assets/electricadvantage/models/block/plastic_refinery_on.json deleted file mode 100644 index b4897bb..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/plastic_refinery_on.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/plastic_refinery_on", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/plastic_refinery_powered.json b/src/main/resources/assets/electricadvantage/models/block/plastic_refinery_powered.json deleted file mode 100644 index b4897bb..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/plastic_refinery_powered.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/plastic_refinery_on", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/steam_powered_generator_off.json b/src/main/resources/assets/electricadvantage/models/block/steam_powered_generator_off.json deleted file mode 100644 index ce03184..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/steam_powered_generator_off.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/steam_powered_generator_off", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/models/block/steam_powered_generator_on.json b/src/main/resources/assets/electricadvantage/models/block/steam_powered_generator_on.json deleted file mode 100644 index 2526493..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/steam_powered_generator_on.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/steam_powered_generator_on", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/models/item/alkaline_battery.json b/src/main/resources/assets/electricadvantage/models/item/alkaline_battery.json deleted file mode 100644 index 2ca2a33..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/alkaline_battery.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/battery_base", - "textures": { - "item_texture": "electricadvantage:items/alkaline_battery" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/item/blank_circuit_board.json b/src/main/resources/assets/electricadvantage/models/item/blank_circuit_board.json deleted file mode 100644 index 0430ee0..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/blank_circuit_board.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "item_texture": "electricadvantage:items/blank_circuit_board" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/item/control_circuit.json b/src/main/resources/assets/electricadvantage/models/item/control_circuit.json deleted file mode 100644 index 94fcb2e..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/control_circuit.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "item_texture": "electricadvantage:items/control_circuit" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/item/electric_battery_array.json b/src/main/resources/assets/electricadvantage/models/item/electric_battery_array.json deleted file mode 100644 index 3e46e60..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/electric_battery_array.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_battery_array", - "ambientocclusion": false -} diff --git a/src/main/resources/assets/electricadvantage/models/item/electric_conduit.json b/src/main/resources/assets/electricadvantage/models/item/electric_conduit.json deleted file mode 100644 index 243426d..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/electric_conduit.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_conduit_ns", - "ambientocclusion": false -} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/models/item/electric_crusher.json b/src/main/resources/assets/electricadvantage/models/item/electric_crusher.json deleted file mode 100644 index 41351ba..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/electric_crusher.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_crusher_off", - "ambientocclusion": false -} diff --git a/src/main/resources/assets/electricadvantage/models/item/electric_drill.json b/src/main/resources/assets/electricadvantage/models/item/electric_drill.json deleted file mode 100644 index a48c97e..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/electric_drill.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_drill_off", - "ambientocclusion": false -} diff --git a/src/main/resources/assets/electricadvantage/models/item/electric_fabricator.json b/src/main/resources/assets/electricadvantage/models/item/electric_fabricator.json deleted file mode 100644 index 913a9ee..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/electric_fabricator.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_fabricator_off", - "ambientocclusion": false -} diff --git a/src/main/resources/assets/electricadvantage/models/item/electric_furnace.json b/src/main/resources/assets/electricadvantage/models/item/electric_furnace.json deleted file mode 100644 index cb4a82d..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/electric_furnace.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_furnace_off", - "ambientocclusion": false -} diff --git a/src/main/resources/assets/electricadvantage/models/item/electric_oven.json b/src/main/resources/assets/electricadvantage/models/item/electric_oven.json deleted file mode 100644 index e8b3e68..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/electric_oven.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_oven_off", - "ambientocclusion": false -} diff --git a/src/main/resources/assets/electricadvantage/models/item/electric_pcb_printer.json b/src/main/resources/assets/electricadvantage/models/item/electric_pcb_printer.json deleted file mode 100644 index 255a5a3..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/electric_pcb_printer.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_pcb_printer_off", - "ambientocclusion": false -} diff --git a/src/main/resources/assets/electricadvantage/models/item/electric_pump.json b/src/main/resources/assets/electricadvantage/models/item/electric_pump.json deleted file mode 100644 index 877dff1..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/electric_pump.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_pump_off", - "ambientocclusion": false -} diff --git a/src/main/resources/assets/electricadvantage/models/item/electric_still.json b/src/main/resources/assets/electricadvantage/models/item/electric_still.json deleted file mode 100644 index 3e6cabb..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/electric_still.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_still_off", - "ambientocclusion": false -} diff --git a/src/main/resources/assets/electricadvantage/models/item/electric_switch.json b/src/main/resources/assets/electricadvantage/models/item/electric_switch.json deleted file mode 100644 index 5df1b13..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/electric_switch.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_switch_on" -} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/models/item/electric_track.json b/src/main/resources/assets/electricadvantage/models/item/electric_track.json deleted file mode 100644 index 01a8d92..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/electric_track.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_track_ns", - "ambientocclusion": false -} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/models/item/geothermal_generator.json b/src/main/resources/assets/electricadvantage/models/item/geothermal_generator.json deleted file mode 100644 index e27ebe5..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/geothermal_generator.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "electricadvantage:block/geothermal_generator", - "ambientocclusion": false -} diff --git a/src/main/resources/assets/electricadvantage/models/item/growth_chamber.json b/src/main/resources/assets/electricadvantage/models/item/growth_chamber.json deleted file mode 100644 index 75f2dba..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/growth_chamber.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "electricadvantage:block/growth_chamber_off", - "ambientocclusion": false -} diff --git a/src/main/resources/assets/electricadvantage/models/item/growth_chamber_controller.json b/src/main/resources/assets/electricadvantage/models/item/growth_chamber_controller.json deleted file mode 100644 index 2b80c53..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/growth_chamber_controller.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "electricadvantage:block/growth_chamber_controller", - "ambientocclusion": false -} diff --git a/src/main/resources/assets/electricadvantage/models/item/hydroelectric_generator.json b/src/main/resources/assets/electricadvantage/models/item/hydroelectric_generator.json deleted file mode 100644 index a11f925..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/hydroelectric_generator.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "electricadvantage:block/hydroelectric_generator_off", - "ambientocclusion": false -} diff --git a/src/main/resources/assets/electricadvantage/models/item/integrated_circuit.json b/src/main/resources/assets/electricadvantage/models/item/integrated_circuit.json deleted file mode 100644 index a4e715d..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/integrated_circuit.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "item_texture": "electricadvantage:items/integrated_circuit" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/item/lead_acid_battery.json b/src/main/resources/assets/electricadvantage/models/item/lead_acid_battery.json deleted file mode 100644 index 56a40fa..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/lead_acid_battery.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/battery_base", - "textures": { - "item_texture": "electricadvantage:items/lead_acid_battery" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/item/led_bar.json b/src/main/resources/assets/electricadvantage/models/item/led_bar.json deleted file mode 100644 index 3510d12..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/led_bar.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "electricadvantage:block/led_bar_on_ns", - "ambientocclusion": false -} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/models/item/li_ingot.json b/src/main/resources/assets/electricadvantage/models/item/li_ingot.json deleted file mode 100644 index b2dbe13..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/li_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "item_texture": "electricadvantage:items/li_ingot" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/item/li_nugget.json b/src/main/resources/assets/electricadvantage/models/item/li_nugget.json deleted file mode 100644 index 3d523aa..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/li_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "item_texture": "electricadvantage:items/li_nugget" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/item/li_ore.json b/src/main/resources/assets/electricadvantage/models/item/li_ore.json deleted file mode 100644 index 7350804..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/li_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "electricadvantage:block/li_ore" -} diff --git a/src/main/resources/assets/electricadvantage/models/item/li_powder.json b/src/main/resources/assets/electricadvantage/models/item/li_powder.json deleted file mode 100644 index 6d317b1..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/li_powder.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "item_texture": "electricadvantage:items/li_powder" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/item/lithium_battery.json b/src/main/resources/assets/electricadvantage/models/item/lithium_battery.json deleted file mode 100644 index 212f62d..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/lithium_battery.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/battery_base", - "textures": { - "item_texture": "electricadvantage:items/lithium_battery" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/item/nickel_hydride_battery.json b/src/main/resources/assets/electricadvantage/models/item/nickel_hydride_battery.json deleted file mode 100644 index 2afdd5a..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/nickel_hydride_battery.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/battery_base", - "textures": { - "item_texture": "electricadvantage:items/nickel_hydride_battery" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/item/petrolplastic_ingot.json b/src/main/resources/assets/electricadvantage/models/item/petrolplastic_ingot.json deleted file mode 100644 index 1738947..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/petrolplastic_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "item_texture": "electricadvantage:items/petrolplastic_ingot" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/models/item/photovoltaic_generator.json b/src/main/resources/assets/electricadvantage/models/item/photovoltaic_generator.json deleted file mode 100644 index 6f610fa..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/photovoltaic_generator.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "electricadvantage:block/photovoltaic_generator", - "ambientocclusion": false -} diff --git a/src/main/resources/assets/electricadvantage/models/item/plastic_refinery.json b/src/main/resources/assets/electricadvantage/models/item/plastic_refinery.json deleted file mode 100644 index 3390e0b..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/plastic_refinery.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "electricadvantage:block/plastic_refinery_off", - "ambientocclusion": false -} diff --git a/src/main/resources/assets/electricadvantage/models/item/psu.json b/src/main/resources/assets/electricadvantage/models/item/psu.json deleted file mode 100644 index cf5543c..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/psu.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "item_texture": "electricadvantage:items/psu" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/models/item/pump_pipe_electric.json b/src/main/resources/assets/electricadvantage/models/item/pump_pipe_electric.json deleted file mode 100644 index 097b735..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/pump_pipe_electric.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/electricadvantage/models/item/silicon_ingot.json b/src/main/resources/assets/electricadvantage/models/item/silicon_ingot.json deleted file mode 100644 index 2e455b3..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/silicon_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "item_texture": "electricadvantage:items/silicon_ingot" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/item/silicon_mix.json b/src/main/resources/assets/electricadvantage/models/item/silicon_mix.json deleted file mode 100644 index b23feaf..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/silicon_mix.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "item_texture": "electricadvantage:items/silicon_mix" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/item/solder.json b/src/main/resources/assets/electricadvantage/models/item/solder.json deleted file mode 100644 index 2497ff1..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/solder.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "item_texture": "electricadvantage:items/solder" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/item/solder_mix.json b/src/main/resources/assets/electricadvantage/models/item/solder_mix.json deleted file mode 100644 index 6b27157..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/solder_mix.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "item_texture": "electricadvantage:items/solder_mix" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/item/steam_powered_generator.json b/src/main/resources/assets/electricadvantage/models/item/steam_powered_generator.json deleted file mode 100644 index db8679a..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/steam_powered_generator.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "electricadvantage:block/steam_powered_generator_off", - "ambientocclusion": false -} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/models/item/sulfur_ore.json b/src/main/resources/assets/electricadvantage/models/item/sulfur_ore.json deleted file mode 100644 index be50704..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/sulfur_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "electricadvantage:block/sulfur_ore" -} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/models/item/sulfur_powder.json b/src/main/resources/assets/electricadvantage/models/item/sulfur_powder.json deleted file mode 100644 index 393fc64..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/sulfur_powder.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "electricadvantage:items/sulfur_powder" - } -} \ No newline at end of file diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index c9c45f1..7c568a6 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,11 +1,11 @@ [ { - "modid": "electricadvantage", - "name": "Electric Advantage", - "description": "Add electricity to your game with this Power Advantage add-on", + "modid": "baseelectric", + "name": "baseElectric", + "description": "Electrical generation, storage, and machines for basePower", "version": "${version}", "mcversion": "${mcversion}", - "url": "", + "url": "https://github.com/MinecraftModDevelopmentMods/baseElectric", "updateUrl": "", "authorList": ["DrCyano"], "credits": "The Forge and FML guys, the author of this mod, Benjamin Franklin, and electrons everywhere", diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 475cc14..9ac9774 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack":{ "pack_format":2, - "description":"Electric Advantage" + "description":"baseElectric" } } \ No newline at end of file diff --git a/src/test/java/zone/moddev/mc/electricadvantage/entities/ElectricOperationalHydroturbineAnchorTest.java b/src/test/java/zone/moddev/mc/baseelectric/entities/ElectricOperationalHydroturbineAnchorTest.java similarity index 98% rename from src/test/java/zone/moddev/mc/electricadvantage/entities/ElectricOperationalHydroturbineAnchorTest.java rename to src/test/java/zone/moddev/mc/baseelectric/entities/ElectricOperationalHydroturbineAnchorTest.java index 7b981c5..aabc41f 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/entities/ElectricOperationalHydroturbineAnchorTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/entities/ElectricOperationalHydroturbineAnchorTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.entities; +package zone.moddev.mc.baseelectric.entities; import java.lang.reflect.Field; import java.util.Random; diff --git a/src/test/java/zone/moddev/mc/electricadvantage/gui/GUIHelperTest.java b/src/test/java/zone/moddev/mc/baseelectric/gui/GUIHelperTest.java similarity index 97% rename from src/test/java/zone/moddev/mc/electricadvantage/gui/GUIHelperTest.java rename to src/test/java/zone/moddev/mc/baseelectric/gui/GUIHelperTest.java index ac6e55d..ca2b068 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/gui/GUIHelperTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/gui/GUIHelperTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; import java.lang.reflect.Method; import org.junit.Test; diff --git a/src/test/java/zone/moddev/mc/baseelectric/init/IdentityMigrationTest.java b/src/test/java/zone/moddev/mc/baseelectric/init/IdentityMigrationTest.java new file mode 100644 index 0000000..98a9df8 --- /dev/null +++ b/src/test/java/zone/moddev/mc/baseelectric/init/IdentityMigrationTest.java @@ -0,0 +1,276 @@ +package zone.moddev.mc.baseelectric.init; + +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.ListMultimap; +import java.lang.reflect.Field; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Map; +import java.util.Random; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.init.Bootstrap; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.WorldProviderSurface; +import net.minecraft.world.WorldServer; +import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent; +import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent.Action; +import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent.MissingMapping; +import net.minecraftforge.fml.common.registry.GameRegistry; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.entities.HydroturbineEntity; +import zone.moddev.mc.baseelectric.machines.*; +import zone.moddev.mc.basepower.compat.LegacyIdentity; + +import static org.junit.Assert.*; + +public class IdentityMigrationTest { + private static final Class[] TILE_TYPES = {ElectricFurnaceTileEntity.class, ElectricCrusherTileEntity.class, + ElectricDrillTileEntity.class, ElectricFabricatorTileEntity.class, + GrowthChamberTileEntity.class, GrowthChamberControllerTileEntity.class, + ElectricOvenTileEntity.class, LaserTurretTileEntity.class, LEDTileEntity.class, + HydroelectricGeneratorTileEntity.class, PhotovoltaicGeneratorTileEntity.class, + SteamPoweredElectricGeneratorTileEntity.class, ElectricBatteryArrayTileEntity.class, + ElectricPumpTileEntity.class, ElectricStillTileEntity.class, PlasticRefineryTileEntity.class}; + private static final String[] TILE_SUFFIXES = {"electric_furnace", "electric_crusher", "electric_drill", "electric_fabricator", + "growth_chamber", "growth_chamber_controller", "electric_oven", "laser_turret", "l_e_d", + "hydroelectric_generator", "photovoltaic_generator", "steam_powered_electric_generator", + "electric_battery_array", "electric_pump", "electric_still", "plastic_refinery"}; + @Rule public final TemporaryFolder temporary = new TemporaryFolder(); + + @BeforeClass public static void bootstrap() { + Bootstrap.register(); + ElectricAdvantage.INSTANCE = new ElectricAdvantage(); + for (Class type : TILE_TYPES) Entities.registerTileEntity(type.asSubclass(TileEntity.class)); + } + + @Test public void handlerReadsTheOldOwnersMappingsEvenWithoutANewModContainer() { + ResourceLocation name = new ResourceLocation("baseelectric", "identity_test_block"); + Block block = new Block(Material.ROCK).setRegistryName(name); + Item itemBlock = new ItemBlock(block).setRegistryName(name); + Block.REGISTRY.register(3991, name, block); + Item.REGISTRY.register(31991, name, itemBlock); + MissingMapping blockMapping = new MissingMapping(GameRegistry.Type.BLOCK, + new ResourceLocation("electricadvantage", "identity_test_block"), 3990); + MissingMapping itemMapping = new MissingMapping(GameRegistry.Type.ITEM, + new ResourceLocation("electricadvantage", "identity_test_block"), 31990); + MissingMapping unknown = new MissingMapping(GameRegistry.Type.ITEM, + new ResourceLocation("electricadvantage", "unsupported"), 31989); + MissingMapping foreign = new MissingMapping(GameRegistry.Type.ITEM, + new ResourceLocation("unpublishedidentity", "identity_test_block"), 31988); + ListMultimap mappings = ArrayListMultimap.create(); + mappings.put("electricadvantage", blockMapping); + mappings.put("electricadvantage", itemMapping); + mappings.put("electricadvantage", unknown); + mappings.put("unpublishedidentity", foreign); + new ElectricAdvantage().missingMappings(new FMLMissingMappingsEvent(mappings)); + assertEquals(Action.REMAP, blockMapping.getAction()); + assertSame(block, blockMapping.getTarget()); + assertEquals(Action.REMAP, itemMapping.getAction()); + assertSame(itemBlock, itemMapping.getTarget()); + assertEquals(Action.FAIL, unknown.getAction()); + assertEquals(Action.DEFAULT, foreign.getAction()); + } + + @Test public void allSixteenReleasedTileAliasesKeepOnlyNewCanonicalWrites() throws Exception { + Map reads = tileMap("nameToClassMap", "field_145855_i"); + Map writes = tileMap("classToNameMap", "field_145853_j"); + for (int index = 0; index < TILE_TYPES.length; index++) { + assertSame(TILE_TYPES[index], reads.get("electricadvantage." + TILE_SUFFIXES[index])); + assertSame(TILE_TYPES[index], reads.get("baseelectric." + TILE_SUFFIXES[index])); + assertEquals("baseelectric." + TILE_SUFFIXES[index], writes.get(TILE_TYPES[index])); + } + } + + @Test public void nativeFurnaceLoadRetainsInventoryEnergyAndPositionAcrossCanonicalReloads() { + ElectricFurnaceTileEntity original = new ElectricFurnaceTileEntity(); + original.setPos(new BlockPos(-193, 77, 2049)); + original.setEnergy(123, Power.ELECTRIC_POWER); + original.setInventorySlotContents(0, new ItemStack(net.minecraft.init.Items.IRON_INGOT, 3)); + NBTTagCompound saved = original.writeToNBT(new NBTTagCompound()); + saved.setString("id", "electricadvantage.electric_furnace"); + for (int pass = 0; pass < 3; pass++) { + TileEntity loaded = TileEntity.create(null, saved); + assertTrue(loaded instanceof ElectricFurnaceTileEntity); + ElectricFurnaceTileEntity furnace = (ElectricFurnaceTileEntity) loaded; + assertEquals(original.getPos(), furnace.getPos()); + assertEquals(123, furnace.getEnergy(Power.ELECTRIC_POWER), 0); + assertEquals(3, furnace.getStackInSlot(0).stackSize); + assertSame(net.minecraft.init.Items.IRON_INGOT, furnace.getStackInSlot(0).getItem()); + saved = furnace.writeToNBT(new NBTTagCompound()); + assertEquals("baseelectric.electric_furnace", saved.getString("id")); + } + } + + @Test public void releasedTurbineLoadsThroughTheNativeEntityFactoryAndSavesCanonicalId() throws Exception { + String legacy = "electricadvantage.electricadvantage.Hydroturbine"; + String shortLegacy = "electricadvantage.Hydroturbine"; + String canonical = "baseelectric.Hydroturbine"; + Class previousRead = EntityList.NAME_TO_CLASS.put(canonical, HydroturbineEntity.class); + Class previousAlias = EntityList.NAME_TO_CLASS.get(legacy); + Class previousShortAlias = EntityList.NAME_TO_CLASS.get(shortLegacy); + String previousWrite = EntityList.CLASS_TO_NAME.put(HydroturbineEntity.class, canonical); + try { + Entities.registerHydroturbineAliases(); + World world = noTickWorld(); + HydroturbineEntity original = new HydroturbineEntity(world); + original.setPosition(-193.5, 76, 2049.5); + for (String oldId : new String[] {legacy, shortLegacy}) { + NBTTagCompound saved = new NBTTagCompound(); + assertTrue(original.writeToNBTOptional(saved)); + saved.setIntArray("parentPos", new int[] {-194, 77, 2049}); + saved.setString("id", oldId); + for (int pass = 0; pass < 3; pass++) { + Entity loaded = EntityList.createEntityFromNBT(saved, world); + assertTrue(oldId, loaded instanceof HydroturbineEntity); + NBTTagCompound next = new NBTTagCompound(); + assertTrue(loaded.writeToNBTOptional(next)); + assertEquals(canonical, next.getString("id")); + assertEquals(saved.getUniqueId("UUID"), next.getUniqueId("UUID")); + assertEquals(saved.getTagList("Pos", 6), next.getTagList("Pos", 6)); + assertArrayEquals(saved.getIntArray("parentPos"), next.getIntArray("parentPos")); + saved = next; + } + } + } finally { + if (previousRead == null) EntityList.NAME_TO_CLASS.remove(canonical); + else EntityList.NAME_TO_CLASS.put(canonical, previousRead); + if (previousAlias == null) EntityList.NAME_TO_CLASS.remove(legacy); + else EntityList.NAME_TO_CLASS.put(legacy, previousAlias); + if (previousShortAlias == null) EntityList.NAME_TO_CLASS.remove(shortLegacy); + else EntityList.NAME_TO_CLASS.put(shortLegacy, previousShortAlias); + if (previousWrite == null) EntityList.CLASS_TO_NAME.remove(HydroturbineEntity.class); + else EntityList.CLASS_TO_NAME.put(HydroturbineEntity.class, previousWrite); + } + } + + @Test public void turbineAliasDoesNotChangeCanonicalSerializationOrAddUnpublishedAliases() { + String legacy = "electricadvantage.electricadvantage.Hydroturbine"; + String shortLegacy = "electricadvantage.Hydroturbine"; + String canonical = "baseelectric.Hydroturbine"; + Class previous = EntityList.NAME_TO_CLASS.get(legacy); + Class previousShort = EntityList.NAME_TO_CLASS.get(shortLegacy); + String previousWrite = EntityList.CLASS_TO_NAME.put(HydroturbineEntity.class, canonical); + try { + Entities.registerHydroturbineAliases(); + assertSame(HydroturbineEntity.class, EntityList.NAME_TO_CLASS.get(legacy)); + assertSame(HydroturbineEntity.class, EntityList.NAME_TO_CLASS.get(shortLegacy)); + assertEquals(canonical, EntityList.getEntityStringFromClass(HydroturbineEntity.class)); + assertFalse(EntityList.NAME_TO_CLASS.containsKey("zone.moddev.mc.electricadvantage.Hydroturbine")); + } finally { + if (previous == null) EntityList.NAME_TO_CLASS.remove(legacy); + else EntityList.NAME_TO_CLASS.put(legacy, previous); + if (previousShort == null) EntityList.NAME_TO_CLASS.remove(shortLegacy); + else EntityList.NAME_TO_CLASS.put(shortLegacy, previousShort); + if (previousWrite == null) EntityList.CLASS_TO_NAME.remove(HydroturbineEntity.class); + else EntityList.CLASS_TO_NAME.put(HydroturbineEntity.class, previousWrite); + } + } + + @Test public void conflictingShortAliasCannotPartiallyInstallTheReleasedAlias() { + String legacy = "electricadvantage.electricadvantage.Hydroturbine"; + String shortLegacy = "electricadvantage.Hydroturbine"; + Class previous = EntityList.NAME_TO_CLASS.remove(legacy); + Class previousShort = EntityList.NAME_TO_CLASS.put(shortLegacy, + net.minecraft.entity.item.EntityItem.class); + String canonical = EntityList.CLASS_TO_NAME.get(HydroturbineEntity.class); + try { + try { + Entities.registerHydroturbineAliases(); + fail("A conflicting legacy owner must stop startup"); + } catch (IllegalStateException expected) { + assertTrue(expected.getMessage().contains(shortLegacy)); + } + assertFalse(EntityList.NAME_TO_CLASS.containsKey(legacy)); + assertSame(net.minecraft.entity.item.EntityItem.class, EntityList.NAME_TO_CLASS.get(shortLegacy)); + assertEquals(canonical, EntityList.CLASS_TO_NAME.get(HydroturbineEntity.class)); + } finally { + if (previous != null) EntityList.NAME_TO_CLASS.put(legacy, previous); + if (previousShort == null) EntityList.NAME_TO_CLASS.remove(shortLegacy); + else EntityList.NAME_TO_CLASS.put(shortLegacy, previousShort); + } + } + + @Test public void releasedConfigurationIsCopiedAndAnExistingNewConfigurationWins() throws Exception { + Path config = temporary.newFolder().toPath(); + Path old = config.resolve("electricadvantage.cfg"); + Path canonical = config.resolve("baseelectric.cfg"); + byte[] original = "options { S:laser_sound=block.note.harp }\r\n".getBytes(StandardCharsets.UTF_8); + Files.write(old, original); + assertEquals(canonical.toFile(), LegacyIdentity.migrateConfiguration(canonical.toFile(), "electricadvantage")); + assertArrayEquals(original, Files.readAllBytes(canonical)); + byte[] custom = "new user settings".getBytes(StandardCharsets.UTF_8); + Files.write(canonical, custom); + LegacyIdentity.migrateConfiguration(canonical.toFile(), "electricadvantage"); + assertArrayEquals(original, Files.readAllBytes(old)); + assertArrayEquals(custom, Files.readAllBytes(canonical)); + } + + @Test public void importedCustomLootSurvivesDefaultGenerationAndCannotBeInjectedTwice() throws Exception { + Path config = temporary.newFolder().toPath(); + Path old = config.resolve("additional-loot-tables/electricadvantage/chests/simple_dungeon.json"); + Files.createDirectories(old.getParent()); + byte[] original = "{\"pools\":[{\"rolls\":9,\"entries\":[{\"type\":\"item\",\"name\":\"electricadvantage:psu\",\"weight\":37}]}]}" + .getBytes(StandardCharsets.UTF_8); + Files.write(old, original); + LegacyIdentity.migrateAdditionalLootTables(config, "electricadvantage", "baseelectric"); + Path canonical = config.resolve("additional-loot-tables/baseelectric/chests/simple_dungeon.json"); + byte[] imported = Files.readAllBytes(canonical); + Field initialized = TreasureChests.class.getDeclaredField("initDone"); + initialized.setAccessible(true); + boolean previous = initialized.getBoolean(null); + try { + initialized.setBoolean(null, false); + TreasureChests.init(config); + assertArrayEquals(imported, Files.readAllBytes(canonical)); + assertTrue(new String(imported, StandardCharsets.UTF_8).contains("baseelectric:psu")); + assertFalse(Files.exists(old)); + assertArrayEquals(original, Files.readAllBytes(old.resolveSibling("simple_dungeon.json.before-baseelectric"))); + LegacyIdentity.migrateAdditionalLootTables(config, "electricadvantage", "baseelectric"); + assertArrayEquals(imported, Files.readAllBytes(canonical)); + } finally { + initialized.setBoolean(null, previous); + } + } + + private static Map tileMap(String mcp, String srg) throws Exception { + Field field; + try { field = TileEntity.class.getDeclaredField(mcp); } + catch (NoSuchFieldException missing) { field = TileEntity.class.getDeclaredField(srg); } + field.setAccessible(true); + return (Map) field.get(null); + } + + private static World noTickWorld() throws Exception { + Class allocator = Class.forName("sun.misc.Unsafe"); + Field instance = allocator.getDeclaredField("theUnsafe"); + instance.setAccessible(true); + World world = (World) allocator.getMethod("allocateInstance", Class.class) + .invoke(instance.get(null), NoTickWorld.class); + Field random = World.class.getField("rand"); + random.setAccessible(true); + random.set(world, new Random(0)); + Field provider = World.class.getField("provider"); + provider.setAccessible(true); + provider.set(world, new WorldProviderSurface()); + return world; + } + + private static final class NoTickWorld extends WorldServer { + private NoTickWorld() { super(null, null, null, 0, null); } + } +} diff --git a/src/test/java/zone/moddev/mc/baseelectric/init/IdentityResourceTest.java b/src/test/java/zone/moddev/mc/baseelectric/init/IdentityResourceTest.java new file mode 100644 index 0000000..2c37bfc --- /dev/null +++ b/src/test/java/zone/moddev/mc/baseelectric/init/IdentityResourceTest.java @@ -0,0 +1,46 @@ +package zone.moddev.mc.baseelectric.init; + +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import net.minecraftforge.fml.common.Mod; +import org.junit.Test; +import zone.moddev.mc.baseelectric.ElectricAdvantage; + +import static org.junit.Assert.*; + +public class IdentityResourceTest { + @Test public void entryPointAndPackagedMetadataAgreeOnTheNewIdentity() throws Exception { + Mod mod = ElectricAdvantage.class.getAnnotation(Mod.class); + assertEquals("baseelectric", mod.modid()); + assertEquals("baseElectric", mod.name()); + assertEquals("2.2.6.110021", mod.version()); + assertEquals("required-after:orespawn@[4.0.6,5.0.0);required-after:basepower@[2.4.4.110021,);after:basemetals", + mod.dependencies()); + try (InputStream stream = getClass().getResourceAsStream("/mcmod.info"); + InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) { + JsonObject metadata = new JsonParser().parse(reader).getAsJsonArray().get(0).getAsJsonObject(); + assertEquals(mod.modid(), metadata.get("modid").getAsString()); + assertEquals(mod.name(), metadata.get("name").getAsString()); + } + } + + @Test public void assetsUseTheNewDomainWithoutKeepingAnOldDuplicateTree() throws Exception { + for (String path : new String[] {"lang/en_US.lang", "models/item/psu.json", + "blockstates/electric_drill.json", "textures/entity/hydroturbine.png"}) { + try (InputStream current = getClass().getResourceAsStream("/assets/baseelectric/" + path); + InputStream obsolete = getClass().getResourceAsStream("/assets/electricadvantage/" + path)) { + assertNotNull(path, current); + assertNull(path, obsolete); + } + } + try (InputStream stream = getClass().getResourceAsStream("/assets/baseelectric/models/item/psu.json"); + InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) { + JsonObject model = new JsonParser().parse(reader).getAsJsonObject(); + assertEquals("baseelectric:item/generic_item", model.get("parent").getAsString()); + assertEquals("baseelectric:items/psu", model.getAsJsonObject("textures").get("item_texture").getAsString()); + } + } +} diff --git a/src/test/java/zone/moddev/mc/baseelectric/init/LegacyOreSpawnMigrationTest.java b/src/test/java/zone/moddev/mc/baseelectric/init/LegacyOreSpawnMigrationTest.java new file mode 100644 index 0000000..f062543 --- /dev/null +++ b/src/test/java/zone/moddev/mc/baseelectric/init/LegacyOreSpawnMigrationTest.java @@ -0,0 +1,180 @@ +package zone.moddev.mc.baseelectric.init; + +import com.google.gson.JsonObject; +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; + +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.lang.reflect.Method; +import java.nio.charset.StandardCharsets; +import java.nio.file.DirectoryStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Map; + +import static org.junit.Assert.*; + +public class LegacyOreSpawnMigrationTest { + @Rule + public final TemporaryFolder temporary = new TemporaryFolder(); + + @Test + public void legacyMineralsBecomeExactlyTwoRetainedRulesAndKeepAuthority() throws Exception { + JsonObject legacy; + try (InputStreamReader reader = new InputStreamReader( + getClass().getResourceAsStream("/orespawn-legacy/electricadvantage.json"), + StandardCharsets.UTF_8)) { + legacy = new JsonParser().parse(reader).getAsJsonObject(); + } + Class bridge = Class.forName("com.mcmoddev.orespawn.compat.LegacyOs3Bridge"); + Method translate = bridge.getDeclaredMethod("translateOs1ForTests", String.class, JsonObject.class); + translate.setAccessible(true); + JsonObject converted = (JsonObject) translate.invoke(null, "electricadvantage", legacy); + assertEquals(2, converted.getAsJsonObject("spawns").entrySet().size()); + assertEquals(2, OreSpawnWorldGen.createProvider(false, false).toJson() + .getAsJsonObject("ores").entrySet().size()); + + Path config = temporary.newFolder("config").toPath(); + Path legacyDirectory = Files.createDirectories(config.resolve("orespawn")); + Path old = legacyDirectory.resolve("electricadvantage.json"); + copyOriginalOs1(old); + byte[] original = Files.readAllBytes(old); + assertTrue(OreSpawnWorldGen.migrateConfiguration(config) > 0); + Path target = legacyDirectory.resolve("baseelectric.json"); + assertFalse(Files.exists(old)); + assertEquals("config/orespawn/baseelectric.json (legacy importer authority)", + OreSpawnWorldGen.describeOverride(config)); + assertBackupContains(old, original); + + JsonObject expected = new JsonParser().parse(legacy.toString()).getAsJsonObject(); + for (JsonElement dimension : expected.getAsJsonArray("dimensions")) { + for (JsonElement ore : dimension.getAsJsonObject().getAsJsonArray("ores")) { + JsonObject rule = ore.getAsJsonObject(); + rule.addProperty("blockID", rule.get("blockID").getAsString() + .replace("electricadvantage:", "baseelectric:")); + } + } + JsonObject migrated = read(target); + assertEquals("Only owned block references change; placement and restrictions are retained", + expected, migrated); + JsonObject reimported = (JsonObject) translate.invoke(null, "baseelectric", migrated); + assertEquals(2, reimported.getAsJsonObject("spawns").entrySet().size()); + assertFalse(Files.exists(config.resolve("electricadvantage-orespawn.json"))); + assertEquals(0, OreSpawnWorldGen.migrateConfiguration(config)); + assertEquals(migrated, read(target)); + } + + @Test public void explicitModernOverrideRetainsItsSettingsAndRetiresTheOS1Input() throws Exception { + Path config = temporary.newFolder("modern").toPath(); + Path legacyOs1 = config.resolve("orespawn/electricadvantage.json"); + copyOriginalOs1(legacyOs1); + byte[] originalOs1 = Files.readAllBytes(legacyOs1); + Path legacyProvider = config.resolve("electricadvantage-orespawn.json"); + JsonObject provider = legacyProvider(); + provider.addProperty("provider_revision", 17); + provider.addProperty("notes", "Retain electricadvantage:free_text literally"); + provider.getAsJsonObject("ores").getAsJsonObject("electricadvantage:ore/lithium") + .addProperty("enabled", false); + byte[] originalProvider = provider.toString().getBytes(StandardCharsets.UTF_8); + Files.write(legacyProvider, originalProvider); + + assertTrue(OreSpawnWorldGen.migrateConfiguration(config) > 0); + JsonObject migrated = read(config.resolve("baseelectric-orespawn.json")); + assertEquals("baseelectric", migrated.get("provider_modid").getAsString()); + assertEquals(17, migrated.get("provider_revision").getAsInt()); + assertEquals(provider.get("notes"), migrated.get("notes")); + JsonObject ores = migrated.getAsJsonObject("ores"); + assertEquals(2, ores.entrySet().size()); + assertFalse(ores.getAsJsonObject("baseelectric:ore/lithium").get("enabled").getAsBoolean()); + assertEquals("baseelectric:li_ore", ores.getAsJsonObject("baseelectric:ore/lithium").get("block").getAsString()); + assertEquals("baseelectric:sulfur_ore", ores.getAsJsonObject("baseelectric:ore/sulfur").get("block").getAsString()); + assertFalse(Files.exists(legacyProvider)); + assertFalse(Files.exists(legacyOs1)); + assertFalse("An explicit provider must not leave another owned input for the OS1 importer", + Files.exists(config.resolve("orespawn/baseelectric.json"))); + assertBackupContains(legacyProvider, originalProvider); + assertBackupContains(legacyOs1, originalOs1); + assertEquals("config/baseelectric-orespawn.json (authoritative)", + OreSpawnWorldGen.describeOverride(config)); + assertEquals(0, OreSpawnWorldGen.migrateConfiguration(config)); + } + + @Test public void conflictingOldAndNewAuthoritiesAbortWithoutChangingEitherFile() throws Exception { + Path config = temporary.newFolder("conflicting").toPath(); + Path old = config.resolve("electricadvantage-orespawn.json"); + byte[] original = legacyProvider().toString().getBytes(StandardCharsets.UTF_8); + Files.write(old, original); + JsonObject custom = OreSpawnWorldGen.createProvider(false, false).toJson(); + custom.getAsJsonObject("ores").getAsJsonObject("baseelectric:ore/lithium") + .addProperty("enabled", false); + Path canonical = config.resolve("baseelectric-orespawn.json"); + byte[] customBytes = custom.toString().getBytes(StandardCharsets.UTF_8); + Files.write(canonical, customBytes); + assertMigrationAborts(config); + assertArrayEquals(original, Files.readAllBytes(old)); + assertArrayEquals(customBytes, Files.readAllBytes(canonical)); + } + + @Test public void completedBridgeMarkerCannotSilentlyDiscardAnUnimportedOS1File() throws Exception { + Path config = temporary.newFolder("incomplete").toPath(); + Path old = config.resolve("orespawn/electricadvantage.json"); + copyOriginalOs1(old); + byte[] original = Files.readAllBytes(old); + Files.write(config.resolve(".orespawn-legacy-bridge-migrated"), new byte[0]); + assertMigrationAborts(config); + assertArrayEquals(original, Files.readAllBytes(old)); + assertFalse(Files.exists(config.resolve("orespawn/baseelectric.json"))); + } + + private static void assertMigrationAborts(Path config) { + try { + OreSpawnWorldGen.migrateConfiguration(config); + fail("Migration failure must abort startup before enqueueing defaults"); + } catch (IllegalStateException expected) { + assertTrue(expected.getCause() instanceof IOException); + } + } + + private static JsonObject legacyProvider() { + JsonObject provider = OreSpawnWorldGen.createProvider(false, false).toJson(); + provider.addProperty("provider_modid", "electricadvantage"); + JsonObject oldOres = new JsonObject(); + for (Map.Entry entry : provider.getAsJsonObject("ores").entrySet()) { + JsonObject ore = new JsonParser().parse(entry.getValue().toString()).getAsJsonObject(); + ore.addProperty("block", ore.get("block").getAsString().replace("baseelectric:", "electricadvantage:")); + oldOres.add(entry.getKey().replace("baseelectric:", "electricadvantage:"), ore); + } + provider.add("ores", oldOres); + return provider; + } + + private void copyOriginalOs1(Path target) throws Exception { + Files.createDirectories(target.getParent()); + try (InputStream source = getClass().getResourceAsStream("/orespawn-legacy/electricadvantage.json")) { + Files.copy(source, target); + } + } + + private static JsonObject read(Path path) throws IOException { + try (InputStreamReader reader = new InputStreamReader(Files.newInputStream(path), StandardCharsets.UTF_8)) { + return new JsonParser().parse(reader).getAsJsonObject(); + } + } + + private static void assertBackupContains(Path source, byte[] original) throws IOException { + int count = 0; + try (DirectoryStream backups = Files.newDirectoryStream(source.getParent(), + source.getFileName() + ".before-baseelectric-*.bak")) { + for (Path backup : backups) { + assertArrayEquals(original, Files.readAllBytes(backup)); + count++; + } + } + assertEquals("Exactly one immutable byte-preserving backup per source", 1, count); + } +} diff --git a/src/test/java/zone/moddev/mc/electricadvantage/init/OreSpawnWorldGenTest.java b/src/test/java/zone/moddev/mc/baseelectric/init/OreSpawnWorldGenTest.java similarity index 80% rename from src/test/java/zone/moddev/mc/electricadvantage/init/OreSpawnWorldGenTest.java rename to src/test/java/zone/moddev/mc/baseelectric/init/OreSpawnWorldGenTest.java index c0a0df4..ac056c6 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/init/OreSpawnWorldGenTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/init/OreSpawnWorldGenTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; import com.google.gson.JsonObject; import org.junit.Test; @@ -32,11 +32,15 @@ private static void assertOwnership(boolean mineralogy, boolean baseMinerals, boolean sulfurEnabled, boolean lithiumEnabled) { JsonObject root = OreSpawnWorldGen.createProvider(mineralogy, baseMinerals).toJson(); assertEquals(4, root.get("schema_version").getAsInt()); - assertEquals("electricadvantage", root.get("provider_modid").getAsString()); + assertEquals("baseelectric", root.get("provider_modid").getAsString()); JsonObject ores = root.getAsJsonObject("ores"); assertEquals(2, ores.entrySet().size()); - JsonObject lithium = ores.getAsJsonObject("electricadvantage:ore/lithium"); - JsonObject sulfur = ores.getAsJsonObject("electricadvantage:ore/sulfur"); + assertFalse(ores.has("electricadvantage:ore/lithium")); + assertFalse(ores.has("electricadvantage:ore/sulfur")); + JsonObject lithium = ores.getAsJsonObject("baseelectric:ore/lithium"); + JsonObject sulfur = ores.getAsJsonObject("baseelectric:ore/sulfur"); + assertEquals("baseelectric:li_ore", lithium.get("block").getAsString()); + assertEquals("baseelectric:sulfur_ore", sulfur.get("block").getAsString()); assertEquals(lithiumEnabled, lithium.get("enabled").getAsBoolean()); assertEquals(sulfurEnabled, sulfur.get("enabled").getAsBoolean()); assertLegacyPlacement(lithium, 0.125D, 6, 9); @@ -60,4 +64,4 @@ private static void assertLegacyPlacement(JsonObject ore, double frequency, assertEquals(maxQuantity, placement.get("max_quantity").getAsInt()); assertEquals(4, placement.getAsJsonArray("host_families").size()); } -} \ No newline at end of file +} diff --git a/src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricDrillMovementContractTest.java b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricDrillMovementContractTest.java similarity index 97% rename from src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricDrillMovementContractTest.java rename to src/test/java/zone/moddev/mc/baseelectric/machines/ElectricDrillMovementContractTest.java index 5903a8c..99e562b 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricDrillMovementContractTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricDrillMovementContractTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import java.nio.charset.StandardCharsets; import java.nio.file.Files; diff --git a/src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricDrillPersistenceTest.java b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricDrillPersistenceTest.java similarity index 96% rename from src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricDrillPersistenceTest.java rename to src/test/java/zone/moddev/mc/baseelectric/machines/ElectricDrillPersistenceTest.java index 03f6bf5..8a8b409 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricDrillPersistenceTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricDrillPersistenceTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraft.nbt.NBTTagCompound; import org.junit.Test; diff --git a/src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricOperationalNativeDefectsTest.java b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalNativeDefectsTest.java similarity index 99% rename from src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricOperationalNativeDefectsTest.java rename to src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalNativeDefectsTest.java index abf4534..fd3b47d 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricOperationalNativeDefectsTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalNativeDefectsTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraftforge.fluids.FluidStack; import java.lang.reflect.Field; @@ -16,7 +16,7 @@ import net.minecraft.world.WorldServer; import org.junit.BeforeClass; import org.junit.Test; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import static org.junit.Assert.*; diff --git a/src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricOperationalPumpPickupTest.java b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalPumpPickupTest.java similarity index 98% rename from src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricOperationalPumpPickupTest.java rename to src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalPumpPickupTest.java index d56cb62..23bec9f 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricOperationalPumpPickupTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalPumpPickupTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import java.lang.reflect.Field; import java.util.HashMap; @@ -25,7 +25,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import static org.junit.Assert.*; diff --git a/src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricOperationalRedstoneCacheTest.java b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalRedstoneCacheTest.java similarity index 93% rename from src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricOperationalRedstoneCacheTest.java rename to src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalRedstoneCacheTest.java index e5227c7..da60e22 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricOperationalRedstoneCacheTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalRedstoneCacheTest.java @@ -1,10 +1,11 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import cyano.poweradvantage.api.PoweredEntity; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.init.Bootstrap; import net.minecraft.world.World; @@ -84,6 +85,7 @@ public class ElectricOperationalRedstoneCacheTest { machine.update(); assertEquals(initial, machine.observed); assertEquals(1, world.queryTimes.size()); + assertEquals(1, world.dirtyMarks); world.signalled = !initial; for (long tick = first + 1; tick <= refresh + 8; tick++) { world.time = tick; @@ -91,6 +93,8 @@ public class ElectricOperationalRedstoneCacheTest { assertEquals("tickUpdate must precede the scheduled refresh at " + tick, tick <= refresh ? initial : !initial, machine.observed); assertEquals(tick < refresh ? 1 : tick < refresh + 8 ? 2 : 3, world.queryTimes.size()); + assertEquals("Every real server tick must request persistence", tick - first + 1, + world.dirtyMarks); } assertEquals(Arrays.asList(first, refresh, refresh + 8), world.queryTimes); assertEquals(2, machine.powerUpdates); @@ -203,6 +207,7 @@ private static final class SignalWorld extends WorldServer { BlockPos position; boolean signalled; long time; + int dirtyMarks; List queryTimes; private SignalWorld() { super(null, null, null, 0, null); @@ -213,5 +218,11 @@ private SignalWorld() { return signalled; } @Override public long getTotalWorldTime() { return time; } + @Override public void markChunkDirty(BlockPos position, TileEntity tile) { + // This allocated world has no chunk provider; verify the persistence request instead of chunk I/O. + assertEquals(this.position, position); + assertTrue(tile instanceof ProbeMachine); + dirtyMarks++; + } } } diff --git a/src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricOperationalSoundBroadcastTest.java b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalSoundBroadcastTest.java similarity index 99% rename from src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricOperationalSoundBroadcastTest.java rename to src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalSoundBroadcastTest.java index 74f44ee..2970c8c 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricOperationalSoundBroadcastTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalSoundBroadcastTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricOperationalStillCapacityTest.java b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalStillCapacityTest.java similarity index 92% rename from src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricOperationalStillCapacityTest.java rename to src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalStillCapacityTest.java index f3aa520..fb73770 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricOperationalStillCapacityTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalStillCapacityTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraftforge.fluids.FluidStack; import java.lang.reflect.Field; @@ -8,10 +8,10 @@ import org.junit.Before; import org.junit.After; import org.junit.Test; -import zone.moddev.mc.electricadvantage.init.Power; -import zone.moddev.mc.poweradvantage.registry.still.recipe.DistillationRecipe; -import zone.moddev.mc.poweradvantage.registry.still.recipe.DistillationRecipeRegistry; -import zone.moddev.mc.poweradvantage.registry.still.recipe.ExplicitFluidReference; +import zone.moddev.mc.baseelectric.init.Power; +import zone.moddev.mc.basepower.registry.still.recipe.DistillationRecipe; +import zone.moddev.mc.basepower.registry.still.recipe.DistillationRecipeRegistry; +import zone.moddev.mc.basepower.registry.still.recipe.ExplicitFluidReference; import static org.junit.Assert.*; diff --git a/src/test/java/zone/moddev/mc/electricadvantage/machines/GrowthChamberPersistenceTest.java b/src/test/java/zone/moddev/mc/baseelectric/machines/GrowthChamberPersistenceTest.java similarity index 98% rename from src/test/java/zone/moddev/mc/electricadvantage/machines/GrowthChamberPersistenceTest.java rename to src/test/java/zone/moddev/mc/baseelectric/machines/GrowthChamberPersistenceTest.java index a19a68b..58d639b 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/machines/GrowthChamberPersistenceTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/machines/GrowthChamberPersistenceTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraft.init.Bootstrap; import net.minecraft.init.Items; diff --git a/src/test/java/zone/moddev/mc/electricadvantage/init/LegacyOreSpawnMigrationTest.java b/src/test/java/zone/moddev/mc/electricadvantage/init/LegacyOreSpawnMigrationTest.java deleted file mode 100644 index a27fd2e..0000000 --- a/src/test/java/zone/moddev/mc/electricadvantage/init/LegacyOreSpawnMigrationTest.java +++ /dev/null @@ -1,44 +0,0 @@ -package zone.moddev.mc.electricadvantage.init; - -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; - -import java.io.InputStreamReader; -import java.lang.reflect.Method; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -public class LegacyOreSpawnMigrationTest { - @Rule - public final TemporaryFolder temporary = new TemporaryFolder(); - - @Test - public void legacyMineralsBecomeExactlyTwoRetainedRulesAndKeepAuthority() throws Exception { - JsonObject legacy; - try (InputStreamReader reader = new InputStreamReader( - getClass().getResourceAsStream("/orespawn-legacy/electricadvantage.json"), - StandardCharsets.UTF_8)) { - legacy = new JsonParser().parse(reader).getAsJsonObject(); - } - Class bridge = Class.forName("com.mcmoddev.orespawn.compat.LegacyOs3Bridge"); - Method translate = bridge.getDeclaredMethod("translateOs1ForTests", String.class, JsonObject.class); - translate.setAccessible(true); - JsonObject converted = (JsonObject) translate.invoke(null, "electricadvantage", legacy); - assertEquals(2, converted.getAsJsonObject("spawns").entrySet().size()); - assertEquals(2, OreSpawnWorldGen.createProvider(false, false).toJson() - .getAsJsonObject("ores").entrySet().size()); - - Path config = temporary.newFolder("config").toPath(); - Path legacyDirectory = Files.createDirectories(config.resolve("orespawn")); - Files.copy(getClass().getResourceAsStream("/orespawn-legacy/electricadvantage.json"), - legacyDirectory.resolve("electricadvantage.json")); - assertTrue(OreSpawnWorldGen.describeOverride(config).contains("legacy importer authority")); - } -} \ No newline at end of file From 264f2fad8ae83b9e80cea145aa1af054596a7f59 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Mon, 2 Nov 2026 16:40:06 +0000 Subject: [PATCH 2/3] 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/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 065b2bf..7cc570e 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/PowerAdvantage - name: Install Java 8 toolchain diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 8a5de23..fe73fe8 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/PowerAdvantage - name: Install Java 8 toolchain diff --git a/README.md b/README.md index 2a60e81..56eb409 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ gradlew.bat cleanEclipse verifyEclipseProductionClasspath basePower `2.4.4.110021` or newer and OreSpawn are required at compile time and runtime but are never bundled. Base Metals remains a required distribution dependency while its integrations stay reflection-based and absent from the compile classpath. CurseForge relations are `basepower`, `base-metals`, and `mmd-orespawn`. -The build pins basePower source commit `79fb16437615df98b6c6298fe8d98643a0e7140b` and development-jar SHA-256 +The build pins basePower source commit `425af862ef5b41b61d3e1f7e665d1d691852ff4b` and development-jar SHA-256 `2992F2CADC30D8F61A17216DF9AB02BDF8E8211BB8B494A6CCED70A3267F69FE` in properties, audits and both dependency-building workflows. CI builds that exact MMD basePower source and checks the resulting jar before compiling baseElectric. Do not substitute an old jar or a moving branch. diff --git a/build.gradle b/build.gradle index 44baba7..df3b5d2 100644 --- a/build.gradle +++ b/build.gradle @@ -342,7 +342,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 PowerAdvantage compile dependency identity') } diff --git a/docs/identity-migration.md b/docs/identity-migration.md index 5eb21b5..7adbf5f 100644 --- a/docs/identity-migration.md +++ b/docs/identity-migration.md @@ -93,7 +93,7 @@ Implementation references use `zone.moddev.mc.basepower`; public API references `required-after:basepower@[2.4.4.110021,);after:basemetals`, alongside the existing OreSpawn requirement. Distribution relations are `basepower,base-metals,mmd-orespawn`. -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 strict dependency audit and both dependency-building workflows. CI builds that exact source before checking the jar checksum. Required class, manifest, classpath, Java 8 bytecode, diff --git a/gradle.properties b/gradle.properties index 8c836fc..858bab7 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 From 05cbda8fbedbbd2e8f2154eec48b64d86e405d89 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Mon, 2 Nov 2026 16:43:29 +0000 Subject: [PATCH 3/3] Clarify the separate CurseForge publication setup --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 56eb409..2226609 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ The build pins basePower source commit `425af862ef5b41b61d3e1f7e665d1d691852ff4b both dependency-building workflows. CI builds that exact MMD basePower source and checks the resulting jar before compiling baseElectric. Do not substitute an old jar or a moving branch. -CurseForge project ID `0` means unassigned development metadata. No CurseForge project has -been created or authorized. Maven publication, prepared release validation, and release-tag +CurseForge project ID `0` means the new project's ID has not been configured in this build. +Maven publication, prepared release validation, and release-tag validation refuse unassigned IDs and the old Electric Advantage project ID. Local builds and checks are separate from publication approval.