From 46aa54b7e77b8e91a1378c1bb9d3595e98d10bd2 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Fri, 6 Nov 2026 22:31:29 +0000 Subject: [PATCH 1/3] Bring baseElectric to Minecraft 1.16.5 --- .github/workflows/ci.yml | 16 +-- .github/workflows/codeql-analysis.yml | 8 +- .github/workflows/release-on-tag.yml | 4 +- CHANGELOG.txt | 5 + README.md | 13 +- build.gradle | 88 ++++++------ gradle.properties | 20 +-- .../Data.java | 6 +- .../ElectricAdvantage.java | 36 ++--- .../blocks/ElectricConduitBlock.java | 4 +- .../blocks/ElectricScaffoldBlock.java | 4 +- .../blocks/Ore.java | 2 +- .../blocks/PumpPipeBlock.java | 2 +- .../common/IRechargeableItem.java | 2 +- .../compat/BaseMetalsCompat.java | 2 +- .../config/ElectricAdvantageConfig.java | 8 +- .../entities/HydroturbineEntity.java | 8 +- .../graphics/BufferedQuads.java | 2 +- .../graphics/ClientRegistration.java | 6 +- .../graphics/ElectricRenderTypes.java | 4 +- .../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 | 48 +++---- .../init/Enchantments.java | 4 +- .../init/Entities.java | 38 ++--- .../init/GUI.java | 8 +- .../init/Items.java | 8 +- .../init/OreSpawnWorldGen.java | 8 +- .../init/Power.java | 2 +- .../init/Recipes.java | 2 +- .../init/TreasureChests.java | 22 +-- .../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 | 6 +- .../machines/ElectricMachineBlock.java | 4 +- .../machines/ElectricMachineTileEntity.java | 6 +- .../machines/ElectricOvenBlock.java | 2 +- .../machines/ElectricOvenTileEntity.java | 6 +- .../machines/ElectricPumpBlock.java | 10 +- .../machines/ElectricPumpTileEntity.java | 20 +-- .../machines/ElectricStillBlock.java | 6 +- .../machines/ElectricStillTileEntity.java | 20 +-- .../machines/GrowthChamberBlock.java | 4 +- .../GrowthChamberControllerBlock.java | 6 +- .../GrowthChamberControllerTileEntity.java | 10 +- .../machines/GrowthChamberTileEntity.java | 10 +- .../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 | 6 +- .../machines/PlasticRefineryTileEntity.java | 16 +-- .../SteamPoweredElectricGeneratorBlock.java | 4 +- ...eamPoweredElectricGeneratorTileEntity.java | 8 +- .../migration/ElectricLegacyMigrations.java | 44 +++--- .../recipe/RecipeConditions.java | 8 +- .../util/LegacyFluidHandler.java | 2 +- .../util/crafting/ItemMatcher.java | 2 +- .../util/crafting/ItemRecord.java | 2 +- .../util/crafting/RecipeDeconstructor.java | 4 +- .../util/crafting/SerializedInventory.java | 2 +- .../util/farming/VirtualCrop.java | 4 +- src/main/resources/META-INF/mods.toml | 20 +-- .../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.json | 92 ++++++++++++ .../assets/baseelectric/lang/en_au.json | 92 ++++++++++++ .../assets/baseelectric/lang/en_ca.json | 92 ++++++++++++ .../assets/baseelectric/lang/en_en.json | 92 ++++++++++++ .../assets/baseelectric/lang/en_gb.json | 92 ++++++++++++ .../assets/baseelectric/lang/en_pt.json | 92 ++++++++++++ .../assets/baseelectric/lang/en_us.json | 92 ++++++++++++ .../assets/baseelectric/lang/es_es.json | 92 ++++++++++++ .../assets/baseelectric/lang/es_mx.json | 92 ++++++++++++ .../assets/baseelectric/lang/it_it.json | 92 ++++++++++++ .../assets/baseelectric/lang/ja_jp.json | 92 ++++++++++++ .../assets/baseelectric/lang/ko_ko.json | 91 ++++++++++++ .../assets/baseelectric/lang/pt_br.json | 92 ++++++++++++ .../assets/baseelectric/lang/zh_cn.json | 92 ++++++++++++ .../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 | 2 +- .../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 | 6 + .../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 | 0 .../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 | 0 .../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 | 0 .../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 | 0 .../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 | 0 .../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.json | 92 ------------ .../assets/electricadvantage/lang/en_au.json | 92 ------------ .../assets/electricadvantage/lang/en_ca.json | 92 ------------ .../assets/electricadvantage/lang/en_en.json | 92 ------------ .../assets/electricadvantage/lang/en_gb.json | 92 ------------ .../assets/electricadvantage/lang/en_pt.json | 92 ------------ .../assets/electricadvantage/lang/en_us.json | 92 ------------ .../assets/electricadvantage/lang/es_es.json | 92 ------------ .../assets/electricadvantage/lang/es_mx.json | 92 ------------ .../assets/electricadvantage/lang/it_it.json | 92 ------------ .../assets/electricadvantage/lang/ja_jp.json | 92 ------------ .../assets/electricadvantage/lang/ko_ko.json | 91 ------------ .../assets/electricadvantage/lang/pt_br.json | 92 ------------ .../assets/electricadvantage/lang/zh_cn.json | 92 ------------ .../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/generic_item.json | 6 - .../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 - .../recipes/alkaline_battery.json | 4 +- .../blank_circuit_board_ingot_normal.json | 4 +- .../recipes/blank_circuit_board_plate.json | 4 +- .../advancements/recipes/control_circuit.json | 6 +- .../recipes/electric_battery_array.json | 4 +- .../electric_conduit_plastic_ingot.json | 4 +- .../recipes/electric_conduit_plastic_rod.json | 4 +- .../electric_conduit_rubber_ingot.json | 4 +- .../recipes/electric_conduit_rubber_rod.json | 4 +- .../recipes/electric_crusher.json | 4 +- .../advancements/recipes/electric_drill.json | 4 +- .../recipes/electric_fabricator.json | 4 +- .../recipes/electric_furnace.json | 4 +- .../advancements/recipes/electric_oven.json | 4 +- .../advancements/recipes/electric_pump.json | 4 +- .../advancements/recipes/electric_still.json | 4 +- .../advancements/recipes/electric_switch.json | 4 +- .../advancements/recipes/electric_track.json | 43 ++++++ .../advancements/recipes/growth_chamber.json | 4 +- .../recipes/growth_chamber_controller.json | 4 +- .../recipes/hydroelectric_generator.json | 4 +- .../integrated_circuit_copper_normal.json | 4 +- .../integrated_circuit_copper_tech.json | 4 +- .../integrated_circuit_gold_normal.json | 4 +- .../recipes/integrated_circuit_gold_tech.json | 4 +- .../integrated_circuit_tin_normal.json | 4 +- .../recipes/integrated_circuit_tin_tech.json | 4 +- .../recipes/laser_turret_diamond_emerald.json | 4 +- .../recipes/laser_turret_emerald_diamond.json | 4 +- .../lead_acid_battery_dust_sulfur.json | 4 +- .../recipes/lead_acid_battery_sulfur.json | 4 +- .../advancements/recipes/led_bar.json | 4 +- .../advancements/recipes/lithium_battery.json | 4 +- .../recipes/lithium_ingot_from_nuggets.json | 4 +- .../recipes/lithium_ingot_from_ore.json | 6 +- .../recipes/lithium_ingot_from_powder.json | 32 +++++ .../advancements/recipes/lithium_nuggets.json | 4 +- .../recipes/nickel_hydride_battery.json | 4 +- .../recipes/photovoltaic_generator.json | 4 +- .../recipes/plastic_refinery.json | 4 +- .../power_supply_unit_iron_normal.json | 4 +- ...r_supply_unit_plate_steel_apocalyptic.json | 4 +- .../power_supply_unit_plate_steel_tech.json | 4 +- .../power_supply_unit_steel_normal.json | 4 +- .../advancements/recipes/silicon_blend.json | 4 +- .../recipes/silicon_ingot_from_blend.json | 32 +++++ .../recipes/solder_blend_tin_lead.json | 4 +- .../recipes/solder_blend_tin_silver.json | 4 +- .../recipes/solder_from_blend.json | 6 +- .../recipes/steam_powered_generator.json | 4 +- .../blocks/electric_battery_array.json} | 2 +- .../loot_tables/blocks/electric_conduit.json | 19 +++ .../loot_tables/blocks/electric_crusher.json | 19 +++ .../loot_tables/blocks/electric_drill.json | 19 +++ .../blocks/electric_fabricator.json} | 2 +- .../loot_tables/blocks/electric_furnace.json | 19 +++ .../loot_tables/blocks/electric_oven.json | 2 +- .../loot_tables/blocks/electric_pump.json | 2 +- .../loot_tables/blocks/electric_still.json | 19 +++ .../loot_tables/blocks/electric_switch.json | 19 +++ .../loot_tables/blocks/electric_track.json | 19 +++ .../loot_tables/blocks/growth_chamber.json | 19 +++ .../blocks/growth_chamber_controller.json} | 2 +- .../blocks/hydroelectric_generator.json} | 2 +- .../loot_tables/blocks/laser_turret.json | 2 +- .../loot_tables/blocks/laser_turret_evil.json | 19 +++ .../loot_tables/blocks/led_bar.json | 2 +- .../blocks/photovoltaic_generator.json} | 2 +- .../loot_tables/blocks/plastic_refinery.json | 19 +++ .../blocks/steam_powered_generator.json} | 2 +- .../loot_tables/chests/advantage_parts.json | 18 +-- .../recipes/alkaline_battery.json | 10 +- .../blank_circuit_board_ingot_normal.json | 10 +- .../recipes/blank_circuit_board_plate.json | 8 +- .../recipes/control_circuit.json | 10 +- .../recipes/crushing_control_circuit.json | 20 +++ .../recipes/crushing_electric_furnace.json | 6 +- .../recipes/crushing_lithium_ingot.json | 4 +- .../recipes/crushing_lithium_ore.json | 4 +- .../crushing_photovoltaic_generator.json | 6 +- .../recipes/crushing_psu.json | 6 +- .../crushing_steam_powered_generator.json | 6 +- .../recipes/crushing_sulfur_ore.json | 4 +- .../recipes/electric_battery_array.json | 10 +- .../electric_conduit_plastic_ingot.json | 8 +- .../recipes/electric_conduit_plastic_rod.json | 8 +- .../electric_conduit_rubber_ingot.json | 8 +- .../recipes/electric_conduit_rubber_rod.json | 8 +- .../recipes/electric_crusher.json | 14 +- .../recipes/electric_drill.json | 12 +- .../recipes/electric_fabricator.json | 10 +- .../recipes/electric_furnace.json | 6 +- .../recipes/electric_oven.json | 12 +- .../recipes/electric_pump.json | 10 +- .../recipes/electric_still.json | 10 +- .../recipes/electric_switch.json | 8 +- .../baseelectric/recipes/electric_track.json | 15 ++ .../recipes/growth_chamber.json | 12 +- .../recipes/growth_chamber_controller.json | 12 +- .../recipes/hydroelectric_generator.json | 12 +- .../integrated_circuit_copper_normal.json | 10 +- .../integrated_circuit_copper_tech.json | 14 +- .../integrated_circuit_gold_normal.json | 10 +- .../recipes/integrated_circuit_gold_tech.json | 14 +- .../integrated_circuit_tin_normal.json | 10 +- .../recipes/integrated_circuit_tin_tech.json | 14 +- .../recipes/laser_turret_diamond_emerald.json | 14 +- .../recipes/laser_turret_emerald_diamond.json | 14 +- .../lead_acid_battery_dust_sulfur.json | 10 +- .../recipes/lead_acid_battery_sulfur.json | 10 +- .../recipes/led_bar.json | 10 +- .../recipes/lithium_battery.json | 12 +- .../recipes/lithium_ingot_from_nuggets.json | 6 +- .../recipes/lithium_ingot_from_ore.json | 6 +- .../recipes/lithium_ingot_from_powder.json | 11 ++ .../recipes/lithium_nuggets.json | 6 +- .../recipes/nickel_hydride_battery.json | 10 +- .../recipes/photovoltaic_generator.json | 14 +- .../recipes/plastic_refinery.json | 12 +- .../power_supply_unit_iron_normal.json | 12 +- ...r_supply_unit_plate_steel_apocalyptic.json | 12 +- .../power_supply_unit_plate_steel_tech.json | 12 +- .../power_supply_unit_steel_normal.json | 12 +- .../recipes/silicon_blend.json | 8 +- .../recipes/silicon_ingot_from_blend.json | 11 ++ .../recipes/solder_blend_tin_lead.json | 8 +- .../recipes/solder_blend_tin_silver.json | 8 +- .../recipes/solder_from_blend.json | 6 +- .../recipes/steam_powered_generator.json | 14 +- .../advancements/recipes/electric_track.json | 43 ------ .../recipes/lithium_ingot_from_powder.json | 32 ----- .../recipes/silicon_ingot_from_blend.json | 32 ----- .../blocks/electric_battery_array.json | 19 --- .../loot_tables/blocks/electric_switch.json | 19 --- .../loot_tables/blocks/electric_track.json | 19 --- .../loot_tables/blocks/growth_chamber.json | 19 --- .../blocks/growth_chamber_controller.json | 19 --- .../blocks/hydroelectric_generator.json | 19 --- .../loot_tables/blocks/laser_turret_evil.json | 19 --- .../blocks/photovoltaic_generator.json | 19 --- .../loot_tables/blocks/plastic_refinery.json | 19 --- .../blocks/steam_powered_generator.json | 19 --- .../recipes/crushing_control_circuit.json | 20 --- .../recipes/electric_track.json | 15 -- .../recipes/lithium_ingot_from_powder.json | 11 -- .../recipes/silicon_ingot_from_blend.json | 11 -- .../data/forge/tags/blocks/ores/lithium.json | 2 +- .../data/forge/tags/blocks/ores/sulfur.json | 2 +- .../data/forge/tags/items/circuit_boards.json | 2 +- .../data/forge/tags/items/dusts/lithium.json | 2 +- .../data/forge/tags/items/dusts/sulfur.json | 2 +- .../data/forge/tags/items/ingots/lithium.json | 2 +- .../data/forge/tags/items/ingots/plastic.json | 2 +- .../data/forge/tags/items/ingots/silicon.json | 2 +- .../data/forge/tags/items/microchips.json | 2 +- .../forge/tags/items/nuggets/lithium.json | 2 +- .../data/forge/tags/items/ores/lithium.json | 2 +- .../data/forge/tags/items/ores/sulfur.json | 2 +- .../data/forge/tags/items/plastic.json | 2 +- .../forge/tags/items/power_supply_units.json | 2 +- .../data/forge/tags/items/solder.json | 2 +- .../data/forge/tags/items/sulfur.json | 2 +- .../data/forge/tags/items/wires.json | 2 +- .../blocks/NativeBlockContractTest.java | 10 +- .../blocks/OreHarvestContractTest.java | 2 +- ...tricOperationalHydroturbineAnchorTest.java | 6 +- .../entities/HydroturbinePersistenceTest.java | 4 +- .../graphics/RendererBufferContractTest.java | 8 +- .../gui/GUIHelperTest.java | 2 +- .../init/OreSpawnWorldGenTest.java | 6 +- .../init/VillagesTest.java | 2 +- .../ElectricDrillPersistenceTest.java | 2 +- .../ElectricOperationalNativeDefectsTest.java | 4 +- .../ElectricOperationalPumpPickupTest.java | 4 +- .../ElectricOperationalRedstoneCacheTest.java | 2 +- ...ElectricOperationalSoundBroadcastTest.java | 2 +- .../ElectricOperationalStillCapacityTest.java | 6 +- .../GrowthChamberPersistenceTest.java | 2 +- .../machines/LaserTurretGeometryTest.java | 2 +- .../ElectricLegacyMigrationsTest.java | 29 ++++ .../recipe/RecipeConditionsTest.java | 6 +- .../resources/BlockLootResourceTest.java | 8 +- .../resources/BuildWorkflowContractTest.java | 12 +- .../resources/ClientResourceContractTest.java | 8 +- .../RecipeRegistrationThreadTest.java | 6 +- .../resources/RecipeResourceTest.java | 6 +- .../resources/RecipeUnlockContractTest.java | 4 +- .../ElectricLegacyMigrationsTest.java | 29 ---- tools/verification/AuditedJUnit.java | 2 +- tools/verification/Verify-ElectricEcj.ps1 | 6 +- tools/verify-native-port.js | 12 +- 692 files changed, 4004 insertions(+), 4002 deletions(-) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/Data.java (79%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/ElectricAdvantage.java (80%) 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 (91%) 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 (97%) 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}/config/ElectricAdvantageConfig.java (88%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/entities/HydroturbineEntity.java (93%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/graphics/BufferedQuads.java (97%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/graphics/ClientRegistration.java (84%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/graphics/ElectricRenderTypes.java (90%) 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 (95%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/graphics/LaserTurretRenderer.java (96%) 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 (75%) 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 (78%) 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 (94%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/init/OreSpawnWorldGen.java (96%) 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 (88%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/init/TreasureChests.java (89%) 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 (93%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricCrusherBlock.java (89%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricCrusherTileEntity.java (93%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricDrillBlock.java (96%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricDrillTileEntity.java (97%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricFabricatorBlock.java (83%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricFabricatorTileEntity.java (95%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricFurnaceBlock.java (85%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricFurnaceTileEntity.java (93%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricGeneratorBlock.java (97%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricGeneratorTileEntity.java (97%) 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 (98%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricOvenBlock.java (85%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricOvenTileEntity.java (92%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricPumpBlock.java (89%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricPumpTileEntity.java (93%) 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 (94%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/GrowthChamberBlock.java (78%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/GrowthChamberControllerBlock.java (92%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/GrowthChamberControllerTileEntity.java (97%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/GrowthChamberTileEntity.java (94%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/HydroelectricGeneratorBlock.java (92%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/HydroelectricGeneratorTileEntity.java (89%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/LEDBlock.java (93%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/LEDTileEntity.java (89%) 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 (92%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/PhotovoltaicGeneratorTileEntity.java (92%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/PlasticRefineryBlock.java (84%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/PlasticRefineryTileEntity.java (95%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/SteamPoweredElectricGeneratorBlock.java (90%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/SteamPoweredElectricGeneratorTileEntity.java (92%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/migration/ElectricLegacyMigrations.java (65%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/recipe/RecipeConditions.java (91%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/util/LegacyFluidHandler.java (82%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/util/crafting/ItemMatcher.java (98%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/util/crafting/ItemRecord.java (92%) rename src/main/java/zone/moddev/mc/{electricadvantage => baseelectric}/util/crafting/RecipeDeconstructor.java (97%) 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.json create mode 100644 src/main/resources/assets/baseelectric/lang/en_au.json create mode 100644 src/main/resources/assets/baseelectric/lang/en_ca.json create mode 100644 src/main/resources/assets/baseelectric/lang/en_en.json create mode 100644 src/main/resources/assets/baseelectric/lang/en_gb.json create mode 100644 src/main/resources/assets/baseelectric/lang/en_pt.json create mode 100644 src/main/resources/assets/baseelectric/lang/en_us.json create mode 100644 src/main/resources/assets/baseelectric/lang/es_es.json create mode 100644 src/main/resources/assets/baseelectric/lang/es_mx.json create mode 100644 src/main/resources/assets/baseelectric/lang/it_it.json create mode 100644 src/main/resources/assets/baseelectric/lang/ja_jp.json create mode 100644 src/main/resources/assets/baseelectric/lang/ko_ko.json create mode 100644 src/main/resources/assets/baseelectric/lang/pt_br.json create mode 100644 src/main/resources/assets/baseelectric/lang/zh_cn.json 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 create mode 100644 src/main/resources/assets/baseelectric/models/item/generic_item.json 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 (100%) 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 (100%) 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 (100%) 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 (100%) 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 (100%) 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.json delete mode 100644 src/main/resources/assets/electricadvantage/lang/en_au.json delete mode 100644 src/main/resources/assets/electricadvantage/lang/en_ca.json delete mode 100644 src/main/resources/assets/electricadvantage/lang/en_en.json delete mode 100644 src/main/resources/assets/electricadvantage/lang/en_gb.json delete mode 100644 src/main/resources/assets/electricadvantage/lang/en_pt.json delete mode 100644 src/main/resources/assets/electricadvantage/lang/en_us.json delete mode 100644 src/main/resources/assets/electricadvantage/lang/es_es.json delete mode 100644 src/main/resources/assets/electricadvantage/lang/es_mx.json delete mode 100644 src/main/resources/assets/electricadvantage/lang/it_it.json delete mode 100644 src/main/resources/assets/electricadvantage/lang/ja_jp.json delete mode 100644 src/main/resources/assets/electricadvantage/lang/ko_ko.json delete mode 100644 src/main/resources/assets/electricadvantage/lang/pt_br.json delete mode 100644 src/main/resources/assets/electricadvantage/lang/zh_cn.json 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/generic_item.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/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/alkaline_battery.json (92%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/blank_circuit_board_ingot_normal.json (84%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/blank_circuit_board_plate.json (86%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/control_circuit.json (85%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/electric_battery_array.json (91%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/electric_conduit_plastic_ingot.json (85%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/electric_conduit_plastic_rod.json (85%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/electric_conduit_rubber_ingot.json (85%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/electric_conduit_rubber_rod.json (85%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/electric_crusher.json (93%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/electric_drill.json (92%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/electric_fabricator.json (92%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/electric_furnace.json (88%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/electric_oven.json (92%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/electric_pump.json (93%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/electric_still.json (92%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/electric_switch.json (90%) create mode 100644 src/main/resources/data/baseelectric/advancements/recipes/electric_track.json rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/growth_chamber.json (93%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/growth_chamber_controller.json (92%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/hydroelectric_generator.json (91%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/integrated_circuit_copper_normal.json (84%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/integrated_circuit_copper_tech.json (90%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/integrated_circuit_gold_normal.json (85%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/integrated_circuit_gold_tech.json (90%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/integrated_circuit_tin_normal.json (85%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/integrated_circuit_tin_tech.json (90%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/laser_turret_diamond_emerald.json (92%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/laser_turret_emerald_diamond.json (92%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/lead_acid_battery_dust_sulfur.json (90%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/lead_acid_battery_sulfur.json (91%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/led_bar.json (92%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/lithium_battery.json (92%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/lithium_ingot_from_nuggets.json (80%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/lithium_ingot_from_ore.json (74%) create mode 100644 src/main/resources/data/baseelectric/advancements/recipes/lithium_ingot_from_powder.json rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/lithium_nuggets.json (83%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/nickel_hydride_battery.json (91%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/photovoltaic_generator.json (91%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/plastic_refinery.json (93%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/power_supply_unit_iron_normal.json (88%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/power_supply_unit_plate_steel_apocalyptic.json (86%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/power_supply_unit_plate_steel_tech.json (87%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/power_supply_unit_steel_normal.json (88%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/silicon_blend.json (88%) create mode 100644 src/main/resources/data/baseelectric/advancements/recipes/silicon_ingot_from_blend.json rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/solder_blend_tin_lead.json (86%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/solder_blend_tin_silver.json (86%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/solder_from_blend.json (75%) rename src/main/resources/data/{electricadvantage => baseelectric}/advancements/recipes/steam_powered_generator.json (92%) rename src/main/resources/data/{electricadvantage/loot_tables/blocks/electric_furnace.json => baseelectric/loot_tables/blocks/electric_battery_array.json} (82%) create mode 100644 src/main/resources/data/baseelectric/loot_tables/blocks/electric_conduit.json create mode 100644 src/main/resources/data/baseelectric/loot_tables/blocks/electric_crusher.json create mode 100644 src/main/resources/data/baseelectric/loot_tables/blocks/electric_drill.json rename src/main/resources/data/{electricadvantage/loot_tables/blocks/electric_still.json => baseelectric/loot_tables/blocks/electric_fabricator.json} (83%) create mode 100644 src/main/resources/data/baseelectric/loot_tables/blocks/electric_furnace.json rename src/main/resources/data/{electricadvantage => baseelectric}/loot_tables/blocks/electric_oven.json (83%) rename src/main/resources/data/{electricadvantage => baseelectric}/loot_tables/blocks/electric_pump.json (83%) create mode 100644 src/main/resources/data/baseelectric/loot_tables/blocks/electric_still.json create mode 100644 src/main/resources/data/baseelectric/loot_tables/blocks/electric_switch.json create mode 100644 src/main/resources/data/baseelectric/loot_tables/blocks/electric_track.json create mode 100644 src/main/resources/data/baseelectric/loot_tables/blocks/growth_chamber.json rename src/main/resources/data/{electricadvantage/loot_tables/blocks/electric_fabricator.json => baseelectric/loot_tables/blocks/growth_chamber_controller.json} (81%) rename src/main/resources/data/{electricadvantage/loot_tables/blocks/electric_crusher.json => baseelectric/loot_tables/blocks/hydroelectric_generator.json} (82%) rename src/main/resources/data/{electricadvantage => baseelectric}/loot_tables/blocks/laser_turret.json (84%) create mode 100644 src/main/resources/data/baseelectric/loot_tables/blocks/laser_turret_evil.json rename src/main/resources/data/{electricadvantage => baseelectric}/loot_tables/blocks/led_bar.json (85%) rename src/main/resources/data/{electricadvantage/loot_tables/blocks/electric_conduit.json => baseelectric/loot_tables/blocks/photovoltaic_generator.json} (82%) create mode 100644 src/main/resources/data/baseelectric/loot_tables/blocks/plastic_refinery.json rename src/main/resources/data/{electricadvantage/loot_tables/blocks/electric_drill.json => baseelectric/loot_tables/blocks/steam_powered_generator.json} (82%) rename src/main/resources/data/{electricadvantage => baseelectric}/loot_tables/chests/advantage_parts.json (84%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/alkaline_battery.json (67%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/blank_circuit_board_ingot_normal.json (58%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/blank_circuit_board_plate.json (60%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/control_circuit.json (54%) create mode 100644 src/main/resources/data/baseelectric/recipes/crushing_control_circuit.json rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/crushing_electric_furnace.json (63%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/crushing_lithium_ingot.json (75%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/crushing_lithium_ore.json (75%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/crushing_photovoltaic_generator.json (62%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/crushing_psu.json (63%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/crushing_steam_powered_generator.json (62%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/crushing_sulfur_ore.json (74%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/electric_battery_array.json (66%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/electric_conduit_plastic_ingot.json (65%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/electric_conduit_plastic_rod.json (62%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/electric_conduit_rubber_ingot.json (64%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/electric_conduit_rubber_rod.json (62%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/electric_crusher.json (66%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/electric_drill.json (67%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/electric_fabricator.json (67%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/electric_furnace.json (68%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/electric_oven.json (68%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/electric_pump.json (70%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/electric_still.json (70%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/electric_switch.json (66%) create mode 100644 src/main/resources/data/baseelectric/recipes/electric_track.json rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/growth_chamber.json (68%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/growth_chamber_controller.json (66%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/hydroelectric_generator.json (66%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/integrated_circuit_copper_normal.json (62%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/integrated_circuit_copper_tech.json (64%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/integrated_circuit_gold_normal.json (61%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/integrated_circuit_gold_tech.json (64%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/integrated_circuit_tin_normal.json (61%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/integrated_circuit_tin_tech.json (64%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/laser_turret_diamond_emerald.json (66%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/laser_turret_emerald_diamond.json (66%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/lead_acid_battery_dust_sulfur.json (67%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/lead_acid_battery_sulfur.json (66%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/led_bar.json (66%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/lithium_battery.json (66%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/lithium_ingot_from_nuggets.json (66%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/lithium_ingot_from_ore.json (50%) create mode 100644 src/main/resources/data/baseelectric/recipes/lithium_ingot_from_powder.json rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/lithium_nuggets.json (62%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/nickel_hydride_battery.json (66%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/photovoltaic_generator.json (63%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/plastic_refinery.json (67%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/power_supply_unit_iron_normal.json (64%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/power_supply_unit_plate_steel_apocalyptic.json (64%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/power_supply_unit_plate_steel_tech.json (64%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/power_supply_unit_steel_normal.json (64%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/silicon_blend.json (60%) create mode 100644 src/main/resources/data/baseelectric/recipes/silicon_ingot_from_blend.json rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/solder_blend_tin_lead.json (65%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/solder_blend_tin_silver.json (66%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/solder_from_blend.json (50%) rename src/main/resources/data/{electricadvantage => baseelectric}/recipes/steam_powered_generator.json (65%) delete mode 100644 src/main/resources/data/electricadvantage/advancements/recipes/electric_track.json delete mode 100644 src/main/resources/data/electricadvantage/advancements/recipes/lithium_ingot_from_powder.json delete mode 100644 src/main/resources/data/electricadvantage/advancements/recipes/silicon_ingot_from_blend.json delete mode 100644 src/main/resources/data/electricadvantage/loot_tables/blocks/electric_battery_array.json delete mode 100644 src/main/resources/data/electricadvantage/loot_tables/blocks/electric_switch.json delete mode 100644 src/main/resources/data/electricadvantage/loot_tables/blocks/electric_track.json delete mode 100644 src/main/resources/data/electricadvantage/loot_tables/blocks/growth_chamber.json delete mode 100644 src/main/resources/data/electricadvantage/loot_tables/blocks/growth_chamber_controller.json delete mode 100644 src/main/resources/data/electricadvantage/loot_tables/blocks/hydroelectric_generator.json delete mode 100644 src/main/resources/data/electricadvantage/loot_tables/blocks/laser_turret_evil.json delete mode 100644 src/main/resources/data/electricadvantage/loot_tables/blocks/photovoltaic_generator.json delete mode 100644 src/main/resources/data/electricadvantage/loot_tables/blocks/plastic_refinery.json delete mode 100644 src/main/resources/data/electricadvantage/loot_tables/blocks/steam_powered_generator.json delete mode 100644 src/main/resources/data/electricadvantage/recipes/crushing_control_circuit.json delete mode 100644 src/main/resources/data/electricadvantage/recipes/electric_track.json delete mode 100644 src/main/resources/data/electricadvantage/recipes/lithium_ingot_from_powder.json delete mode 100644 src/main/resources/data/electricadvantage/recipes/silicon_ingot_from_blend.json rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/blocks/NativeBlockContractTest.java (93%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/blocks/OreHarvestContractTest.java (98%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/entities/ElectricOperationalHydroturbineAnchorTest.java (95%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/entities/HydroturbinePersistenceTest.java (96%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/graphics/RendererBufferContractTest.java (97%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/gui/GUIHelperTest.java (95%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/init/OreSpawnWorldGenTest.java (81%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/init/VillagesTest.java (97%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricDrillPersistenceTest.java (98%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/ElectricOperationalNativeDefectsTest.java (98%) 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 (99%) 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 (93%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/GrowthChamberPersistenceTest.java (97%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/machines/LaserTurretGeometryTest.java (96%) create mode 100644 src/test/java/zone/moddev/mc/baseelectric/migration/ElectricLegacyMigrationsTest.java rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/recipe/RecipeConditionsTest.java (92%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/resources/BlockLootResourceTest.java (87%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/resources/BuildWorkflowContractTest.java (88%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/resources/ClientResourceContractTest.java (92%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/resources/RecipeRegistrationThreadTest.java (91%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/resources/RecipeResourceTest.java (91%) rename src/test/java/zone/moddev/mc/{electricadvantage => baseelectric}/resources/RecipeUnlockContractTest.java (98%) delete mode 100644 src/test/java/zone/moddev/mc/electricadvantage/migration/ElectricLegacyMigrationsTest.java diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3275320..8601dd9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ permissions: contents: read concurrency: - group: electricadvantage-1.16-${{ github.workflow }}-${{ github.ref }} + group: baseelectric-1.16-${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: @@ -31,7 +31,7 @@ jobs: set -euo pipefail power_ref="$(sed -n 's/^poweradvantage_source_ref=//p' gradle.properties | tr -d '\r')" power_sha="$(sed -n 's/^poweradvantage_deobf_sha256=//p' gradle.properties | tr -d '\r')" - if [[ "$power_ref" != "bcb75bfa91c14751ebf1e31865e1ec0ffa82c0b7" || "$power_sha" != "2FB923944A456B4F26AB2F9212C646469CE3F49BFD4DAE894C15559B48908386" ]]; then + if [[ "$power_ref" != "a21d0653129912e8d45bc443080b211eb09ae88c" || "$power_sha" != "156674F6DF6007D351AD419416344356F6586452077FCAE2E9BC9404EE14A14B" ]]; then echo "PowerAdvantage 1.16.5 source/deobf pin differs from the audited candidate" >&2 exit 1 fi @@ -51,9 +51,9 @@ jobs: - name: Check out PowerAdvantage 1.16.5 uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: - repository: MinecraftModDevelopmentMods/PowerAdvantage + repository: MinecraftModDevelopmentMods/basePower # Local-only Power source; publish upstream before hosted builds. - ref: bcb75bfa91c14751ebf1e31865e1ec0ffa82c0b7 + ref: a21d0653129912e8d45bc443080b211eb09ae88c path: .ci-dependencies/PowerAdvantage - name: Install pinned Java 25 Mavenizer runtime uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 @@ -95,7 +95,7 @@ jobs: (cd "$power" && ./gradlew $MMD_GRADLE_TOOLCHAINS jar verifyReleaseDependencies \ -PbaseMetalsDeobfJar="$bmjar" -PoreSpawnDeobfJar="$osjar" \ --no-daemon --stacktrace) - powerjar="$power/build/libs-dev/PowerAdvantage-2.4.7.116051-deobf.jar" + powerjar="$power/build/libs-dev/basePower-2.4.8.116051-deobf.jar" test -f "$osjar" && test -f "$bmjar" && test -f "$powerjar" echo "orespawn=$osjar" >> "$GITHUB_OUTPUT" echo "basemetals=$bmjar" >> "$GITHUB_OUTPUT" @@ -117,9 +117,9 @@ jobs: if-no-files-found: error retention-days: 30 path: | - build/libs/ElectricAdvantage-2.2.8.116051.jar - build/libs/ElectricAdvantage-2.2.8.116051-sources.jar - build/libs/ElectricAdvantage-2.2.8.116051-javadoc.jar + build/libs/baseElectric-2.2.9.116051.jar + build/libs/baseElectric-2.2.9.116051-sources.jar + build/libs/baseElectric-2.2.9.116051-javadoc.jar build/release/SHA256SUMS CHANGELOG.txt - name: Upload diagnostics on failure diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index ac3e2db..0c20f7f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -31,7 +31,7 @@ jobs: set -euo pipefail power_ref="$(sed -n 's/^poweradvantage_source_ref=//p' gradle.properties | tr -d '\r')" power_sha="$(sed -n 's/^poweradvantage_deobf_sha256=//p' gradle.properties | tr -d '\r')" - if [[ "$power_ref" != "bcb75bfa91c14751ebf1e31865e1ec0ffa82c0b7" || "$power_sha" != "2FB923944A456B4F26AB2F9212C646469CE3F49BFD4DAE894C15559B48908386" ]]; then + if [[ "$power_ref" != "a21d0653129912e8d45bc443080b211eb09ae88c" || "$power_sha" != "156674F6DF6007D351AD419416344356F6586452077FCAE2E9BC9404EE14A14B" ]]; then echo "PowerAdvantage 1.16.5 source/deobf pin differs from the audited candidate" >&2 exit 1 fi @@ -51,9 +51,9 @@ jobs: - name: Check out PowerAdvantage 1.16.5 uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: - repository: MinecraftModDevelopmentMods/PowerAdvantage + repository: MinecraftModDevelopmentMods/basePower # Local-only Power source; publish upstream before hosted builds. - ref: bcb75bfa91c14751ebf1e31865e1ec0ffa82c0b7 + ref: a21d0653129912e8d45bc443080b211eb09ae88c path: .ci-dependencies/PowerAdvantage - name: Install pinned Java 25 Mavenizer runtime uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 @@ -95,7 +95,7 @@ jobs: (cd "$power" && ./gradlew $MMD_GRADLE_TOOLCHAINS jar verifyReleaseDependencies \ -PbaseMetalsDeobfJar="$bmjar" -PoreSpawnDeobfJar="$osjar" \ --no-daemon --stacktrace) - powerjar="$power/build/libs-dev/PowerAdvantage-2.4.7.116051-deobf.jar" + powerjar="$power/build/libs-dev/basePower-2.4.8.116051-deobf.jar" test -f "$osjar" && test -f "$bmjar" && test -f "$powerjar" echo "orespawn=$osjar" >> "$GITHUB_OUTPUT" echo "basemetals=$bmjar" >> "$GITHUB_OUTPUT" diff --git a/.github/workflows/release-on-tag.yml b/.github/workflows/release-on-tag.yml index e545334..f6bc03a 100644 --- a/.github/workflows/release-on-tag.yml +++ b/.github/workflows/release-on-tag.yml @@ -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 diff --git a/CHANGELOG.txt b/CHANGELOG.txt index fc7cb5b..c6d7f08 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,8 @@ +baseElectric 2.2.9.116051 (Minecraft 1.16.5) + +- Bring baseElectric to Minecraft 1.16.5 and use the shared basePower creative tab. +- Map legacy Electric Advantage blocks, items and saved machine state to baseElectric when upgrading. + Electric Advantage 2.2.8.116051 (local port candidate) - Check generator redstone before the first power pulse so a disabled solar panel cannot produce a startup burst. diff --git a/README.md b/README.md index caf01a4..2a6bdac 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Electric Advantage +# baseElectric -**Minecraft 1.16.5 source port candidate, version 2.2.8.116051.** +**Minecraft 1.16.5 local test candidate, version 2.2.9.116051.** The follow-up checks measure finite machine jobs, energy and fluid conservation, blocked routes, real turret hits and full-process restarts. Rendered GUI checks require the correct labels as well as correctly placed controls. The shared @@ -14,8 +14,9 @@ records the exact jars, completed checks and remaining limits. The [accepted 1.15 record](https://github.com/MinecraftModDevelopmentMods/PowerAdvantage/blob/master-1.15.2/docs/1.15/CURRENT-QUALIFICATION.md) is a behavior reference, not evidence that this target passes. -Electric Advantage adds electric machines, generation, storage, automation, -and defence to Power Advantage for Minecraft 1.16.5. +baseElectric continues DrCyano's Electric Advantage. It adds electric +generation, storage, machinery and defence to basePower. Back up your world +before upgrading; the port maps legacy Electric Advantage blocks and saved state. ## Build Target @@ -28,12 +29,12 @@ inference and downloads. Build inputs are separate, non-embedded deobfuscated jars: -- Power Advantage `2.4.7.116051`: source `bcb75bfa91c14751ebf1e31865e1ec0ffa82c0b7`. +- Power Advantage `2.4.7.116051`: source `a21d0653129912e8d45bc443080b211eb09ae88c`. - Base Metals `3.1.1.116051`: source `995f6cc4dd2d5eecc628a42e5c43fa5390c24bca`. - OreSpawn `4.1.0.116051`: source `a113e5d767169189f0e35ade1e173a12d550b00e`. Exact checksums are recorded in `gradle.properties`. Power deobf SHA-256 is -`2FB923944A456B4F26AB2F9212C646469CE3F49BFD4DAE894C15559B48908386`. +`156674F6DF6007D351AD419416344356F6586452077FCAE2E9BC9404EE14A14B`. The pinned Power source is available upstream. Do not bypass the release audits or substitute a preliminary jar. Use immutable copies for verification, not a sibling's output that another diff --git a/build.gradle b/build.gradle index 85a70eb..ef75a14 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+/ }) { @@ -101,7 +101,7 @@ minecraft { workingDir.convention layout.projectDirectory.dir(configuredRunDirectory) systemProperty 'forge.logging.markers', 'REGISTRIES' systemProperty 'forge.logging.console.level', 'info' - mods { electricadvantage { source sourceSets.main } } + mods { baseelectric { source sourceSets.main } } environment 'target', forge36RunTargets[name] environment 'MCP_MAPPINGS', "${mapping_channel}_${mapping_version}" environment 'MCP_VERSION', mcp_version @@ -166,7 +166,7 @@ repositories { // Local builds use the sibling FG7 output; CI supplies the same pinned jar via // -PpowerAdvantageDeobfJar after building the audited upstream commit. def defaultPowerAdvantageDeobfJar = file("../../PowerAdvantage/build/libs-dev/" \ - + "PowerAdvantage-${project.poweradvantage_version}-deobf.jar") + + "basePower-${project.poweradvantage_version}-deobf.jar") def powerAdvantageDeobfJar = providers.gradleProperty('powerAdvantageDeobfJar') .map { file(it) } .getOrElse(defaultPowerAdvantageDeobfJar) @@ -344,7 +344,7 @@ tasks.register('verifyReleaseConfiguration') { if (new JsonSlurper().parse(file('src/main/resources/pack.mcmeta')).pack.pack_format != 6) { throw new GradleException('Minecraft 1.16.5 resources must use pack format 6') } - if (project.mod_version != '2.2.8.116051') { + if (project.mod_version != '2.2.9.116051') { throw new GradleException("Unexpected ElectricAdvantage release version: ${project.mod_version}") } if (project.minecraft_version != '1.16.5' @@ -360,14 +360,14 @@ 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.group.toString() != 'zone.moddev.mc.baseelectric' + || base.archivesName.get() != 'baseElectric' || project.mod_license != 'GPL-3.0-only' - || project.curseforge_project_id != '240985') { + || project.curseforge_project_id != '1783006') { throw new GradleException('Unexpected Forge, Maven, archive, or CurseForge identity') } - if (project.cf_requirements != 'power-advantage,base-metals' + if (project.cf_requirements != 'basepower,base-metals' || project.cf_optionals != '' || project.cf_versions != '1.16.5') { throw new GradleException('Unexpected CurseForge dependency or game-version metadata') @@ -375,10 +375,10 @@ tasks.register('verifyReleaseConfiguration') { if (!project.poweradvantage_source_ref || !project.poweradvantage_deobf_sha256) { throw new GradleException('PowerAdvantage 1.16.5 final source and deobf SHA-256 pins are pending') } - if (project.poweradvantage_version != '2.4.7.116051' - || project.poweradvantage_source_repository != 'MinecraftModDevelopmentMods/PowerAdvantage' - || project.poweradvantage_source_ref != 'bcb75bfa91c14751ebf1e31865e1ec0ffa82c0b7' - || project.poweradvantage_deobf_sha256 != '2FB923944A456B4F26AB2F9212C646469CE3F49BFD4DAE894C15559B48908386') { + if (project.poweradvantage_version != '2.4.8.116051' + || project.poweradvantage_source_repository != 'MinecraftModDevelopmentMods/basePower' + || project.poweradvantage_source_ref != 'a21d0653129912e8d45bc443080b211eb09ae88c' + || project.poweradvantage_deobf_sha256 != '156674F6DF6007D351AD419416344356F6586452077FCAE2E9BC9404EE14A14B') { throw new GradleException('Unexpected PowerAdvantage compile dependency identity') } if (project.basemetals_version != '3.1.1.116051' @@ -391,14 +391,14 @@ tasks.register('verifyReleaseConfiguration') { throw new GradleException('Unexpected native dependency pins') } 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.8.116051"')) { + 'src/main/java/zone/moddev/mc/baseelectric/ElectricAdvantage.java').getText('UTF-8') + if (!mainSource.contains('MODID = "baseelectric"') + || !mainSource.contains('VERSION = "2.2.9.116051"')) { throw new GradleException('ElectricAdvantage source identity changed') } String metadata = file('src/main/resources/META-INF/mods.toml').getText('UTF-8').replace('\r\n', '\n') - ['modId="electricadvantage"', 'modId="poweradvantage"', 'modId="basemetals"', - 'versionRange="[2.4.7.116051,3.0.0)"'].each { marker -> + ['modId="baseelectric"', 'modId="basepower"', 'modId="basemetals"', + 'versionRange="[2.4.8.116051,3.0.0)"'].each { marker -> if (!metadata.contains(marker)) { throw new GradleException("Source mods.toml is missing ${marker}") } @@ -424,8 +424,8 @@ tasks.register('verifyReleaseDependencies') { ['cyano/poweradvantage/api/PoweredEntity.class', 'cyano/poweradvantage/api/GUIBlock.class', 'cyano/poweradvantage/api/FluidCategoryRegistry.class', - 'zone/moddev/mc/poweradvantage/conduitnetwork/ConduitRegistry.class', - 'zone/moddev/mc/poweradvantage/init/Fluids.class'].each { required -> + 'zone/moddev/mc/basepower/conduitnetwork/ConduitRegistry.class', + 'zone/moddev/mc/basepower/init/Fluids.class'].each { required -> if (zip.getEntry(required) == null) { throw new GradleException("PowerAdvantage dependency is missing ${required}") } @@ -513,19 +513,19 @@ tasks.register('verifyReleaseArtifacts') { new ZipFile(mainJar).withCloseable { zip -> List names = zip.entries().collect { it.name } ['META-INF/mods.toml', 'pack.mcmeta', - 'zone/moddev/mc/electricadvantage/ElectricAdvantage.class', - 'zone/moddev/mc/electricadvantage/machines/ElectricDrillTileEntity.class', - 'zone/moddev/mc/electricadvantage/machines/ElectricPumpTileEntity.class', - 'zone/moddev/mc/electricadvantage/machines/HydroelectricGeneratorTileEntity.class', - 'zone/moddev/mc/electricadvantage/migration/ElectricLegacyMigrations.class', - 'zone/moddev/mc/electricadvantage/init/OreSpawnWorldGen.class', - 'zone/moddev/mc/electricadvantage/init/Villages.class', - 'zone/moddev/mc/electricadvantage/recipe/RecipeConditions$ModeSerializer.class', - 'assets/electricadvantage/lang/en_us.json', - 'data/electricadvantage/loot_tables/blocks/electric_drill.json', - 'data/electricadvantage/loot_tables/blocks/electric_conduit.json', - 'data/electricadvantage/recipes/electric_conduit_plastic_ingot.json', - 'data/electricadvantage/advancements/recipes/integrated_circuit_copper_normal.json', + 'zone/moddev/mc/baseelectric/ElectricAdvantage.class', + 'zone/moddev/mc/baseelectric/machines/ElectricDrillTileEntity.class', + 'zone/moddev/mc/baseelectric/machines/ElectricPumpTileEntity.class', + 'zone/moddev/mc/baseelectric/machines/HydroelectricGeneratorTileEntity.class', + 'zone/moddev/mc/baseelectric/migration/ElectricLegacyMigrations.class', + 'zone/moddev/mc/baseelectric/init/OreSpawnWorldGen.class', + 'zone/moddev/mc/baseelectric/init/Villages.class', + 'zone/moddev/mc/baseelectric/recipe/RecipeConditions$ModeSerializer.class', + 'assets/baseelectric/lang/en_us.json', + 'data/baseelectric/loot_tables/blocks/electric_drill.json', + 'data/baseelectric/loot_tables/blocks/electric_conduit.json', + 'data/baseelectric/recipes/electric_conduit_plastic_ingot.json', + 'data/baseelectric/advancements/recipes/integrated_circuit_copper_normal.json', 'data/forge/tags/items/ores/lithium.json'].each { required -> if (!names.contains(required)) { throw new GradleException("Release jar is missing ${required}") @@ -533,7 +533,7 @@ tasks.register('verifyReleaseArtifacts') { } ['agent-notes/', '.codex/', 'src/test/', 'fernflower_abstract_parameter_names.txt', 'cyano/poweradvantage/', - 'zone/moddev/mc/poweradvantage/', 'zone/moddev/mc/basemetals/', 'cyano/basemetals/', 'com/mcmoddev/lib/', + 'zone/moddev/mc/basepower/', 'zone/moddev/mc/basemetals/', 'cyano/basemetals/', 'com/mcmoddev/lib/', 'cyano/orespawn/', 'com/mcmoddev/orespawn/', 'cofh/api/', 'reborncore/', 'net/minecraft/', 'net/minecraftforge/'].each { forbidden -> if (names.any { it.contains(forbidden) }) { @@ -542,7 +542,7 @@ tasks.register('verifyReleaseArtifacts') { } String metadata = zip.getInputStream(zip.getEntry('META-INF/mods.toml')) .getText(StandardCharsets.UTF_8.name()) - if (!metadata.contains('modId="electricadvantage"') + if (!metadata.contains('modId="baseelectric"') || !metadata.contains("version=\"${project.mod_version}\"")) { throw new GradleException('Packaged mods.toml identity or version is incorrect') } @@ -568,8 +568,8 @@ 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) { + 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 ElectricAdvantage sources') } } @@ -669,7 +669,7 @@ publishing { pom { name = 'Electric Advantage' 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' @@ -677,9 +677,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' } } } @@ -1025,7 +1025,7 @@ tasks.register('verifyModelAssets') { int separator = reference.indexOf(':') String namespace = separator >= 0 ? reference.substring(0, separator) : 'minecraft' String path = separator >= 0 ? reference.substring(separator + 1) : reference - if (namespace != project.mod_id && namespace != 'poweradvantage') return + if (namespace != project.mod_id && namespace != 'basepower') return String suffix = assetType == 'textures' ? '.png' : '.json' String targetPath = "assets/${namespace}/${assetType}/${path}${suffix}" @@ -1144,9 +1144,9 @@ tasks.register('verifyRecipeTagGuards') { throw new GradleException("${recipeFile.path} contains a non-object recipe condition") } Set guards = conditions - .findAll { it instanceof Map && it.type == 'poweradvantage:tag_not_empty' } + .findAll { it instanceof Map && it.type == 'basepower:tag_not_empty' } .collect { it.tag as String } as Set - Set emptyGuards = conditions.findAll { it.type == 'poweradvantage:tag_empty' } + Set emptyGuards = conditions.findAll { it.type == 'basepower:tag_empty' } .collect { it.tag as String } as Set if (!(emptyGuards.intersect(guards)).isEmpty()) { throw new GradleException("${recipeFile.path} requires the same tag to be empty and nonempty") diff --git a/gradle.properties b/gradle.properties index 096cec9..4f8e26b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,25 +21,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=1783006 -mod_id=electricadvantage -mod_name=Electric Advantage +mod_id=baseelectric +mod_name=baseElectric mod_license=GPL-3.0-only -mod_version=2.2.8.116051 -mod_group=zone.moddev.mc.electricadvantage +mod_version=2.2.9.116051 +mod_group=zone.moddev.mc.baseelectric mod_authors=DrCyano mod_description=Electric-powered machines and infrastructure for the Power Advantage platform. -cf_requirements=power-advantage,base-metals +cf_requirements=basepower,base-metals cf_optionals= cf_versions=1.16.5 -poweradvantage_version=2.4.7.116051 -poweradvantage_source_repository=MinecraftModDevelopmentMods/PowerAdvantage +poweradvantage_version=2.4.8.116051 +poweradvantage_source_repository=MinecraftModDevelopmentMods/basePower # Exact local-only Power source and immutable development artifact; publish source before hosted builds. -poweradvantage_source_ref=bcb75bfa91c14751ebf1e31865e1ec0ffa82c0b7 -poweradvantage_deobf_sha256=2FB923944A456B4F26AB2F9212C646469CE3F49BFD4DAE894C15559B48908386 +poweradvantage_source_ref=a21d0653129912e8d45bc443080b211eb09ae88c +poweradvantage_deobf_sha256=156674F6DF6007D351AD419416344356F6586452077FCAE2E9BC9404EE14A14B basemetals_version=3.1.1.116051 basemetals_source_commit=995f6cc4dd2d5eecc628a42e5c43fa5390c24bca diff --git a/src/main/java/zone/moddev/mc/electricadvantage/Data.java b/src/main/java/zone/moddev/mc/baseelectric/Data.java similarity index 79% rename from src/main/java/zone/moddev/mc/electricadvantage/Data.java rename to src/main/java/zone/moddev/mc/baseelectric/Data.java index 618ea0c..8fcdb9f 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 { @@ -8,7 +8,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" @@ -16,7 +16,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 80% rename from src/main/java/zone/moddev/mc/electricadvantage/ElectricAdvantage.java rename to src/main/java/zone/moddev/mc/baseelectric/ElectricAdvantage.java index 7a1a0da..3207019 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/ElectricAdvantage.java +++ b/src/main/java/zone/moddev/mc/baseelectric/ElectricAdvantage.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage; +package zone.moddev.mc.baseelectric; import java.util.HashSet; import java.util.Set; @@ -20,25 +20,25 @@ import cyano.poweradvantage.api.migration.LegacyConfigMigration.Mapping; import cyano.poweradvantage.api.migration.LegacyConfigMigration.ValueType; import cyano.poweradvantage.api.migration.LegacyOreSpawnConfigBridge; -import zone.moddev.mc.electricadvantage.config.ElectricAdvantageConfig; -import zone.moddev.mc.electricadvantage.init.Blocks; -import zone.moddev.mc.electricadvantage.init.Enchantments; -import zone.moddev.mc.electricadvantage.init.Entities; -import zone.moddev.mc.electricadvantage.init.GUI; -import zone.moddev.mc.electricadvantage.init.Items; -import zone.moddev.mc.electricadvantage.init.OreSpawnWorldGen; -import zone.moddev.mc.electricadvantage.init.Recipes; -import zone.moddev.mc.electricadvantage.init.TreasureChests; -import zone.moddev.mc.electricadvantage.init.Villages; -import zone.moddev.mc.electricadvantage.recipe.RecipeConditions; -import zone.moddev.mc.electricadvantage.migration.ElectricLegacyMigrations; +import zone.moddev.mc.baseelectric.config.ElectricAdvantageConfig; +import zone.moddev.mc.baseelectric.init.Blocks; +import zone.moddev.mc.baseelectric.init.Enchantments; +import zone.moddev.mc.baseelectric.init.Entities; +import zone.moddev.mc.baseelectric.init.GUI; +import zone.moddev.mc.baseelectric.init.Items; +import zone.moddev.mc.baseelectric.init.OreSpawnWorldGen; +import zone.moddev.mc.baseelectric.init.Recipes; +import zone.moddev.mc.baseelectric.init.TreasureChests; +import zone.moddev.mc.baseelectric.init.Villages; +import zone.moddev.mc.baseelectric.recipe.RecipeConditions; +import zone.moddev.mc.baseelectric.migration.ElectricLegacyMigrations; /** Forge 1.16 entry point for Electric Advantage. */ @Mod(ElectricAdvantage.MODID) public final class ElectricAdvantage { - public static final String MODID = "electricadvantage"; + public static final String MODID = "baseelectric"; public static final String NAME = "Electric Advantage"; - public static final String VERSION = "2.2.8.116051"; + public static final String VERSION = "2.2.9.116051"; public static final Logger LOGGER = LogManager.getLogger(MODID); public static ElectricAdvantage INSTANCE; @@ -63,13 +63,13 @@ public ElectricAdvantage() { DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> FMLJavaModLoadingContext.get().getModEventBus().addListener( - zone.moddev.mc.electricadvantage.graphics.ClientRegistration::onClientSetup)); + zone.moddev.mc.baseelectric.graphics.ClientRegistration::onClientSetup)); } private static void migrateLegacyOreSpawnConfiguration() { try { LegacyOreSpawnConfigBridge.Result result = - LegacyOreSpawnConfigBridge.migrate(FMLPaths.CONFIGDIR.get(), MODID); + LegacyOreSpawnConfigBridge.migrate(FMLPaths.CONFIGDIR.get(), MODID, "electricadvantage"); if (result.wasMigrated()) { LOGGER.info("Imported {} legacy Electric Advantage OreSpawn rule(s) from '{}' into '{}'", result.getRuleCount(), result.getSource(), result.getTarget()); @@ -81,7 +81,7 @@ private static void migrateLegacyOreSpawnConfiguration() { private static void migrateLegacyConfiguration() { try { - LegacyConfigMigration.Result result = LegacyConfigMigration.migrate(FMLPaths.CONFIGDIR.get(), MODID, + LegacyConfigMigration.Result result = LegacyConfigMigration.migrate(FMLPaths.CONFIGDIR.get(), MODID, "electricadvantage", Mapping.of("fabricator", "recursion_limit", "fabricator", "recursionLimit", ValueType.INTEGER), Mapping.of("options", "laser_sound", "options", "laserSound", ValueType.STRING), Mapping.of("options", "petrolplastic_fluids", "options", "petrolplasticFluids", ValueType.STRING)); 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 91% 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 1ff5442..2a16007 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/blocks/ElectricScaffoldBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/blocks/ElectricScaffoldBlock.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.blocks; +package zone.moddev.mc.baseelectric.blocks; import cyano.poweradvantage.api.simple.BlockSimplePowerConduit; import net.minecraft.block.material.Material; @@ -8,7 +8,7 @@ import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.world.IBlockReader; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; /** Full-block electric track/scaffold with conduit behavior. */ public class ElectricScaffoldBlock extends BlockSimplePowerConduit { 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 8047e7c..31de32b 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 java.util.Random; import java.util.Collections; 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 97% 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 c4b10a1..1b38f0e 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 2ec2738..796215e 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/compat/BaseMetalsCompat.java +++ b/src/main/java/zone/moddev/mc/baseelectric/compat/BaseMetalsCompat.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.compat; +package zone.moddev.mc.baseelectric.compat; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/config/ElectricAdvantageConfig.java b/src/main/java/zone/moddev/mc/baseelectric/config/ElectricAdvantageConfig.java similarity index 88% rename from src/main/java/zone/moddev/mc/electricadvantage/config/ElectricAdvantageConfig.java rename to src/main/java/zone/moddev/mc/baseelectric/config/ElectricAdvantageConfig.java index dd5c41d..d2f94b4 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/config/ElectricAdvantageConfig.java +++ b/src/main/java/zone/moddev/mc/baseelectric/config/ElectricAdvantageConfig.java @@ -1,11 +1,11 @@ -package zone.moddev.mc.electricadvantage.config; +package zone.moddev.mc.baseelectric.config; import java.util.Arrays; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.fml.config.ModConfig; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.util.crafting.RecipeDeconstructor; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.util.crafting.RecipeDeconstructor; /** Common configuration retaining the legacy gameplay defaults. */ public final class ElectricAdvantageConfig { @@ -24,7 +24,7 @@ public final class ElectricAdvantageConfig { builder.push("options"); LASER_SOUND = builder.define("laserSound", "minecraft:block.note_block.bass"); PLASTIC_FLUIDS = builder.comment("Semi-colon delimited fluid registry names usable by the plastic refinery.") - .define("petrolplasticFluids", "refined_oil;poweradvantage:refined_oil;oil"); + .define("petrolplasticFluids", "refined_oil;basepower:refined_oil;oil"); builder.pop(); SPEC = builder.build(); } 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 93% 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 60392e9..2085d86 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.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.EntityType; @@ -38,7 +38,7 @@ public HydroturbineEntity(World w, BlockPos parentTileEntity) { } public HydroturbineEntity(World w, TileEntity parentTileEntity) { - this(zone.moddev.mc.electricadvantage.init.Entities.HYDROTURBINE, w); + this(zone.moddev.mc.baseelectric.init.Entities.HYDROTURBINE, w); this.parent = parentTileEntity; BlockPos p = parentTileEntity.getBlockPos(); this.setPos(p.getX()+0.5, p.getY()-1, p.getZ()+0.5); diff --git a/src/main/java/zone/moddev/mc/electricadvantage/graphics/BufferedQuads.java b/src/main/java/zone/moddev/mc/baseelectric/graphics/BufferedQuads.java similarity index 97% rename from src/main/java/zone/moddev/mc/electricadvantage/graphics/BufferedQuads.java rename to src/main/java/zone/moddev/mc/baseelectric/graphics/BufferedQuads.java index 13d26d3..1e9dda6 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/graphics/BufferedQuads.java +++ b/src/main/java/zone/moddev/mc/baseelectric/graphics/BufferedQuads.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.graphics; +package zone.moddev.mc.baseelectric.graphics; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/graphics/ClientRegistration.java b/src/main/java/zone/moddev/mc/baseelectric/graphics/ClientRegistration.java similarity index 84% rename from src/main/java/zone/moddev/mc/electricadvantage/graphics/ClientRegistration.java rename to src/main/java/zone/moddev/mc/baseelectric/graphics/ClientRegistration.java index b0b308d..a410c5d 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/graphics/ClientRegistration.java +++ b/src/main/java/zone/moddev/mc/baseelectric/graphics/ClientRegistration.java @@ -1,12 +1,12 @@ -package zone.moddev.mc.electricadvantage.graphics; +package zone.moddev.mc.baseelectric.graphics; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderTypeLookup; -import zone.moddev.mc.electricadvantage.init.Blocks; -import zone.moddev.mc.electricadvantage.init.Entities; +import zone.moddev.mc.baseelectric.init.Blocks; +import zone.moddev.mc.baseelectric.init.Entities; /** Client-only renderer registration. */ public final class ClientRegistration { diff --git a/src/main/java/zone/moddev/mc/electricadvantage/graphics/ElectricRenderTypes.java b/src/main/java/zone/moddev/mc/baseelectric/graphics/ElectricRenderTypes.java similarity index 90% rename from src/main/java/zone/moddev/mc/electricadvantage/graphics/ElectricRenderTypes.java rename to src/main/java/zone/moddev/mc/baseelectric/graphics/ElectricRenderTypes.java index 9bdc088..d7deada 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/graphics/ElectricRenderTypes.java +++ b/src/main/java/zone/moddev/mc/baseelectric/graphics/ElectricRenderTypes.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.graphics; +package zone.moddev.mc.baseelectric.graphics; import net.minecraft.client.renderer.RenderState; import net.minecraft.client.renderer.RenderType; @@ -8,7 +8,7 @@ /** Scoped render state replaces the old global lighting/blending mutations. */ final class ElectricRenderTypes extends RenderState { private ElectricRenderTypes() { - super("electricadvantage", () -> {}, () -> {}); + super("baseelectric", () -> {}, () -> {}); } static RenderType unshaded(ResourceLocation texture, boolean translucent) { 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 b604fb5..b0fee57 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 com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; 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 95% 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 552d9e2..6ea3250 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 com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; 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 96% 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 3840605..1735ab6 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 com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; 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 e81dc24..4782867 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.PlayerEntity; import net.minecraft.inventory.container.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 eb7c0ef..7f78fe6 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 3674f42..43ac5db 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 ae847b6..657670b 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 cyano.poweradvantage.api.fluid.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 59ab60c..91bc683 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 cyano.poweradvantage.api.fluid.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 cfccfd0..433a10a 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.PlayerEntity; import net.minecraft.inventory.container.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 41a7ab0..f77b2f8 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/gui/GUIHelper.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/GUIHelper.java @@ -1,8 +1,8 @@ -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 cyano.poweradvantage.api.fluid.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 7812a17..f4e65e5 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 47a20da..4988d24 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 33d4420..7b64532 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 63ca61b..59faa28 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.PlayerEntity; import net.minecraft.inventory.container.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 37afa95..e6a078f 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 cyano.poweradvantage.api.fluid.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 c611d80..afbd316 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 19cc321..348e36f 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 75% 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 e40e524..bb8a578 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/init/Blocks.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/Blocks.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; import java.util.LinkedHashMap; import java.util.Map; @@ -11,29 +11,29 @@ import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -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.ElectricBatteryArrayBlock; -import zone.moddev.mc.electricadvantage.machines.ElectricCrusherBlock; -import zone.moddev.mc.electricadvantage.machines.ElectricDrillBlock; -import zone.moddev.mc.electricadvantage.machines.ElectricFabricatorBlock; -import zone.moddev.mc.electricadvantage.machines.ElectricFurnaceBlock; -import zone.moddev.mc.electricadvantage.machines.ElectricOvenBlock; -import zone.moddev.mc.electricadvantage.machines.ElectricPumpBlock; -import zone.moddev.mc.electricadvantage.machines.ElectricStillBlock; -import zone.moddev.mc.electricadvantage.machines.GrowthChamberBlock; -import zone.moddev.mc.electricadvantage.machines.GrowthChamberControllerBlock; -import zone.moddev.mc.electricadvantage.machines.HydroelectricGeneratorBlock; -import zone.moddev.mc.electricadvantage.machines.LEDBlock; -import zone.moddev.mc.electricadvantage.machines.LaserTurretBlock; -import zone.moddev.mc.electricadvantage.machines.PhotovoltaicGeneratorBlock; -import zone.moddev.mc.electricadvantage.machines.PlasticRefineryBlock; -import zone.moddev.mc.electricadvantage.machines.SteamPoweredElectricGeneratorBlock; -import zone.moddev.mc.poweradvantage.blocks.BlockPowerSwitch; -import zone.moddev.mc.poweradvantage.init.ItemGroups; +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.ElectricBatteryArrayBlock; +import zone.moddev.mc.baseelectric.machines.ElectricCrusherBlock; +import zone.moddev.mc.baseelectric.machines.ElectricDrillBlock; +import zone.moddev.mc.baseelectric.machines.ElectricFabricatorBlock; +import zone.moddev.mc.baseelectric.machines.ElectricFurnaceBlock; +import zone.moddev.mc.baseelectric.machines.ElectricOvenBlock; +import zone.moddev.mc.baseelectric.machines.ElectricPumpBlock; +import zone.moddev.mc.baseelectric.machines.ElectricStillBlock; +import zone.moddev.mc.baseelectric.machines.GrowthChamberBlock; +import zone.moddev.mc.baseelectric.machines.GrowthChamberControllerBlock; +import zone.moddev.mc.baseelectric.machines.HydroelectricGeneratorBlock; +import zone.moddev.mc.baseelectric.machines.LEDBlock; +import zone.moddev.mc.baseelectric.machines.LaserTurretBlock; +import zone.moddev.mc.baseelectric.machines.PhotovoltaicGeneratorBlock; +import zone.moddev.mc.baseelectric.machines.PlasticRefineryBlock; +import zone.moddev.mc.baseelectric.machines.SteamPoweredElectricGeneratorBlock; +import zone.moddev.mc.basepower.blocks.BlockPowerSwitch; +import zone.moddev.mc.basepower.init.ItemGroups; /** Stable block registry for ElectricAdvantage 1.13. */ @Mod.EventBusSubscriber(modid = ElectricAdvantage.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) 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 78% 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 b9524f7..3fd90ba 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/init/Entities.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/Entities.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; import java.util.function.Supplier; @@ -9,24 +9,24 @@ import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.entities.HydroturbineEntity; -import zone.moddev.mc.electricadvantage.machines.ElectricBatteryArrayTileEntity; -import zone.moddev.mc.electricadvantage.machines.ElectricCrusherTileEntity; -import zone.moddev.mc.electricadvantage.machines.ElectricDrillTileEntity; -import zone.moddev.mc.electricadvantage.machines.ElectricFabricatorTileEntity; -import zone.moddev.mc.electricadvantage.machines.ElectricFurnaceTileEntity; -import zone.moddev.mc.electricadvantage.machines.ElectricOvenTileEntity; -import zone.moddev.mc.electricadvantage.machines.ElectricPumpTileEntity; -import zone.moddev.mc.electricadvantage.machines.ElectricStillTileEntity; -import zone.moddev.mc.electricadvantage.machines.GrowthChamberControllerTileEntity; -import zone.moddev.mc.electricadvantage.machines.GrowthChamberTileEntity; -import zone.moddev.mc.electricadvantage.machines.HydroelectricGeneratorTileEntity; -import zone.moddev.mc.electricadvantage.machines.LEDTileEntity; -import zone.moddev.mc.electricadvantage.machines.LaserTurretTileEntity; -import zone.moddev.mc.electricadvantage.machines.PhotovoltaicGeneratorTileEntity; -import zone.moddev.mc.electricadvantage.machines.PlasticRefineryTileEntity; -import zone.moddev.mc.electricadvantage.machines.SteamPoweredElectricGeneratorTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.entities.HydroturbineEntity; +import zone.moddev.mc.baseelectric.machines.ElectricBatteryArrayTileEntity; +import zone.moddev.mc.baseelectric.machines.ElectricCrusherTileEntity; +import zone.moddev.mc.baseelectric.machines.ElectricDrillTileEntity; +import zone.moddev.mc.baseelectric.machines.ElectricFabricatorTileEntity; +import zone.moddev.mc.baseelectric.machines.ElectricFurnaceTileEntity; +import zone.moddev.mc.baseelectric.machines.ElectricOvenTileEntity; +import zone.moddev.mc.baseelectric.machines.ElectricPumpTileEntity; +import zone.moddev.mc.baseelectric.machines.ElectricStillTileEntity; +import zone.moddev.mc.baseelectric.machines.GrowthChamberControllerTileEntity; +import zone.moddev.mc.baseelectric.machines.GrowthChamberTileEntity; +import zone.moddev.mc.baseelectric.machines.HydroelectricGeneratorTileEntity; +import zone.moddev.mc.baseelectric.machines.LEDTileEntity; +import zone.moddev.mc.baseelectric.machines.LaserTurretTileEntity; +import zone.moddev.mc.baseelectric.machines.PhotovoltaicGeneratorTileEntity; +import zone.moddev.mc.baseelectric.machines.PlasticRefineryTileEntity; +import zone.moddev.mc.baseelectric.machines.SteamPoweredElectricGeneratorTileEntity; /** Stable tile/entity registrations; IDs are unchanged from 1.12. */ @Mod.EventBusSubscriber(modid = ElectricAdvantage.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) 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 94% 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 74aeed6..6fab007 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/init/Items.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/Items.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; import java.util.LinkedHashMap; import java.util.Map; @@ -8,9 +8,9 @@ import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.items.BatteryItem; -import zone.moddev.mc.poweradvantage.init.ItemGroups; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.items.BatteryItem; +import zone.moddev.mc.basepower.init.ItemGroups; /** Stable item registry for ElectricAdvantage 1.13. */ @Mod.EventBusSubscriber(modid = ElectricAdvantage.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) 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 96% 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 264a627..86f4f8f 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/init/OreSpawnWorldGen.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/OreSpawnWorldGen.java @@ -1,11 +1,11 @@ -package zone.moddev.mc.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; import java.nio.file.Files; import java.nio.file.Path; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.ModList; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; +import zone.moddev.mc.baseelectric.ElectricAdvantage; import zone.moddev.mc.orespawn.api.GeologyFamily; import zone.moddev.mc.orespawn.api.OrePattern; import zone.moddev.mc.orespawn.api.OreSpawnApi; @@ -32,8 +32,8 @@ public static void register(Path configDirectory) { : baseMineralsLoaded ? "baseminerals" : ElectricAdvantage.MODID; String lithiumOwner = baseMineralsLoaded ? "baseminerals" : ElectricAdvantage.MODID; ElectricAdvantage.LOGGER.info( - "OreSpawn sulfur candidates=[mineralogy, baseminerals, electricadvantage], " - + "selected fresh-world owner={}; lithium candidates=[baseminerals, electricadvantage], " + "OreSpawn sulfur candidates=[mineralogy, baseminerals, baseelectric], " + + "selected fresh-world owner={}; lithium candidates=[baseminerals, baseelectric], " + "selected fresh-world owner={}; explicit override={}", sulfurOwner, lithiumOwner, describeOverride(configDirectory)); if (!accepted) { 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 88% 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 1a22083..6b3be26 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/init/Recipes.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/Recipes.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; /** * Electric Advantage 1.13 recipes are data driven. This hook remains so the 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 89% 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 556f4b2..55b1062 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 java.io.IOException; import java.nio.charset.Charset; @@ -48,7 +48,7 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"electricadvantage:psu\",\n" + + " \"name\": \"baseelectric:psu\",\n" + " \"weight\": 6,\n" + " \"functions\": [\n" + " {\n" + @@ -62,7 +62,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" + @@ -76,7 +76,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" + @@ -90,7 +90,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" + @@ -104,7 +104,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" + @@ -118,7 +118,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" + @@ -132,7 +132,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" + @@ -146,7 +146,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" + @@ -160,7 +160,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" + 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 93318d4..1501f17 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 java.util.List; import net.minecraft.entity.merchant.villager.VillagerProfession; 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 1f17c2e..9e58f1f 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.client.util.ITooltipFlag; 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 63de1b5..801c1fc 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 93% 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 1a92d85..20eb9c1 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(zone.moddev.mc.electricadvantage.init.Entities.ELECTRIC_BATTERY_ARRAY, "tile.electricadvantage.electric_battery_array.name",8); + super(zone.moddev.mc.baseelectric.init.Entities.ELECTRIC_BATTERY_ARRAY, "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 89% 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 ed5e003..04f9f64 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 93% 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 e6b34cb..192bfc1 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.util.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -22,7 +22,7 @@ public class ElectricCrusherTileEntity extends ElectricMachineTileEntity{ public ElectricCrusherTileEntity() { - super(zone.moddev.mc.electricadvantage.init.Entities.ELECTRIC_CRUSHER, "tile.electricadvantage.electric_crusher.name", + super(zone.moddev.mc.baseelectric.init.Entities.ELECTRIC_CRUSHER, "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 96% 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 626c3e2..6c2bfaf 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricDrillBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricDrillBlock.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.GUIBlock; @@ -23,8 +23,8 @@ import net.minecraft.world.Explosion; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import zone.moddev.mc.electricadvantage.init.Power; -import zone.moddev.mc.poweradvantage.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.baseelectric.init.Power; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; public class ElectricDrillBlock extends GUIBlock implements ITypedConduit { public static final DirectionProperty FACING = BlockStateProperties.FACING; 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 97% 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 c9a1fd1..c69160e 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.BlockState; import net.minecraft.entity.Entity; @@ -50,7 +50,7 @@ public class ElectricDrillTileEntity extends ElectricMachineTileEntity{ private boolean deferred = false; public ElectricDrillTileEntity() { - super(zone.moddev.mc.electricadvantage.init.Entities.ELECTRIC_DRILL, "tile.electricadvantage.electric_drill.name", + super(zone.moddev.mc.baseelectric.init.Entities.ELECTRIC_DRILL, "tile.baseelectric.electric_drill.name", 0, 6, 0); } @@ -162,7 +162,7 @@ private boolean followTrack(){ Arrays.fill(this.getInventory(), null); // replace this block with steam pipe - w.setBlockAndUpdate(getBlockPos().relative(getFacing()), zone.moddev.mc.poweradvantage.init.Blocks.steel_frame.defaultBlockState()); + w.setBlockAndUpdate(getBlockPos().relative(getFacing()), zone.moddev.mc.basepower.init.Blocks.steel_frame.defaultBlockState()); w.setBlock(getBlockPos(), Blocks.electric_conduit.defaultBlockState(), 2); @@ -247,7 +247,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(getLevel(), getBlockPos(), getEnergyType()); 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 83% 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 900d894..8a32bdb 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 95% 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 813cec3..bb23fba 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.util.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -19,7 +19,7 @@ public class ElectricFabricatorTileEntity extends ElectricMachineTileEntity { private final int progressGoal = 200; public ElectricFabricatorTileEntity() { - super(zone.moddev.mc.electricadvantage.init.Entities.ELECTRIC_FABRICATOR, "tile.electricadvantage.electric_fabricator.name", 12, 2, 1); + super(zone.moddev.mc.baseelectric.init.Entities.ELECTRIC_FABRICATOR, "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 85% 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 0b670c3..68dd8ba 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 93% 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 7b18f0f..87ed3e2 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.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; @@ -20,7 +20,7 @@ public class ElectricFurnaceTileEntity extends ElectricMachineTileEntity{ public ElectricFurnaceTileEntity() { - super(zone.moddev.mc.electricadvantage.init.Entities.ELECTRIC_FURNACE, "tile.electricadvantage.electric_furnace.name", + super(zone.moddev.mc.baseelectric.init.Entities.ELECTRIC_FURNACE, "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 97% 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 10dbbf1..22a9468 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricGeneratorBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricGeneratorBlock.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.simple.BlockSimplePowerMachine; @@ -14,7 +14,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; public abstract class ElectricGeneratorBlock extends BlockSimplePowerMachine { public static final BooleanProperty ACTIVE = BooleanProperty.create("active"); 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 97% 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 6e55ebb..dfbb5d6 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.BlockState; import net.minecraft.entity.player.PlayerEntity; @@ -16,7 +16,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.tileentity.TileEntityType; import net.minecraft.world.World; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; +import zone.moddev.mc.baseelectric.ElectricAdvantage; import java.util.Arrays; 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 86a8968..12b4b9a 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricMachineBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricMachineBlock.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.simple.BlockSimplePowerMachine; @@ -14,7 +14,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; public abstract class ElectricMachineBlock extends BlockSimplePowerMachine { public static final BooleanProperty ACTIVE = BooleanProperty.create("active"); 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 98% 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 0f9feb7..3b0672e 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.BlockState; import net.minecraft.entity.player.PlayerEntity; @@ -20,7 +20,7 @@ import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.World; import net.minecraft.item.crafting.IRecipeType; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; +import zone.moddev.mc.baseelectric.ElectricAdvantage; import java.util.Arrays; 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 85% 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 1e28d8f..48f88c5 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 92% 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 4ef0441..47b4f56 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.util.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -14,7 +14,7 @@ public class ElectricOvenTileEntity extends ElectricMachineTileEntity{ private short progress = 0; public ElectricOvenTileEntity() { - super(zone.moddev.mc.electricadvantage.init.Entities.ELECTRIC_OVEN, "tile.electricadvantage.electric_oven.name", 1, 1, 0); + super(zone.moddev.mc.baseelectric.init.Entities.ELECTRIC_OVEN, "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 89% 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 fcd654e..fc81278 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.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; 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 93% 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 4e474ce..f09b6bd 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricPumpTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricPumpTileEntity.java @@ -1,13 +1,13 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.util.LegacyFluidHandler; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.util.LegacyFluidHandler; +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.poweradvantage.util.FluidIdHelper; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basepower.util.FluidIdHelper; import net.minecraft.block.BlockState; import net.minecraft.block.IBucketPickupHandler; import net.minecraft.util.SoundEvents; @@ -44,7 +44,7 @@ public class ElectricPumpTileEntity extends ElectricMachineTileEntity implements public ElectricPumpTileEntity() { - super(zone.moddev.mc.electricadvantage.init.Entities.ELECTRIC_PUMP, "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(zone.moddev.mc.baseelectric.init.Entities.ELECTRIC_PUMP, "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(FluidTank.BUCKET_VOLUME); } @@ -61,12 +61,12 @@ public void tickUpdate(boolean isServerWorld) { World w = getLevel(); boolean success = false; BlockPos target = this.getBlockPos().below(); - 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.below(); } if(target.getY() > 0 && w.isEmptyBlock(target) && getEnergy() >= ENERGY_COST_PIPE){ // place pipe - w.setBlockAndUpdate(target, zone.moddev.mc.electricadvantage.init.Blocks.pump_pipe_electric.defaultBlockState()); + w.setBlockAndUpdate(target, zone.moddev.mc.baseelectric.init.Blocks.pump_pipe_electric.defaultBlockState()); 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.STONE_STEP, 0.3f, 1f); @@ -180,7 +180,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, getLevel(), getBlockPos(), 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 1d86bcd..3994d51 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 94% 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 c7d4e3e..53d6054 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/ElectricStillTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricStillTileEntity.java @@ -1,15 +1,15 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.util.LegacyFluidHandler; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.util.LegacyFluidHandler; +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.poweradvantage.util.FluidIdHelper; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basepower.registry.still.recipe.DistillationRecipe; +import zone.moddev.mc.basepower.registry.still.recipe.DistillationRecipeRegistry; +import zone.moddev.mc.basepower.util.FluidIdHelper; import net.minecraft.util.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -33,7 +33,7 @@ public class ElectricStillTileEntity extends ElectricMachineTileEntity implement private final int[] dataSyncArray = new int[5]; public ElectricStillTileEntity() { - super(zone.moddev.mc.electricadvantage.init.Entities.ELECTRIC_STILL, "tile.electricadvantage.electric_still.name", 0, 0, 0, new ConduitType[]{Power.ELECTRIC_POWER, Fluids.fluidConduit_general},new float[]{500f,1000f}); + super(zone.moddev.mc.baseelectric.init.Entities.ELECTRIC_STILL, "tile.baseelectric.electric_still.name", 0, 0, 0, new ConduitType[]{Power.ELECTRIC_POWER, Fluids.fluidConduit_general},new float[]{500f,1000f}); outputTank = new FluidTank(FluidTank.BUCKET_VOLUME ); inputTank = new FluidTank(FluidTank.BUCKET_VOLUME); } @@ -232,7 +232,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, getLevel(), getBlockPos(), 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 78% 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 e48c174..f5506f7 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 92% 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 a5a66d4..657470f 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/GrowthChamberControllerBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberControllerBlock.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 cyano.poweradvantage.api.PoweredEntity; -import zone.moddev.mc.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.init.Fluids; import net.minecraft.block.material.Material; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/zone/moddev/mc/electricadvantage/machines/GrowthChamberControllerTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberControllerTileEntity.java similarity index 97% 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 0808c80..99cc74c 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/GrowthChamberControllerTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberControllerTileEntity.java @@ -1,14 +1,14 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraft.block.BlockState; -import zone.moddev.mc.electricadvantage.util.LegacyFluidHandler; -import zone.moddev.mc.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.util.LegacyFluidHandler; +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.CompoundNBT; import net.minecraft.util.Direction; @@ -41,7 +41,7 @@ public class GrowthChamberControllerTileEntity extends cyano.poweradvantage.api. private final int[] dataSyncArray = new int[4]; public GrowthChamberControllerTileEntity() { - super(zone.moddev.mc.electricadvantage.init.Entities.GROWTH_CHAMBER_CONTROLLER, types, capacities, "tile.electricadvantage.growth_chamber_controller.name"); + super(zone.moddev.mc.baseelectric.init.Entities.GROWTH_CHAMBER_CONTROLLER, 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 94% 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 507f4e4..d12d655 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/GrowthChamberTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberTileEntity.java @@ -1,8 +1,8 @@ -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.electricadvantage.util.farming.VirtualCrop; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +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.ItemEntity; @@ -24,7 +24,7 @@ public class GrowthChamberTileEntity extends ElectricMachineTileEntity { private byte[] pendingGrowth; public GrowthChamberTileEntity() { - super(zone.moddev.mc.electricadvantage.init.Entities.GROWTH_CHAMBER, "tile.electricadvantage.growth_chamber.name",Power.GROWTHCHAMBER_POWER, ENERGY_PER_TICK*64, GROWTH_AREA, 6, 0); + super(zone.moddev.mc.baseelectric.init.Entities.GROWTH_CHAMBER, "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 92% 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 cd7c312..285c2e8 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.block.BlockState; import net.minecraft.util.math.BlockPos; 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 89% 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 9c56787..271207b 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.CompoundNBT; import net.minecraft.util.math.AxisAlignedBB; @@ -20,7 +20,7 @@ public class HydroelectricGeneratorTileEntity extends ElectricGeneratorTileEntit private boolean isInitialized; public HydroelectricGeneratorTileEntity() { - super(zone.moddev.mc.electricadvantage.init.Entities.HYDROELECTRIC_GENERATOR, "tile.electricadvantage.hydroelectric_generator.name", 0); + super(zone.moddev.mc.baseelectric.init.Entities.HYDROELECTRIC_GENERATOR, "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 93% 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 c3affba..d3d1c61 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/LEDBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/LEDBlock.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.block.Block; @@ -8,7 +8,7 @@ import net.minecraft.state.StateContainer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockReader; -import zone.moddev.mc.electricadvantage.blocks.ElectricConduitBlock; +import zone.moddev.mc.baseelectric.blocks.ElectricConduitBlock; /** Electric conduit that consumes a small amount of power to emit light. */ public class LEDBlock extends ElectricConduitBlock implements ITileEntityProvider { 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 89% 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 3d7b669..8b813fd 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(zone.moddev.mc.electricadvantage.init.Entities.LED, Power.ELECTRIC_POWER, ENERGY_COST * 4, "tile.electricadvantage.led_bar.name"); + super(zone.moddev.mc.baseelectric.init.Entities.LED, 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 b9bd5ed..732e674 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.Block; import net.minecraft.block.material.Material; 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 14a6ec1..45558cc 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.BlockState; import net.minecraft.entity.Entity; @@ -82,7 +82,7 @@ public class LaserTurretTileEntity extends ElectricMachineTileEntity implements public LaserTurretTileEntity(){ - super(zone.moddev.mc.electricadvantage.init.Entities.LASER_TURRET, "tile.electricadvantage.laser_turret.name",MAX_BUFFER,0,0,0); + super(zone.moddev.mc.baseelectric.init.Entities.LASER_TURRET, "tile.baseelectric.laser_turret.name",MAX_BUFFER,0,0,0); SoundEvent soundEvent = ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation(ElectricAdvantage.INSTANCE.LASER_SOUND)); if(soundEvent == null){ LASER_SOUND = SoundEvents.ENDERMAN_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 92% 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 f656ae5..0007605 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 92% 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 fbcad36..c984d20 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.CompoundNBT; import net.minecraft.util.math.BlockPos; @@ -17,7 +17,7 @@ public class PhotovoltaicGeneratorTileEntity extends ElectricGeneratorTileEntity private float powerOutput = 0; public PhotovoltaicGeneratorTileEntity() { - super(zone.moddev.mc.electricadvantage.init.Entities.PHOTOVOLTAIC_GENERATOR, "tile.electricadvantage.photovoltaic_generator.name", 0); + super(zone.moddev.mc.baseelectric.init.Entities.PHOTOVOLTAIC_GENERATOR, "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 84% 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 b6f6db2..a3d37fc 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/PlasticRefineryBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/PlasticRefineryBlock.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; public class PlasticRefineryBlock extends ElectricMachineBlock{ 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 95% 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 89ade28..355efac 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/PlasticRefineryTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/PlasticRefineryTileEntity.java @@ -1,15 +1,15 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.util.LegacyFluidHandler; -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.util.LegacyFluidHandler; +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.poweradvantage.util.FluidIdHelper; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basepower.util.FluidIdHelper; import net.minecraft.util.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -37,7 +37,7 @@ public class PlasticRefineryTileEntity extends ElectricMachineTileEntity impleme private final int[] dataSyncArray = new int[4]; public PlasticRefineryTileEntity() { - super(zone.moddev.mc.electricadvantage.init.Entities.PLASTIC_REFINERY, "tile.electricadvantage.plastic_refinery.name", + super(zone.moddev.mc.baseelectric.init.Entities.PLASTIC_REFINERY, "tile.baseelectric.plastic_refinery.name", 0, 1, 0, new ConduitType[]{Power.ELECTRIC_POWER, Fluids.fluidConduit_general},new float[]{500f,2000f}); tank = new FluidTank(FluidTank.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 90% 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 1f13abd..1c3e2a7 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/machines/SteamPoweredElectricGeneratorBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/SteamPoweredElectricGeneratorBlock.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; 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 92% 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 0034d26..53d37e4 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.CompoundNBT; import net.minecraft.util.Direction; -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(zone.moddev.mc.electricadvantage.init.Entities.STEAM_POWERED_ELECTRIC_GENERATOR, "tile.electricadvantage.steam_powered_generator.name", 0, new ConduitType[]{Power.ELECTRIC_POWER,STEAM_POWER}, new float[]{1000f,32f}); + super(zone.moddev.mc.baseelectric.init.Entities.STEAM_POWERED_ELECTRIC_GENERATOR, "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/migration/ElectricLegacyMigrations.java b/src/main/java/zone/moddev/mc/baseelectric/migration/ElectricLegacyMigrations.java similarity index 65% rename from src/main/java/zone/moddev/mc/electricadvantage/migration/ElectricLegacyMigrations.java rename to src/main/java/zone/moddev/mc/baseelectric/migration/ElectricLegacyMigrations.java index 741e6f7..5c0bb1d 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/migration/ElectricLegacyMigrations.java +++ b/src/main/java/zone/moddev/mc/baseelectric/migration/ElectricLegacyMigrations.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.migration; +package zone.moddev.mc.baseelectric.migration; import cyano.poweradvantage.api.migration.LegacyMigrationApi; import cyano.poweradvantage.api.simple.BlockSimplePowerMachine; @@ -6,12 +6,12 @@ import net.minecraft.block.BlockState; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Direction; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.electricadvantage.machines.ElectricDrillBlock; -import zone.moddev.mc.electricadvantage.machines.ElectricGeneratorBlock; -import zone.moddev.mc.electricadvantage.machines.ElectricMachineBlock; -import zone.moddev.mc.electricadvantage.machines.LEDBlock; -import zone.moddev.mc.poweradvantage.blocks.BlockPowerSwitch; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricDrillBlock; +import zone.moddev.mc.baseelectric.machines.ElectricGeneratorBlock; +import zone.moddev.mc.baseelectric.machines.ElectricMachineBlock; +import zone.moddev.mc.baseelectric.machines.LEDBlock; +import zone.moddev.mc.basepower.blocks.BlockPowerSwitch; /** Registers ElectricAdvantage's 1.10 and 1.12 identities with the shared migration hook. */ public final class ElectricLegacyMigrations { @@ -22,7 +22,7 @@ private ElectricLegacyMigrations() {} public static synchronized void register() { if (registered) return; - LegacyMigrationApi.registerNamespace(ElectricAdvantage.MODID); + LegacyMigrationApi.registerNamespaceAlias("electricadvantage", ElectricAdvantage.MODID); for (String path : new String[] { "electric_conduit", "li_ore", "sulfur_ore", "electric_track", "laser_turret", "laser_turret_evil", "led_bar", "photovoltaic_generator", @@ -42,27 +42,23 @@ public static synchronized void register() { "electric_still", "plastic_refinery" }) { registerTile(path); } - LegacyMigrationApi.registerTileEntityAlias("electricadvantage.l_e_d", id("led").toString()); - LegacyMigrationApi.registerTileEntityAlias("electricadvantage:l_e_d", id("led").toString()); - LegacyMigrationApi.registerTileEntityAlias("minecraft:electricadvantage.l_e_d", id("led").toString()); - String hydroturbine = id("hydroturbine").toString(); - LegacyMigrationApi.registerEntityAlias(hydroturbine, hydroturbine); - LegacyMigrationApi.registerEntityAlias("electricadvantage.hydroturbine", hydroturbine); - LegacyMigrationApi.registerEntityAlias("minecraft:electricadvantage.hydroturbine", hydroturbine); - LegacyMigrationApi.registerEntityAlias("minecraft:electricadvantage.Hydroturbine", hydroturbine); - LegacyMigrationApi.registerEntityAlias("electricadvantage.electricadvantage.Hydroturbine", hydroturbine); - LegacyMigrationApi.registerEntityAlias( - "minecraft:electricadvantage.electricadvantage.hydroturbine", hydroturbine); + for (String namespace : new String[] {"electricadvantage", ElectricAdvantage.MODID}) { + LegacyMigrationApi.registerTileEntityAlias(namespace + ".l_e_d", id("led").toString()); + LegacyMigrationApi.registerTileEntityAlias(namespace + ":l_e_d", id("led").toString()); + LegacyMigrationApi.registerTileEntityAlias("minecraft:" + namespace + ".l_e_d", id("led").toString()); + LegacyMigrationApi.registerEntityAlias(namespace + ":hydroturbine", hydroturbine); + LegacyMigrationApi.registerEntityAlias(namespace + ".hydroturbine", hydroturbine); + LegacyMigrationApi.registerEntityAlias("minecraft:" + namespace + ".hydroturbine", hydroturbine); + String repeated = namespace + "." + namespace + ".hydroturbine"; + LegacyMigrationApi.registerEntityAlias(repeated, hydroturbine); + LegacyMigrationApi.registerEntityAlias("minecraft:" + repeated, hydroturbine); + } registered = true; } private static void registerTile(String path) { - String current = id(path).toString(); - LegacyMigrationApi.registerTileEntityAlias(current, current); - LegacyMigrationApi.registerTileEntityAlias(ElectricAdvantage.MODID + "." + path, current); - LegacyMigrationApi.registerTileEntityAlias( - "minecraft:" + ElectricAdvantage.MODID + "." + path, current); + LegacyMigrationApi.registerTileEntityAliases(id(path)); } private static BlockState decodeState(Block block, int metadata) { diff --git a/src/main/java/zone/moddev/mc/electricadvantage/recipe/RecipeConditions.java b/src/main/java/zone/moddev/mc/baseelectric/recipe/RecipeConditions.java similarity index 91% rename from src/main/java/zone/moddev/mc/electricadvantage/recipe/RecipeConditions.java rename to src/main/java/zone/moddev/mc/baseelectric/recipe/RecipeConditions.java index 62a6f00..84e8ea3 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/recipe/RecipeConditions.java +++ b/src/main/java/zone/moddev/mc/baseelectric/recipe/RecipeConditions.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.recipe; +package zone.moddev.mc.baseelectric.recipe; import java.util.Locale; import com.google.gson.JsonObject; @@ -7,9 +7,9 @@ import net.minecraftforge.common.crafting.CraftingHelper; import net.minecraftforge.common.crafting.conditions.ICondition; import net.minecraftforge.common.crafting.conditions.IConditionSerializer; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; -import zone.moddev.mc.poweradvantage.PowerAdvantage; -import zone.moddev.mc.poweradvantage.RecipeMode; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.basepower.PowerAdvantage; +import zone.moddev.mc.basepower.RecipeMode; /** Registers the data-pack conditions used by ElectricAdvantage recipes. */ public final class RecipeConditions { diff --git a/src/main/java/zone/moddev/mc/electricadvantage/util/LegacyFluidHandler.java b/src/main/java/zone/moddev/mc/baseelectric/util/LegacyFluidHandler.java similarity index 82% rename from src/main/java/zone/moddev/mc/electricadvantage/util/LegacyFluidHandler.java rename to src/main/java/zone/moddev/mc/baseelectric/util/LegacyFluidHandler.java index 3e4124d..255287c 100644 --- a/src/main/java/zone/moddev/mc/electricadvantage/util/LegacyFluidHandler.java +++ b/src/main/java/zone/moddev/mc/baseelectric/util/LegacyFluidHandler.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.util; +package zone.moddev.mc.baseelectric.util; import cyano.poweradvantage.api.fluid.IAdvantageFluidHandler; 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 98% 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 f9d3354..ffc6612 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 92% 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 b8ec807..8957b12 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; 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 97% 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 126cd80..9329de1 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 java.util.ArrayList; import java.util.Arrays; @@ -12,7 +12,7 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.Ingredient; import net.minecraft.world.World; -import zone.moddev.mc.electricadvantage.ElectricAdvantage; +import zone.moddev.mc.baseelectric.ElectricAdvantage; /** Recursive crafting solver used by the Electric Fabricator. */ public final class RecipeDeconstructor { 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 5d5af18..b2a154d 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 648d41e..97c2033 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.StemBlock; import net.minecraft.state.Property; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 719d542..6b4f36e 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,40 +1,40 @@ modLoader="javafml" loaderVersion="${loader_version_range}" -issueTrackerURL="https://github.com/MinecraftModDevelopmentMods/ElectricAdvantage/issues" +issueTrackerURL="https://github.com/MinecraftModDevelopmentMods/baseElectric/issues" license="GPL-3.0-only" [[mods]] -modId="electricadvantage" +modId="baseelectric" version="${version}" -displayName="Electric Advantage" -displayURL="https://www.curseforge.com/minecraft/mc-mods/electric-advantage" +displayName="baseElectric" +displayURL="https://www.curseforge.com/minecraft/mc-mods/baseelectric" authors="DrCyano" description=''' Electric-powered machines and infrastructure for the Power Advantage platform. ''' -[[dependencies.electricadvantage]] +[[dependencies.baseelectric]] modId="forge" mandatory=true versionRange="${forge_version_range}" ordering="NONE" side="BOTH" -[[dependencies.electricadvantage]] +[[dependencies.baseelectric]] modId="minecraft" mandatory=true versionRange="${minecraft_version_range}" ordering="NONE" side="BOTH" -[[dependencies.electricadvantage]] -modId="poweradvantage" +[[dependencies.baseelectric]] +modId="basepower" mandatory=true -versionRange="[2.4.7.116051,3.0.0)" +versionRange="[2.4.8.116051,3.0.0)" ordering="AFTER" side="BOTH" -[[dependencies.electricadvantage]] +[[dependencies.baseelectric]] modId="basemetals" mandatory=false versionRange="[3.1.1.116051,4.0.0)" 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..fb6ffe2 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_battery_array.json @@ -0,0 +1,12 @@ +{ + "variants": { + "active=true,facing=east": { "model": "baseelectric:block/electric_battery_array", "y": 90 }, + "active=true,facing=north": { "model": "baseelectric:block/electric_battery_array" }, + "active=true,facing=south": { "model": "baseelectric:block/electric_battery_array", "y": 180 }, + "active=true,facing=west": { "model": "baseelectric:block/electric_battery_array", "y": 270 }, + "active=false,facing=east": { "model": "baseelectric:block/electric_battery_array", "y": 90 }, + "active=false,facing=north": { "model": "baseelectric:block/electric_battery_array" }, + "active=false,facing=south": { "model": "baseelectric:block/electric_battery_array", "y": 180 }, + "active=false,facing=west": { "model": "baseelectric:block/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..e7c713c --- /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:block/electric_conduit_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=false,west=false": { "model": "baseelectric:block/electric_conduit_n", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=false,west=false": { "model": "baseelectric:block/electric_conduit_n", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=false,west=false": { "model": "baseelectric:block/electric_conduit_n", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=false,west=false": { "model": "baseelectric:block/electric_conduit_n", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=true,west=false": { "model": "baseelectric:block/electric_conduit_n", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=false,west=true": { "model": "baseelectric:block/electric_conduit_n", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=false,west=false": { "model": "baseelectric:block/electric_conduit_nw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=false,west=false": { "model": "baseelectric:block/electric_conduit_nw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=false,west=false": { "model": "baseelectric:block/electric_conduit_nw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=true,west=false": { "model": "baseelectric:block/electric_conduit_ns", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=false,west=true": { "model": "baseelectric:block/electric_conduit_nw", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=false,west=false": { "model": "baseelectric:block/electric_conduit_nw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=false,west=false": { "model": "baseelectric:block/electric_conduit_nw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=true,west=false": { "model": "baseelectric:block/electric_conduit_nw", "x": 270, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=false,west=true": { "model": "baseelectric:block/electric_conduit_ns", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=false,west=false": { "model": "baseelectric:block/electric_conduit_ns", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=true,west=false": { "model": "baseelectric:block/electric_conduit_nw", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=false,west=true": { "model": "baseelectric:block/electric_conduit_nw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=true,west=false": { "model": "baseelectric:block/electric_conduit_nw", "x": 270, "y": 270, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=false,west=true": { "model": "baseelectric:block/electric_conduit_nw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=true,west=true": { "model": "baseelectric:block/electric_conduit_nw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=false,west=false": { "model": "baseelectric:block/electric_conduit_nuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=false,west=false": { "model": "baseelectric:block/electric_conduit_nuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=true,west=false": { "model": "baseelectric:block/electric_conduit_dnu", "x": 0, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=false,west=true": { "model": "baseelectric:block/electric_conduit_dnu", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=false,west=false": { "model": "baseelectric:block/electric_conduit_dnu", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=true,west=false": { "model": "baseelectric:block/electric_conduit_dnu", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=false,west=true": { "model": "baseelectric:block/electric_conduit_nuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=true,west=false": { "model": "baseelectric:block/electric_conduit_dnu", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=false,west=true": { "model": "baseelectric:block/electric_conduit_nuw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=true,west=true": { "model": "baseelectric:block/electric_conduit_dnu", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=false,west=false": { "model": "baseelectric:block/electric_conduit_nsw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=true,west=false": { "model": "baseelectric:block/electric_conduit_nuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=false,west=true": { "model": "baseelectric:block/electric_conduit_nsw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=true,west=false": { "model": "baseelectric:block/electric_conduit_nuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=false,west=true": { "model": "baseelectric:block/electric_conduit_nsw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=true,west=true": { "model": "baseelectric:block/electric_conduit_dnu", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=true,west=false": { "model": "baseelectric:block/electric_conduit_dnu", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=false,west=true": { "model": "baseelectric:block/electric_conduit_nsw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=true,west=true": { "model": "baseelectric:block/electric_conduit_nuw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=true,west=true": { "model": "baseelectric:block/electric_conduit_nuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=false,west=false": { "model": "baseelectric:block/electric_conduit_nsuw", "x": 180, "y": 180, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=true,west=false": { "model": "baseelectric:block/electric_conduit_nsuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=false,west=true": { "model": "baseelectric:block/electric_conduit_nsuw", "x": 180, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=true,west=false": { "model": "baseelectric:block/electric_conduit_nsuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=false,west=true": { "model": "baseelectric:block/electric_conduit_nsuw", "x": 180, "y": 270, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=true,west=true": { "model": "baseelectric:block/electric_conduit_ensw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=true,west=false": { "model": "baseelectric:block/electric_conduit_ensw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=false,west=true": { "model": "baseelectric:block/electric_conduit_nsuw", "x": 180, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=true,west=true": { "model": "baseelectric:block/electric_conduit_nsuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=true,west=true": { "model": "baseelectric:block/electric_conduit_nsuw", "x": 90, "y": 270, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=true,west=false": { "model": "baseelectric:block/electric_conduit_nsuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=false,west=true": { "model": "baseelectric:block/electric_conduit_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=true,west=true": { "model": "baseelectric:block/electric_conduit_nsuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=true,west=true": { "model": "baseelectric:block/electric_conduit_nsuw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=true,west=true": { "model": "baseelectric:block/electric_conduit_nsuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=true,west=false": { "model": "baseelectric:block/electric_conduit_desuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=false,west=true": { "model": "baseelectric:block/electric_conduit_desuw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=true,west=true": { "model": "baseelectric:block/electric_conduit_desuw", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=true,west=true": { "model": "baseelectric:block/electric_conduit_desuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=true,west=true": { "model": "baseelectric:block/electric_conduit_desuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=true,west=true": { "model": "baseelectric:block/electric_conduit_desuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=true,west=true": { "model": "baseelectric:block/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..ed74793 --- /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:block/electric_crusher_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:block/electric_crusher_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:block/electric_crusher_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:block/electric_crusher_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:block/electric_crusher_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:block/electric_crusher_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:block/electric_crusher_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:block/electric_crusher_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:block/electric_crusher_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:block/electric_crusher_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:block/electric_crusher_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:block/electric_crusher_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:block/electric_crusher_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:block/electric_crusher_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:block/electric_crusher_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:block/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..5a7b039 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_drill.json @@ -0,0 +1,16 @@ +{ + "variants": { + "active=true,facing=up": { "model": "baseelectric:block/electric_drill_on", "x":270 }, + "active=true,facing=down": { "model": "baseelectric:block/electric_drill_on", "x": 90 }, + "active=true,facing=east": { "model": "baseelectric:block/electric_drill_on", "y": 90 }, + "active=true,facing=north": { "model": "baseelectric:block/electric_drill_on" }, + "active=true,facing=south": { "model": "baseelectric:block/electric_drill_on", "y": 180 }, + "active=true,facing=west": { "model": "baseelectric:block/electric_drill_on", "y": 270 }, + "active=false,facing=up": { "model": "baseelectric:block/electric_drill_off", "x":270 }, + "active=false,facing=down": { "model": "baseelectric:block/electric_drill_off", "x": 90 }, + "active=false,facing=east": { "model": "baseelectric:block/electric_drill_off", "y": 90 }, + "active=false,facing=north": { "model": "baseelectric:block/electric_drill_off" }, + "active=false,facing=south": { "model": "baseelectric:block/electric_drill_off", "y": 180 }, + "active=false,facing=west": { "model": "baseelectric:block/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..82bcee1 --- /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:block/electric_fabricator_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:block/electric_fabricator_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:block/electric_fabricator_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:block/electric_fabricator_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:block/electric_fabricator_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:block/electric_fabricator_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:block/electric_fabricator_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:block/electric_fabricator_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:block/electric_fabricator_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:block/electric_fabricator_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:block/electric_fabricator_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:block/electric_fabricator_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:block/electric_fabricator_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:block/electric_fabricator_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:block/electric_fabricator_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:block/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..e944b1f --- /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:block/electric_furnace_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:block/electric_furnace_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:block/electric_furnace_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:block/electric_furnace_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:block/electric_furnace_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:block/electric_furnace_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:block/electric_furnace_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:block/electric_furnace_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:block/electric_furnace_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:block/electric_furnace_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:block/electric_furnace_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:block/electric_furnace_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:block/electric_furnace_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:block/electric_furnace_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:block/electric_furnace_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:block/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..4de9e56 --- /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:block/electric_oven_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:block/electric_oven_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:block/electric_oven_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:block/electric_oven_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:block/electric_oven_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:block/electric_oven_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:block/electric_oven_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:block/electric_oven_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:block/electric_oven_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:block/electric_oven_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:block/electric_oven_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:block/electric_oven_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:block/electric_oven_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:block/electric_oven_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:block/electric_oven_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:block/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..8a735d5 --- /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:block/electric_pcb_printer_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:block/electric_pcb_printer_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:block/electric_pcb_printer_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:block/electric_pcb_printer_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:block/electric_pcb_printer_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:block/electric_pcb_printer_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:block/electric_pcb_printer_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:block/electric_pcb_printer_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:block/electric_pcb_printer_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:block/electric_pcb_printer_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:block/electric_pcb_printer_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:block/electric_pcb_printer_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:block/electric_pcb_printer_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:block/electric_pcb_printer_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:block/electric_pcb_printer_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:block/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..824a15b --- /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:block/electric_pump_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:block/electric_pump_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:block/electric_pump_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:block/electric_pump_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:block/electric_pump_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:block/electric_pump_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:block/electric_pump_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:block/electric_pump_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:block/electric_pump_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:block/electric_pump_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:block/electric_pump_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:block/electric_pump_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:block/electric_pump_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:block/electric_pump_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:block/electric_pump_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:block/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..7de250f --- /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:block/electric_still_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:block/electric_still_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:block/electric_still_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:block/electric_still_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:block/electric_still_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:block/electric_still_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:block/electric_still_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:block/electric_still_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:block/electric_still_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:block/electric_still_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:block/electric_still_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:block/electric_still_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:block/electric_still_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:block/electric_still_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:block/electric_still_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:block/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..6c3dc63 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_switch.json @@ -0,0 +1,6 @@ +{ + "variants": { + "active=false": { "model": "baseelectric:block/electric_switch_off"}, + "active=true": { "model": "baseelectric:block/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..dfb86b1 --- /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:block/electric_track_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=false,west=false": { "model": "baseelectric:block/electric_track_n", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=false,west=false": { "model": "baseelectric:block/electric_track_n", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=false,west=false": { "model": "baseelectric:block/electric_track_n", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=false,west=false": { "model": "baseelectric:block/electric_track_n", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=true,west=false": { "model": "baseelectric:block/electric_track_n", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=false,west=true": { "model": "baseelectric:block/electric_track_n", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=false,west=false": { "model": "baseelectric:block/electric_track_nw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=false,west=false": { "model": "baseelectric:block/electric_track_nw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=false,west=false": { "model": "baseelectric:block/electric_track_nw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=true,west=false": { "model": "baseelectric:block/electric_track_ns", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=false,west=true": { "model": "baseelectric:block/electric_track_nw", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=false,west=false": { "model": "baseelectric:block/electric_track_nw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=false,west=false": { "model": "baseelectric:block/electric_track_nw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=true,west=false": { "model": "baseelectric:block/electric_track_nw", "x": 270, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=false,west=true": { "model": "baseelectric:block/electric_track_ns", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=false,west=false": { "model": "baseelectric:block/electric_track_ns", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=true,west=false": { "model": "baseelectric:block/electric_track_nw", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=false,west=true": { "model": "baseelectric:block/electric_track_nw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=true,west=false": { "model": "baseelectric:block/electric_track_nw", "x": 270, "y": 270, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=false,west=true": { "model": "baseelectric:block/electric_track_nw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=true,west=true": { "model": "baseelectric:block/electric_track_nw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=false,west=false": { "model": "baseelectric:block/electric_track_nuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=false,west=false": { "model": "baseelectric:block/electric_track_nuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=true,west=false": { "model": "baseelectric:block/electric_track_dnu", "x": 0, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=false,west=true": { "model": "baseelectric:block/electric_track_dnu", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=false,west=false": { "model": "baseelectric:block/electric_track_dnu", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=true,west=false": { "model": "baseelectric:block/electric_track_dnu", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=false,west=true": { "model": "baseelectric:block/electric_track_nuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=true,west=false": { "model": "baseelectric:block/electric_track_dnu", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=false,west=true": { "model": "baseelectric:block/electric_track_nuw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=true,west=true": { "model": "baseelectric:block/electric_track_dnu", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=false,west=false": { "model": "baseelectric:block/electric_track_nsw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=true,west=false": { "model": "baseelectric:block/electric_track_nuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=false,west=true": { "model": "baseelectric:block/electric_track_nsw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=true,west=false": { "model": "baseelectric:block/electric_track_nuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=false,west=true": { "model": "baseelectric:block/electric_track_nsw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=true,west=true": { "model": "baseelectric:block/electric_track_dnu", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=true,west=false": { "model": "baseelectric:block/electric_track_dnu", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=false,west=true": { "model": "baseelectric:block/electric_track_nsw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=true,west=true": { "model": "baseelectric:block/electric_track_nuw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=true,west=true": { "model": "baseelectric:block/electric_track_nuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=false,west=false": { "model": "baseelectric:block/electric_track_nsuw", "x": 180, "y": 180, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=true,west=false": { "model": "baseelectric:block/electric_track_nsuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=false,west=true": { "model": "baseelectric:block/electric_track_nsuw", "x": 180, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=true,west=false": { "model": "baseelectric:block/electric_track_nsuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=false,west=true": { "model": "baseelectric:block/electric_track_nsuw", "x": 180, "y": 270, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=true,west=true": { "model": "baseelectric:block/electric_track_ensw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=true,west=false": { "model": "baseelectric:block/electric_track_ensw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=false,west=true": { "model": "baseelectric:block/electric_track_nsuw", "x": 180, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=true,west=true": { "model": "baseelectric:block/electric_track_nsuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=true,west=true": { "model": "baseelectric:block/electric_track_nsuw", "x": 90, "y": 270, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=true,west=false": { "model": "baseelectric:block/electric_track_nsuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=false,west=true": { "model": "baseelectric:block/electric_track_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=true,west=true": { "model": "baseelectric:block/electric_track_nsuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=true,west=true": { "model": "baseelectric:block/electric_track_nsuw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=true,west=true": { "model": "baseelectric:block/electric_track_nsuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=true,west=false": { "model": "baseelectric:block/electric_track_desuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=false,west=true": { "model": "baseelectric:block/electric_track_desuw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=true,west=true": { "model": "baseelectric:block/electric_track_desuw", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=true,west=true": { "model": "baseelectric:block/electric_track_desuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=true,west=true": { "model": "baseelectric:block/electric_track_desuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=true,west=true": { "model": "baseelectric:block/electric_track_desuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=true,west=true": { "model": "baseelectric:block/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..2de11c5 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/geothermal_generator.json @@ -0,0 +1,12 @@ +{ + "variants": { + "active=true,facing=east": { "model": "baseelectric:block/geothermal_generator", "y": 90 }, + "active=true,facing=north": { "model": "baseelectric:block/geothermal_generator" }, + "active=true,facing=south": { "model": "baseelectric:block/geothermal_generator", "y": 180 }, + "active=true,facing=west": { "model": "baseelectric:block/geothermal_generator", "y": 270 }, + "active=false,facing=east": { "model": "baseelectric:block/geothermal_generator", "y": 90 }, + "active=false,facing=north": { "model": "baseelectric:block/geothermal_generator" }, + "active=false,facing=south": { "model": "baseelectric:block/geothermal_generator", "y": 180 }, + "active=false,facing=west": { "model": "baseelectric:block/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..71f94e4 --- /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:block/growth_chamber_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:block/growth_chamber_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:block/growth_chamber_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:block/growth_chamber_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:block/growth_chamber_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:block/growth_chamber_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:block/growth_chamber_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:block/growth_chamber_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:block/growth_chamber_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:block/growth_chamber_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:block/growth_chamber_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:block/growth_chamber_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:block/growth_chamber_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:block/growth_chamber_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:block/growth_chamber_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:block/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..afc5338 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/growth_chamber_controller.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "baseelectric:block/growth_chamber_controller", "y": 90 }, + "facing=north": { "model": "baseelectric:block/growth_chamber_controller" }, + "facing=south": { "model": "baseelectric:block/growth_chamber_controller", "y": 180 }, + "facing=west": { "model": "baseelectric:block/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..177f2bb --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/hydroelectric_generator.json @@ -0,0 +1,12 @@ +{ + "variants": { + "active=true,facing=east": { "model": "baseelectric:block/hydroelectric_generator_on", "y": 90 }, + "active=true,facing=north": { "model": "baseelectric:block/hydroelectric_generator_on" }, + "active=true,facing=south": { "model": "baseelectric:block/hydroelectric_generator_on", "y": 180 }, + "active=true,facing=west": { "model": "baseelectric:block/hydroelectric_generator_on", "y": 270 }, + "active=false,facing=east": { "model": "baseelectric:block/hydroelectric_generator_off", "y": 90 }, + "active=false,facing=north": { "model": "baseelectric:block/hydroelectric_generator_off" }, + "active=false,facing=south": { "model": "baseelectric:block/hydroelectric_generator_off", "y": 180 }, + "active=false,facing=west": { "model": "baseelectric:block/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..5eea002 --- /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:block/laser_turret", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:block/laser_turret" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:block/laser_turret", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:block/laser_turret", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:block/laser_turret", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:block/laser_turret" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:block/laser_turret", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:block/laser_turret", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:block/laser_turret", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:block/laser_turret" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:block/laser_turret", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:block/laser_turret", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:block/laser_turret", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:block/laser_turret" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:block/laser_turret", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:block/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..5eea002 --- /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:block/laser_turret", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:block/laser_turret" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:block/laser_turret", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:block/laser_turret", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:block/laser_turret", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:block/laser_turret" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:block/laser_turret", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:block/laser_turret", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:block/laser_turret", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:block/laser_turret" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:block/laser_turret", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:block/laser_turret", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:block/laser_turret", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:block/laser_turret" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:block/laser_turret", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:block/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..a5e71cf --- /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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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..b2d2415 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/li_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "baseelectric:block/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..a9a138a --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/photovoltaic_generator.json @@ -0,0 +1,12 @@ +{ + "variants": { + "active=true,facing=east": { "model": "baseelectric:block/photovoltaic_generator", "y": 90 }, + "active=true,facing=north": { "model": "baseelectric:block/photovoltaic_generator" }, + "active=true,facing=south": { "model": "baseelectric:block/photovoltaic_generator", "y": 180 }, + "active=true,facing=west": { "model": "baseelectric:block/photovoltaic_generator", "y": 270 }, + "active=false,facing=east": { "model": "baseelectric:block/photovoltaic_generator", "y": 90 }, + "active=false,facing=north": { "model": "baseelectric:block/photovoltaic_generator" }, + "active=false,facing=south": { "model": "baseelectric:block/photovoltaic_generator", "y": 180 }, + "active=false,facing=west": { "model": "baseelectric:block/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..88f0a07 --- /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:block/plastic_refinery_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:block/plastic_refinery_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:block/plastic_refinery_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:block/plastic_refinery_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:block/plastic_refinery_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:block/plastic_refinery_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:block/plastic_refinery_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:block/plastic_refinery_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:block/plastic_refinery_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:block/plastic_refinery_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:block/plastic_refinery_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:block/plastic_refinery_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:block/plastic_refinery_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:block/plastic_refinery_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:block/plastic_refinery_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:block/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..1f6c9c3 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/pump_pipe_electric.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": {"model": "basepower:block/fluid_pipe_ns", "x": 90, "y": 0, "uvlock": false } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/steam_powered_generator.json b/src/main/resources/assets/baseelectric/blockstates/steam_powered_generator.json new file mode 100644 index 0000000..4eeddd9 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/steam_powered_generator.json @@ -0,0 +1,12 @@ +{ + "variants": { + "active=true,facing=east": { "model": "baseelectric:block/steam_powered_generator_on", "y": 90 }, + "active=true,facing=north": { "model": "baseelectric:block/steam_powered_generator_on" }, + "active=true,facing=south": { "model": "baseelectric:block/steam_powered_generator_on", "y": 180 }, + "active=true,facing=west": { "model": "baseelectric:block/steam_powered_generator_on", "y": 270 }, + "active=false,facing=east": { "model": "baseelectric:block/steam_powered_generator_off", "y": 90 }, + "active=false,facing=north": { "model": "baseelectric:block/steam_powered_generator_off" }, + "active=false,facing=south": { "model": "baseelectric:block/steam_powered_generator_off", "y": 180 }, + "active=false,facing=west": { "model": "baseelectric:block/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..93bc0c2 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/sulfur_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "baseelectric:block/sulfur_ore" } + } +} diff --git a/src/main/resources/assets/baseelectric/lang/de_de.json b/src/main/resources/assets/baseelectric/lang/de_de.json new file mode 100644 index 0000000..701f1a8 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/de_de.json @@ -0,0 +1,92 @@ +{ + "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", + "item.baseelectric.blank_circuit_board": "Leiterplatte (Leer)", + "item.baseelectric.control_circuit": "Steuerstromkreis", + "item.baseelectric.integrated_circuit": "Mikrochip", + "item.baseelectric.psu": "Netzteil", + "item.baseelectric.silicon_ingot": "Silizium-Ingots", + "item.baseelectric.silicon_mix": "Silizium-Mischung", + "item.baseelectric.solder_mix": "Lötmetall Mischung", + "item.baseelectric.solder": "Lötmetall", + "item.baseelectric.li_powder": "Pulverisierte Lithium", + "item.baseelectric.li_ingot": "Lithium-Barren", + "item.baseelectric.li_nugget": "Lithium Nugget", + "item.baseelectric.sulfur_powder": "Schwefelpulver", + "item.baseelectric.lead_acid_battery": "Blei-Säure-Batterie", + "item.baseelectric.nickel_hydride_battery": "Nickel-Metallhydrid-Batterie", + "item.baseelectric.alkaline_battery": "Alkali-Batterie", + "item.baseelectric.lithium_battery": "Lithium-Ionen-Batterie", + "block.baseelectric.electric_conduit": "Elektrischen Draht", + "block.baseelectric.electric_track": "Elektro-Gerüst", + "block.baseelectric.electric_battery_array": "Batterie Array", + "block.baseelectric.electric_crusher": "Elektrische Felsen-Zerkleinerungsmaschine", + "block.baseelectric.laser_turret": "Laser-Verteidigung Waffe", + "block.baseelectric.electric_drill": "Laser Bohrer", + "block.baseelectric.electric_fabricator": "Automatisierte Fabrik", + "block.baseelectric.electric_furnace": "Lichtbogenofen", + "block.baseelectric.electric_oven": "Elektro-Ofen", + "block.baseelectric.electric_pcb_printer": "PCB Drucker", + "block.baseelectric.geothermal_generator": "Geothermal Generator", + "block.baseelectric.hydroelectric_generator": "Hydroelectric Generator", + "block.baseelectric.photovoltaic_generator": "Photovoltaik-Generator", + "block.baseelectric.steam_powered_generator": "Pumpenlose Stromerzeuger", + "block.baseelectric.growth_chamber": "Wachstumskammer", + "block.baseelectric.growth_chamber_controller": "Wachstumskammer Steuereinheit", + "block.baseelectric.li_ore": "Lithiumerz", + "block.baseelectric.sulfur_ore": "Schwefelerz", + "block.baseelectric.led_bar": "LED Draht", + "block.baseelectric.electric_switch": "Elektrische Schalter", + "block.baseelectric.electric_still": "Elektro Brennerei", + "block.baseelectric.electric_pump": "Elektropumpe", + "block.baseelectric.plastic_refinery": "Kunststoff-Raffinerie", + "item.baseelectric.petrolplastic_ingot": "Erdöl Kunststoff Barren", + "block.baseelectric.pump_pipe_electric": "Pumpenrohr", + "block.baseelectric.laser_turret_evil": "Laser-Verteidigung Waffe" +} diff --git a/src/main/resources/assets/baseelectric/lang/en_au.json b/src/main/resources/assets/baseelectric/lang/en_au.json new file mode 100644 index 0000000..da4538f --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/en_au.json @@ -0,0 +1,92 @@ +{ + "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", + "item.baseelectric.blank_circuit_board": "Circuit Board (Blank)", + "item.baseelectric.control_circuit": "Control Circuit", + "item.baseelectric.integrated_circuit": "Microchip", + "item.baseelectric.psu": "Power Supply Unit", + "item.baseelectric.silicon_ingot": "Silicon Ingot", + "item.baseelectric.silicon_mix": "Silicon Blend", + "item.baseelectric.solder_mix": "Solder Blend", + "item.baseelectric.solder": "Solder", + "item.baseelectric.li_powder": "Powdered Lithium", + "item.baseelectric.li_ingot": "Lithium Ingot", + "item.baseelectric.li_nugget": "Lithium Nugget", + "item.baseelectric.sulfur_powder": "Powdered Sulfur", + "item.baseelectric.lead_acid_battery": "Lead-Acid Battery", + "item.baseelectric.nickel_hydride_battery": "Nickel-Metal Hydride Battery", + "item.baseelectric.alkaline_battery": "Alkaline Battery", + "item.baseelectric.lithium_battery": "Lithium-Ion Battery", + "block.baseelectric.electric_conduit": "Electric Power Cable", + "block.baseelectric.electric_track": "Electric Scaffold", + "block.baseelectric.electric_battery_array": "Battery Array", + "block.baseelectric.electric_crusher": "Electric Rock Crusher", + "block.baseelectric.laser_turret": "Laser Defense Turret", + "block.baseelectric.electric_drill": "Electric Mining Drill", + "block.baseelectric.electric_fabricator": "Automated Assembler", + "block.baseelectric.electric_furnace": "Electric Arc Furnace", + "block.baseelectric.electric_oven": "Electric Oven", + "block.baseelectric.electric_pcb_printer": "PCB Printer", + "block.baseelectric.geothermal_generator": "Geothermal Generator", + "block.baseelectric.hydroelectric_generator": "Hydroelectric Generator", + "block.baseelectric.photovoltaic_generator": "Photovoltaic Generator", + "block.baseelectric.steam_powered_generator": "Steam-Powered Electric Generator", + "block.baseelectric.growth_chamber": "Growth Chamber", + "block.baseelectric.growth_chamber_controller": "Growth Chamber Control Unit", + "block.baseelectric.li_ore": "Lithium Ore", + "block.baseelectric.sulfur_ore": "Sulfur Ore", + "block.baseelectric.led_bar": "LED Bar", + "block.baseelectric.electric_switch": "Electric Switch", + "block.baseelectric.electric_still": "Electric Distiller", + "block.baseelectric.electric_pump": "Electric Pump", + "block.baseelectric.plastic_refinery": "Petro-Plastic Refinery", + "item.baseelectric.petrolplastic_ingot": "Petro-Plastic Ingot", + "block.baseelectric.pump_pipe_electric": "Pump Pipe", + "block.baseelectric.laser_turret_evil": "Laser Defense Turret" +} diff --git a/src/main/resources/assets/baseelectric/lang/en_ca.json b/src/main/resources/assets/baseelectric/lang/en_ca.json new file mode 100644 index 0000000..da4538f --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/en_ca.json @@ -0,0 +1,92 @@ +{ + "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", + "item.baseelectric.blank_circuit_board": "Circuit Board (Blank)", + "item.baseelectric.control_circuit": "Control Circuit", + "item.baseelectric.integrated_circuit": "Microchip", + "item.baseelectric.psu": "Power Supply Unit", + "item.baseelectric.silicon_ingot": "Silicon Ingot", + "item.baseelectric.silicon_mix": "Silicon Blend", + "item.baseelectric.solder_mix": "Solder Blend", + "item.baseelectric.solder": "Solder", + "item.baseelectric.li_powder": "Powdered Lithium", + "item.baseelectric.li_ingot": "Lithium Ingot", + "item.baseelectric.li_nugget": "Lithium Nugget", + "item.baseelectric.sulfur_powder": "Powdered Sulfur", + "item.baseelectric.lead_acid_battery": "Lead-Acid Battery", + "item.baseelectric.nickel_hydride_battery": "Nickel-Metal Hydride Battery", + "item.baseelectric.alkaline_battery": "Alkaline Battery", + "item.baseelectric.lithium_battery": "Lithium-Ion Battery", + "block.baseelectric.electric_conduit": "Electric Power Cable", + "block.baseelectric.electric_track": "Electric Scaffold", + "block.baseelectric.electric_battery_array": "Battery Array", + "block.baseelectric.electric_crusher": "Electric Rock Crusher", + "block.baseelectric.laser_turret": "Laser Defense Turret", + "block.baseelectric.electric_drill": "Electric Mining Drill", + "block.baseelectric.electric_fabricator": "Automated Assembler", + "block.baseelectric.electric_furnace": "Electric Arc Furnace", + "block.baseelectric.electric_oven": "Electric Oven", + "block.baseelectric.electric_pcb_printer": "PCB Printer", + "block.baseelectric.geothermal_generator": "Geothermal Generator", + "block.baseelectric.hydroelectric_generator": "Hydroelectric Generator", + "block.baseelectric.photovoltaic_generator": "Photovoltaic Generator", + "block.baseelectric.steam_powered_generator": "Steam-Powered Electric Generator", + "block.baseelectric.growth_chamber": "Growth Chamber", + "block.baseelectric.growth_chamber_controller": "Growth Chamber Control Unit", + "block.baseelectric.li_ore": "Lithium Ore", + "block.baseelectric.sulfur_ore": "Sulfur Ore", + "block.baseelectric.led_bar": "LED Bar", + "block.baseelectric.electric_switch": "Electric Switch", + "block.baseelectric.electric_still": "Electric Distiller", + "block.baseelectric.electric_pump": "Electric Pump", + "block.baseelectric.plastic_refinery": "Petro-Plastic Refinery", + "item.baseelectric.petrolplastic_ingot": "Petro-Plastic Ingot", + "block.baseelectric.pump_pipe_electric": "Pump Pipe", + "block.baseelectric.laser_turret_evil": "Laser Defense Turret" +} diff --git a/src/main/resources/assets/baseelectric/lang/en_en.json b/src/main/resources/assets/baseelectric/lang/en_en.json new file mode 100644 index 0000000..e92335b --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/en_en.json @@ -0,0 +1,92 @@ +{ + "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", + "item.baseelectric.blank_circuit_board": "Circuit Board (Blank)", + "item.baseelectric.control_circuit": "Control Circuit", + "item.baseelectric.integrated_circuit": "Microchip", + "item.baseelectric.psu": "Power Supply Unit", + "item.baseelectric.silicon_ingot": "Silicon Ingot", + "item.baseelectric.silicon_mix": "Silicon Blend", + "item.baseelectric.solder_mix": "Solder Blend", + "item.baseelectric.solder": "Solder", + "item.baseelectric.li_powder": "Powdered Lithium", + "item.baseelectric.li_ingot": "Lithium Ingot", + "item.baseelectric.li_nugget": "Lithium Nugget", + "item.baseelectric.sulfur_powder": "Powdered Sulfur", + "item.baseelectric.lead_acid_battery": "Lead-Acid Battery", + "item.baseelectric.nickel_hydride_battery": "Nickel-Metal Hydride Battery", + "item.baseelectric.alkaline_battery": "Alkaline Battery", + "item.baseelectric.lithium_battery": "Lithium-Ion Battery", + "block.baseelectric.electric_conduit": "Electric Power Cable", + "block.baseelectric.electric_track": "Electric Scaffold", + "block.baseelectric.electric_battery_array": "Battery Array", + "block.baseelectric.electric_crusher": "Electric Rock Crusher", + "block.baseelectric.laser_turret": "Laser Turret", + "block.baseelectric.electric_drill": "Electric Mining Drill", + "block.baseelectric.electric_fabricator": "Automated Assembler", + "block.baseelectric.electric_furnace": "Electric Arc Furnace", + "block.baseelectric.electric_oven": "Electric Oven", + "block.baseelectric.electric_pcb_printer": "PCB Printer", + "block.baseelectric.geothermal_generator": "Geothermal Generator", + "block.baseelectric.hydroelectric_generator": "Hydroelectric Generator", + "block.baseelectric.photovoltaic_generator": "Photovoltaic Generator", + "block.baseelectric.steam_powered_generator": "Steam-Powered Electric Generator", + "block.baseelectric.growth_chamber": "Growth Chamber", + "block.baseelectric.growth_chamber_controller": "Growth Chamber Control Unit", + "block.baseelectric.li_ore": "Lithium Ore", + "block.baseelectric.sulfur_ore": "Sulfur Ore", + "block.baseelectric.led_bar": "LED Bar", + "block.baseelectric.electric_switch": "Electric Switch", + "block.baseelectric.electric_still": "Electric Distiller", + "block.baseelectric.electric_pump": "Electric Pump", + "block.baseelectric.plastic_refinery": "Petro-Plastic Refinery", + "item.baseelectric.petrolplastic_ingot": "Petro-Plastic Ingot", + "block.baseelectric.pump_pipe_electric": "Pump Pipe", + "block.baseelectric.laser_turret_evil": "Laser Turret" +} diff --git a/src/main/resources/assets/baseelectric/lang/en_gb.json b/src/main/resources/assets/baseelectric/lang/en_gb.json new file mode 100644 index 0000000..da4538f --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/en_gb.json @@ -0,0 +1,92 @@ +{ + "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", + "item.baseelectric.blank_circuit_board": "Circuit Board (Blank)", + "item.baseelectric.control_circuit": "Control Circuit", + "item.baseelectric.integrated_circuit": "Microchip", + "item.baseelectric.psu": "Power Supply Unit", + "item.baseelectric.silicon_ingot": "Silicon Ingot", + "item.baseelectric.silicon_mix": "Silicon Blend", + "item.baseelectric.solder_mix": "Solder Blend", + "item.baseelectric.solder": "Solder", + "item.baseelectric.li_powder": "Powdered Lithium", + "item.baseelectric.li_ingot": "Lithium Ingot", + "item.baseelectric.li_nugget": "Lithium Nugget", + "item.baseelectric.sulfur_powder": "Powdered Sulfur", + "item.baseelectric.lead_acid_battery": "Lead-Acid Battery", + "item.baseelectric.nickel_hydride_battery": "Nickel-Metal Hydride Battery", + "item.baseelectric.alkaline_battery": "Alkaline Battery", + "item.baseelectric.lithium_battery": "Lithium-Ion Battery", + "block.baseelectric.electric_conduit": "Electric Power Cable", + "block.baseelectric.electric_track": "Electric Scaffold", + "block.baseelectric.electric_battery_array": "Battery Array", + "block.baseelectric.electric_crusher": "Electric Rock Crusher", + "block.baseelectric.laser_turret": "Laser Defense Turret", + "block.baseelectric.electric_drill": "Electric Mining Drill", + "block.baseelectric.electric_fabricator": "Automated Assembler", + "block.baseelectric.electric_furnace": "Electric Arc Furnace", + "block.baseelectric.electric_oven": "Electric Oven", + "block.baseelectric.electric_pcb_printer": "PCB Printer", + "block.baseelectric.geothermal_generator": "Geothermal Generator", + "block.baseelectric.hydroelectric_generator": "Hydroelectric Generator", + "block.baseelectric.photovoltaic_generator": "Photovoltaic Generator", + "block.baseelectric.steam_powered_generator": "Steam-Powered Electric Generator", + "block.baseelectric.growth_chamber": "Growth Chamber", + "block.baseelectric.growth_chamber_controller": "Growth Chamber Control Unit", + "block.baseelectric.li_ore": "Lithium Ore", + "block.baseelectric.sulfur_ore": "Sulfur Ore", + "block.baseelectric.led_bar": "LED Bar", + "block.baseelectric.electric_switch": "Electric Switch", + "block.baseelectric.electric_still": "Electric Distiller", + "block.baseelectric.electric_pump": "Electric Pump", + "block.baseelectric.plastic_refinery": "Petro-Plastic Refinery", + "item.baseelectric.petrolplastic_ingot": "Petro-Plastic Ingot", + "block.baseelectric.pump_pipe_electric": "Pump Pipe", + "block.baseelectric.laser_turret_evil": "Laser Defense Turret" +} diff --git a/src/main/resources/assets/baseelectric/lang/en_pt.json b/src/main/resources/assets/baseelectric/lang/en_pt.json new file mode 100644 index 0000000..e92335b --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/en_pt.json @@ -0,0 +1,92 @@ +{ + "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", + "item.baseelectric.blank_circuit_board": "Circuit Board (Blank)", + "item.baseelectric.control_circuit": "Control Circuit", + "item.baseelectric.integrated_circuit": "Microchip", + "item.baseelectric.psu": "Power Supply Unit", + "item.baseelectric.silicon_ingot": "Silicon Ingot", + "item.baseelectric.silicon_mix": "Silicon Blend", + "item.baseelectric.solder_mix": "Solder Blend", + "item.baseelectric.solder": "Solder", + "item.baseelectric.li_powder": "Powdered Lithium", + "item.baseelectric.li_ingot": "Lithium Ingot", + "item.baseelectric.li_nugget": "Lithium Nugget", + "item.baseelectric.sulfur_powder": "Powdered Sulfur", + "item.baseelectric.lead_acid_battery": "Lead-Acid Battery", + "item.baseelectric.nickel_hydride_battery": "Nickel-Metal Hydride Battery", + "item.baseelectric.alkaline_battery": "Alkaline Battery", + "item.baseelectric.lithium_battery": "Lithium-Ion Battery", + "block.baseelectric.electric_conduit": "Electric Power Cable", + "block.baseelectric.electric_track": "Electric Scaffold", + "block.baseelectric.electric_battery_array": "Battery Array", + "block.baseelectric.electric_crusher": "Electric Rock Crusher", + "block.baseelectric.laser_turret": "Laser Turret", + "block.baseelectric.electric_drill": "Electric Mining Drill", + "block.baseelectric.electric_fabricator": "Automated Assembler", + "block.baseelectric.electric_furnace": "Electric Arc Furnace", + "block.baseelectric.electric_oven": "Electric Oven", + "block.baseelectric.electric_pcb_printer": "PCB Printer", + "block.baseelectric.geothermal_generator": "Geothermal Generator", + "block.baseelectric.hydroelectric_generator": "Hydroelectric Generator", + "block.baseelectric.photovoltaic_generator": "Photovoltaic Generator", + "block.baseelectric.steam_powered_generator": "Steam-Powered Electric Generator", + "block.baseelectric.growth_chamber": "Growth Chamber", + "block.baseelectric.growth_chamber_controller": "Growth Chamber Control Unit", + "block.baseelectric.li_ore": "Lithium Ore", + "block.baseelectric.sulfur_ore": "Sulfur Ore", + "block.baseelectric.led_bar": "LED Bar", + "block.baseelectric.electric_switch": "Electric Switch", + "block.baseelectric.electric_still": "Electric Distiller", + "block.baseelectric.electric_pump": "Electric Pump", + "block.baseelectric.plastic_refinery": "Petro-Plastic Refinery", + "item.baseelectric.petrolplastic_ingot": "Petro-Plastic Ingot", + "block.baseelectric.pump_pipe_electric": "Pump Pipe", + "block.baseelectric.laser_turret_evil": "Laser Turret" +} diff --git a/src/main/resources/assets/baseelectric/lang/en_us.json b/src/main/resources/assets/baseelectric/lang/en_us.json new file mode 100644 index 0000000..e92335b --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/en_us.json @@ -0,0 +1,92 @@ +{ + "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", + "item.baseelectric.blank_circuit_board": "Circuit Board (Blank)", + "item.baseelectric.control_circuit": "Control Circuit", + "item.baseelectric.integrated_circuit": "Microchip", + "item.baseelectric.psu": "Power Supply Unit", + "item.baseelectric.silicon_ingot": "Silicon Ingot", + "item.baseelectric.silicon_mix": "Silicon Blend", + "item.baseelectric.solder_mix": "Solder Blend", + "item.baseelectric.solder": "Solder", + "item.baseelectric.li_powder": "Powdered Lithium", + "item.baseelectric.li_ingot": "Lithium Ingot", + "item.baseelectric.li_nugget": "Lithium Nugget", + "item.baseelectric.sulfur_powder": "Powdered Sulfur", + "item.baseelectric.lead_acid_battery": "Lead-Acid Battery", + "item.baseelectric.nickel_hydride_battery": "Nickel-Metal Hydride Battery", + "item.baseelectric.alkaline_battery": "Alkaline Battery", + "item.baseelectric.lithium_battery": "Lithium-Ion Battery", + "block.baseelectric.electric_conduit": "Electric Power Cable", + "block.baseelectric.electric_track": "Electric Scaffold", + "block.baseelectric.electric_battery_array": "Battery Array", + "block.baseelectric.electric_crusher": "Electric Rock Crusher", + "block.baseelectric.laser_turret": "Laser Turret", + "block.baseelectric.electric_drill": "Electric Mining Drill", + "block.baseelectric.electric_fabricator": "Automated Assembler", + "block.baseelectric.electric_furnace": "Electric Arc Furnace", + "block.baseelectric.electric_oven": "Electric Oven", + "block.baseelectric.electric_pcb_printer": "PCB Printer", + "block.baseelectric.geothermal_generator": "Geothermal Generator", + "block.baseelectric.hydroelectric_generator": "Hydroelectric Generator", + "block.baseelectric.photovoltaic_generator": "Photovoltaic Generator", + "block.baseelectric.steam_powered_generator": "Steam-Powered Electric Generator", + "block.baseelectric.growth_chamber": "Growth Chamber", + "block.baseelectric.growth_chamber_controller": "Growth Chamber Control Unit", + "block.baseelectric.li_ore": "Lithium Ore", + "block.baseelectric.sulfur_ore": "Sulfur Ore", + "block.baseelectric.led_bar": "LED Bar", + "block.baseelectric.electric_switch": "Electric Switch", + "block.baseelectric.electric_still": "Electric Distiller", + "block.baseelectric.electric_pump": "Electric Pump", + "block.baseelectric.plastic_refinery": "Petro-Plastic Refinery", + "item.baseelectric.petrolplastic_ingot": "Petro-Plastic Ingot", + "block.baseelectric.pump_pipe_electric": "Pump Pipe", + "block.baseelectric.laser_turret_evil": "Laser Turret" +} diff --git a/src/main/resources/assets/baseelectric/lang/es_es.json b/src/main/resources/assets/baseelectric/lang/es_es.json new file mode 100644 index 0000000..a280b69 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/es_es.json @@ -0,0 +1,92 @@ +{ + "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", + "item.baseelectric.blank_circuit_board": "Placa de Circuito (Blanco)", + "item.baseelectric.control_circuit": "Circuito de Computadora", + "item.baseelectric.integrated_circuit": "Microchip", + "item.baseelectric.psu": "Unidad de Fuente de Alimentación", + "item.baseelectric.silicon_ingot": "Silicio Lingote", + "item.baseelectric.silicon_mix": "Blend Silicio", + "item.baseelectric.solder_mix": "Blend Soldadura", + "item.baseelectric.solder": "Soldadura", + "item.baseelectric.li_powder": "Polvo de Litio", + "item.baseelectric.li_ingot": "Litio Lingote", + "item.baseelectric.li_nugget": "Pepita de Litio", + "item.baseelectric.sulfur_powder": "Azufre en Polvo", + "item.baseelectric.lead_acid_battery": "Plomo-Ácido de la Batería", + "item.baseelectric.nickel_hydride_battery": "Níquel e Hidruro Metálico", + "item.baseelectric.alkaline_battery": "Batería Alcalina", + "item.baseelectric.lithium_battery": "Batería de Litio-Ion", + "block.baseelectric.electric_conduit": "Cable de Energía Eléctrica", + "block.baseelectric.electric_track": "Eléctrica Andamios", + "block.baseelectric.electric_battery_array": "Batería Matriz", + "block.baseelectric.electric_crusher": "Eléctrica de la Roca Trituradora", + "block.baseelectric.laser_turret": "Laser Defensa Torreta", + "block.baseelectric.electric_drill": "Eléctrica Minería Taladro", + "block.baseelectric.electric_fabricator": "Automatizado Ensamblador", + "block.baseelectric.electric_furnace": "Horno de Arco Eléctrico", + "block.baseelectric.electric_oven": "Horno Eléctrico", + "block.baseelectric.electric_pcb_printer": "PCB Impresora", + "block.baseelectric.geothermal_generator": "Geotérmica Generador", + "block.baseelectric.hydroelectric_generator": "Hidroeléctrico Generador", + "block.baseelectric.photovoltaic_generator": "Fotovoltaica Generador", + "block.baseelectric.steam_powered_generator": "a Vapor Generador Eléctrico", + "block.baseelectric.growth_chamber": "Cámara Crecimiento", + "block.baseelectric.growth_chamber_controller": "Unidad de Control de Crecimiento Cámara", + "block.baseelectric.li_ore": "Mineral de Litio", + "block.baseelectric.sulfur_ore": "Mineral de Azufre", + "block.baseelectric.led_bar": "Luz LED", + "block.baseelectric.electric_switch": "Interruptor Eléctrico", + "block.baseelectric.electric_still": "Destilador Eléctrico", + "block.baseelectric.electric_pump": "Bomba Eléctrica", + "block.baseelectric.plastic_refinery": "Refinería de Plástico", + "item.baseelectric.petrolplastic_ingot": "Petróleo Lingote de Plástico", + "block.baseelectric.pump_pipe_electric": "Tubería de la Bomba", + "block.baseelectric.laser_turret_evil": "Laser Defensa Torreta" +} diff --git a/src/main/resources/assets/baseelectric/lang/es_mx.json b/src/main/resources/assets/baseelectric/lang/es_mx.json new file mode 100644 index 0000000..a280b69 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/es_mx.json @@ -0,0 +1,92 @@ +{ + "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", + "item.baseelectric.blank_circuit_board": "Placa de Circuito (Blanco)", + "item.baseelectric.control_circuit": "Circuito de Computadora", + "item.baseelectric.integrated_circuit": "Microchip", + "item.baseelectric.psu": "Unidad de Fuente de Alimentación", + "item.baseelectric.silicon_ingot": "Silicio Lingote", + "item.baseelectric.silicon_mix": "Blend Silicio", + "item.baseelectric.solder_mix": "Blend Soldadura", + "item.baseelectric.solder": "Soldadura", + "item.baseelectric.li_powder": "Polvo de Litio", + "item.baseelectric.li_ingot": "Litio Lingote", + "item.baseelectric.li_nugget": "Pepita de Litio", + "item.baseelectric.sulfur_powder": "Azufre en Polvo", + "item.baseelectric.lead_acid_battery": "Plomo-Ácido de la Batería", + "item.baseelectric.nickel_hydride_battery": "Níquel e Hidruro Metálico", + "item.baseelectric.alkaline_battery": "Batería Alcalina", + "item.baseelectric.lithium_battery": "Batería de Litio-Ion", + "block.baseelectric.electric_conduit": "Cable de Energía Eléctrica", + "block.baseelectric.electric_track": "Eléctrica Andamios", + "block.baseelectric.electric_battery_array": "Batería Matriz", + "block.baseelectric.electric_crusher": "Eléctrica de la Roca Trituradora", + "block.baseelectric.laser_turret": "Laser Defensa Torreta", + "block.baseelectric.electric_drill": "Eléctrica Minería Taladro", + "block.baseelectric.electric_fabricator": "Automatizado Ensamblador", + "block.baseelectric.electric_furnace": "Horno de Arco Eléctrico", + "block.baseelectric.electric_oven": "Horno Eléctrico", + "block.baseelectric.electric_pcb_printer": "PCB Impresora", + "block.baseelectric.geothermal_generator": "Geotérmica Generador", + "block.baseelectric.hydroelectric_generator": "Hidroeléctrico Generador", + "block.baseelectric.photovoltaic_generator": "Fotovoltaica Generador", + "block.baseelectric.steam_powered_generator": "a Vapor Generador Eléctrico", + "block.baseelectric.growth_chamber": "Cámara Crecimiento", + "block.baseelectric.growth_chamber_controller": "Unidad de Control de Crecimiento Cámara", + "block.baseelectric.li_ore": "Mineral de Litio", + "block.baseelectric.sulfur_ore": "Mineral de Azufre", + "block.baseelectric.led_bar": "Luz LED", + "block.baseelectric.electric_switch": "Interruptor Eléctrico", + "block.baseelectric.electric_still": "Destilador Eléctrico", + "block.baseelectric.electric_pump": "Bomba Eléctrica", + "block.baseelectric.plastic_refinery": "Refinería de Plástico", + "item.baseelectric.petrolplastic_ingot": "Petróleo Lingote de Plástico", + "block.baseelectric.pump_pipe_electric": "Tubería de la Bomba", + "block.baseelectric.laser_turret_evil": "Laser Defensa Torreta" +} diff --git a/src/main/resources/assets/baseelectric/lang/it_it.json b/src/main/resources/assets/baseelectric/lang/it_it.json new file mode 100644 index 0000000..aaa17eb --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/it_it.json @@ -0,0 +1,92 @@ +{ + "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", + "item.baseelectric.blank_circuit_board": "Scheda di Circuito (Vuoto)", + "item.baseelectric.control_circuit": "Circuito di Controllo", + "item.baseelectric.integrated_circuit": "Microcircuito Integrato", + "item.baseelectric.psu": "Alimentatore", + "item.baseelectric.silicon_ingot": "Silicio Lingotto", + "item.baseelectric.silicon_mix": "Silicio Miscela", + "item.baseelectric.solder_mix": "Saldatura Miscela", + "item.baseelectric.solder": "Saldatura", + "item.baseelectric.li_powder": "Polvere di Litio", + "item.baseelectric.li_ingot": "Litio Lingotto", + "item.baseelectric.li_nugget": "Pepita d'Litio", + "item.baseelectric.sulfur_powder": "Zolfo in Polvere", + "item.baseelectric.lead_acid_battery": "Batteria al Piombo", + "item.baseelectric.nickel_hydride_battery": "Ni-MH batteria", + "item.baseelectric.alkaline_battery": "Batteria Alcalina", + "item.baseelectric.lithium_battery": "Agli Ioni di Litio", + "block.baseelectric.electric_conduit": "Cavo Alettrico di Alimentazione", + "block.baseelectric.electric_track": "Ponteggio Elettrico", + "block.baseelectric.electric_battery_array": "Array Batteria", + "block.baseelectric.electric_crusher": "Polverizzatore Masso a Elettrico Alimentata", + "block.baseelectric.laser_turret": "Laser Difesa Torretta", + "block.baseelectric.electric_drill": "Trapano Elettrico", + "block.baseelectric.electric_fabricator": "Fabbrica Automatizzata", + "block.baseelectric.electric_furnace": "Forno Elettrico ad Arco", + "block.baseelectric.electric_oven": "Forno Elettrico", + "block.baseelectric.electric_pcb_printer": "PCB Stampante", + "block.baseelectric.geothermal_generator": "Geotermica Generatore", + "block.baseelectric.hydroelectric_generator": "idroelettrica Generatore", + "block.baseelectric.photovoltaic_generator": "Fotovoltaico Generatore", + "block.baseelectric.steam_powered_generator": "Generatore Elettrico a Vapore", + "block.baseelectric.growth_chamber": "Camera di Crescita", + "block.baseelectric.growth_chamber_controller": "Controllore Camera di Crescita", + "block.baseelectric.li_ore": "Minerale di litio", + "block.baseelectric.sulfur_ore": "Minerale di Zolfo", + "block.baseelectric.led_bar": "Luce a led", + "block.baseelectric.electric_switch": "Interruttore Elettrico", + "block.baseelectric.electric_still": "Distillatore Elettrico", + "block.baseelectric.electric_pump": "Pompa Elettricaa", + "block.baseelectric.plastic_refinery": "Raffineria Plastica", + "item.baseelectric.petrolplastic_ingot": "Petrolio Plastica Lingotto", + "block.baseelectric.pump_pipe_electric": "Tubo Pompa", + "block.baseelectric.laser_turret_evil": "Laser Difesa Torretta" +} diff --git a/src/main/resources/assets/baseelectric/lang/ja_jp.json b/src/main/resources/assets/baseelectric/lang/ja_jp.json new file mode 100644 index 0000000..2ddfbd7 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/ja_jp.json @@ -0,0 +1,92 @@ +{ + "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": "ポンプ配管", + "item.baseelectric.blank_circuit_board": "回路基板 (空の)", + "item.baseelectric.control_circuit": "コンピューター回路", + "item.baseelectric.integrated_circuit": "マイクロチップ", + "item.baseelectric.psu": "電源ユニット", + "item.baseelectric.silicon_ingot": "シリコン", + "item.baseelectric.silicon_mix": "シリコンレシピ", + "item.baseelectric.solder_mix": "はんだレシピ", + "item.baseelectric.solder": "はんだ", + "item.baseelectric.li_powder": "リチウム粉末", + "item.baseelectric.li_ingot": "リチウム金属", + "item.baseelectric.li_nugget": "リチウムナゲット", + "item.baseelectric.sulfur_powder": "硫黄粉末", + "item.baseelectric.lead_acid_battery": "鉛蓄電池", + "item.baseelectric.nickel_hydride_battery": "ニッケル水素バッテリー", + "item.baseelectric.alkaline_battery": "アルカリ電池", + "item.baseelectric.lithium_battery": "リチウムイオン電池", + "block.baseelectric.electric_conduit": "電線", + "block.baseelectric.electric_track": "電動足場", + "block.baseelectric.electric_battery_array": "電池貯蔵", + "block.baseelectric.electric_crusher": "電気岩クラッシャー", + "block.baseelectric.laser_turret": "レーザー砲塔", + "block.baseelectric.electric_drill": "電気ドリル", + "block.baseelectric.electric_fabricator": "ロボット工場", + "block.baseelectric.electric_furnace": "電気炉", + "block.baseelectric.electric_oven": "電気オーブン", + "block.baseelectric.electric_pcb_printer": "回路基板プリンター", + "block.baseelectric.geothermal_generator": "地熱発電", + "block.baseelectric.hydroelectric_generator": "水力発電機", + "block.baseelectric.photovoltaic_generator": "太陽電池パネル", + "block.baseelectric.steam_powered_generator": "蒸気駆動の発電機", + "block.baseelectric.growth_chamber": "植物生長室", + "block.baseelectric.growth_chamber_controller": "植物成長室コントローラ", + "block.baseelectric.li_ore": "リチウム 鉱石", + "block.baseelectric.sulfur_ore": "硫黄鉱石", + "block.baseelectric.led_bar": "LEDライト", + "block.baseelectric.electric_switch": "電気スイッチ", + "block.baseelectric.electric_still": "電気蒸留器", + "block.baseelectric.electric_pump": "電気ポンプ", + "block.baseelectric.plastic_refinery": "プラスチック製油所", + "item.baseelectric.petrolplastic_ingot": "石油系プラスチックインゴット", + "block.baseelectric.pump_pipe_electric": "ポンプ配管", + "block.baseelectric.laser_turret_evil": "レーザー砲塔" +} diff --git a/src/main/resources/assets/baseelectric/lang/ko_ko.json b/src/main/resources/assets/baseelectric/lang/ko_ko.json new file mode 100644 index 0000000..a7ccaf7 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/ko_ko.json @@ -0,0 +1,91 @@ +{ + "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": "펌프 파이프", + "item.baseelectric.blank_circuit_board": "회로 기판 (빈)", + "item.baseelectric.control_circuit": "제어 회로", + "item.baseelectric.integrated_circuit": "마이크로 칩", + "item.baseelectric.psu": "전원 공급 장치", + "item.baseelectric.silicon_ingot": "실리콘 잉곳", + "item.baseelectric.silicon_mix": "실리콘 혼합", + "item.baseelectric.solder_mix": "솔더 혼합", + "item.baseelectric.solder": "솔더", + "item.baseelectric.li_powder": "분말 리튬", + "item.baseelectric.li_ingot": "리튬 잉곳", + "item.baseelectric.li_nugget": "리튬 너겟", + "item.baseelectric.sulfur_powder": "분말 유황", + "item.baseelectric.lead_acid_battery": "납 축전지", + "item.baseelectric.nickel_hydride_battery": "니켈 수소 배터리", + "item.baseelectric.alkaline_battery": "알카라인 배터리", + "item.baseelectric.lithium_battery": "리튬 이온 배터리", + "block.baseelectric.electric_conduit": "전력 케이블", + "block.baseelectric.electric_track": "전기 비계", + "block.baseelectric.electric_battery_array": "전지 어레이", + "block.baseelectric.electric_crusher": "전기 락 크러셔", + "block.baseelectric.laser_turret": "레이저 방어 터렛", + "block.baseelectric.electric_drill": "전기 마이닝 드릴", + "block.baseelectric.electric_fabricator": "자동 어셈블러", + "block.baseelectric.electric_furnace": "전기로", + "block.baseelectric.electric_oven": "전기 오븐", + "block.baseelectric.electric_pcb_printer": "회로 기판 프린터", + "block.baseelectric.geothermal_generator": "지열 발전기", + "block.baseelectric.hydroelectric_generator": "수력 발전기", + "block.baseelectric.photovoltaic_generator": "태양 광 발전기", + "block.baseelectric.steam_powered_generator": "증기 발전기", + "block.baseelectric.growth_chamber": "성장 상공 회의소", + "block.baseelectric.growth_chamber_controller": "성장 챔버 제어 장치", + "block.baseelectric.li_ore": "리튬 광석", + "block.baseelectric.sulfur_ore": "유황 광석", + "block.baseelectric.led_bar": "LED 조명", + "block.baseelectric.electric_switch": "전기 스위치", + "block.baseelectric.electric_still": "전기 증류기", + "block.baseelectric.electric_pump": "전기 펌프", + "block.baseelectric.plastic_refinery": "플라스틱 정유", + "item.baseelectric.petrolplastic_ingot": "석유 수지 잉곳", + "block.baseelectric.pump_pipe_electric": "펌프 파이프", + "block.baseelectric.laser_turret_evil": "레이저 방어 터렛" +} diff --git a/src/main/resources/assets/baseelectric/lang/pt_br.json b/src/main/resources/assets/baseelectric/lang/pt_br.json new file mode 100644 index 0000000..ee2b038 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/pt_br.json @@ -0,0 +1,92 @@ +{ + "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", + "item.baseelectric.blank_circuit_board": "Placa de Circuito (Vago)", + "item.baseelectric.control_circuit": "Circuito de Controle", + "item.baseelectric.integrated_circuit": "Circuito Integrado", + "item.baseelectric.psu": "Unidade de Alimentação", + "item.baseelectric.silicon_ingot": "Silício Lingote", + "item.baseelectric.silicon_mix": "Mistura de Silício", + "item.baseelectric.solder_mix": "Mistura de Solda", + "item.baseelectric.solder": "Solda", + "item.baseelectric.li_powder": "Pó de Lítio", + "item.baseelectric.li_ingot": "Lítio Lingote", + "item.baseelectric.li_nugget": "Pepita de Lítio", + "item.baseelectric.sulfur_powder": "Enxofre em Pó", + "item.baseelectric.lead_acid_battery": "Bateria de Chumbo Ácido", + "item.baseelectric.nickel_hydride_battery": "Bateria Níquel-Hidreto Metálico", + "item.baseelectric.alkaline_battery": "Bateria Alcalina", + "item.baseelectric.lithium_battery": "Bateria de Lítio", + "block.baseelectric.electric_conduit": "Fio Elétrico", + "block.baseelectric.electric_track": "Elétrica Andaime", + "block.baseelectric.electric_battery_array": "Armazenamento da Bateria", + "block.baseelectric.electric_crusher": "Triturador de Rocha Elétrica", + "block.baseelectric.laser_turret": "Torre de Arma a Laser", + "block.baseelectric.electric_drill": "Broca Mineração Elétrica", + "block.baseelectric.electric_fabricator": "Fábrica Automatizada", + "block.baseelectric.electric_furnace": "Forno Elétrico a Arco", + "block.baseelectric.electric_oven": "Forno Elétrico", + "block.baseelectric.electric_pcb_printer": "Impressora Circuito", + "block.baseelectric.geothermal_generator": "Gerador de Elétrico Geotérmica", + "block.baseelectric.hydroelectric_generator": "Gerador Hidrelétrico", + "block.baseelectric.photovoltaic_generator": "Painel Solar", + "block.baseelectric.steam_powered_generator": "a Vapor Gerador Elétrico", + "block.baseelectric.growth_chamber": "Câmara de Crescimento", + "block.baseelectric.growth_chamber_controller": "Unidade de Controle de Crescimento Câmara", + "block.baseelectric.li_ore": "Minério de Lítio", + "block.baseelectric.sulfur_ore": "Minério de Enxofre", + "block.baseelectric.led_bar": "Luz LED", + "block.baseelectric.electric_switch": "Chave Elétrica", + "block.baseelectric.electric_still": "Destilador Elétrico", + "block.baseelectric.electric_pump": "Bomba Elétrica", + "block.baseelectric.plastic_refinery": "Refinaria de Plástico", + "item.baseelectric.petrolplastic_ingot": "Petróleo Plástico Lingote", + "block.baseelectric.pump_pipe_electric": "Tubo de Bomba", + "block.baseelectric.laser_turret_evil": "Torre de Arma a Laser" +} diff --git a/src/main/resources/assets/baseelectric/lang/zh_cn.json b/src/main/resources/assets/baseelectric/lang/zh_cn.json new file mode 100644 index 0000000..cb5bbb6 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/zh_cn.json @@ -0,0 +1,92 @@ +{ + "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": "泵管", + "item.baseelectric.blank_circuit_board": "电路板（空白）", + "item.baseelectric.control_circuit": "控制电路", + "item.baseelectric.integrated_circuit": "微芯片", + "item.baseelectric.psu": "电源单元", + "item.baseelectric.silicon_ingot": "硅锭", + "item.baseelectric.silicon_mix": "硅混合", + "item.baseelectric.solder_mix": "焊接混合", + "item.baseelectric.solder": "焊料", + "item.baseelectric.li_powder": "粉状锂", + "item.baseelectric.li_ingot": "锂锭", + "item.baseelectric.li_nugget": "锂掘金", + "item.baseelectric.sulfur_powder": "硫粉", + "item.baseelectric.lead_acid_battery": "铅酸蓄电池", + "item.baseelectric.nickel_hydride_battery": "镍氢电池", + "item.baseelectric.alkaline_battery": "碱性电池", + "item.baseelectric.lithium_battery": "锂离子电池", + "block.baseelectric.electric_conduit": "电力电缆", + "block.baseelectric.electric_track": "电动脚手架", + "block.baseelectric.electric_battery_array": "电池阵列", + "block.baseelectric.electric_crusher": "电碎石机", + "block.baseelectric.laser_turret": "激光防御炮塔", + "block.baseelectric.electric_drill": "电矿钻", + "block.baseelectric.electric_fabricator": "自动汇编", + "block.baseelectric.electric_furnace": "电弧炉", + "block.baseelectric.electric_oven": "电烤箱", + "block.baseelectric.electric_pcb_printer": " 电路板打印机", + "block.baseelectric.geothermal_generator": "热发电机", + "block.baseelectric.hydroelectric_generator": "水轮发电机", + "block.baseelectric.photovoltaic_generator": "光电发生器", + "block.baseelectric.steam_powered_generator": "蒸汽为动力的电动发电机", + "block.baseelectric.growth_chamber": "生长箱", + "block.baseelectric.growth_chamber_controller": "生长箱控制单元", + "block.baseelectric.li_ore": "锂矿", + "block.baseelectric.sulfur_ore": "硫矿石", + "block.baseelectric.led_bar": "LED燈", + "block.baseelectric.electric_switch": "電器開關", + "block.baseelectric.electric_still": "電熱蒸餾水", + "block.baseelectric.electric_pump": "電動泵", + "block.baseelectric.plastic_refinery": "塑料煉油廠", + "item.baseelectric.petrolplastic_ingot": "石油膠錠", + "block.baseelectric.pump_pipe_electric": "泵管", + "block.baseelectric.laser_turret_evil": "激光防御炮塔" +} 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..e31ab9c --- /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/machine_side", + "top": "baseelectric:blocks/machine_top", + "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/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..cfdb66f 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" + "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..336d289 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/blank_circuit_board.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "layer0": "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..f71eec0 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/control_circuit.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "layer0": "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/baseelectric/models/item/generic_item.json b/src/main/resources/assets/baseelectric/models/item/generic_item.json new file mode 100644 index 0000000..abf630a --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/generic_item.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "baseelectric:items/blank_circuit_board" + } +} 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..7c98b3e --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/integrated_circuit.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "layer0": "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..7495c59 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/li_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "layer0": "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..df7fd05 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/li_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "layer0": "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..73b40ef --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/li_powder.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "layer0": "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..337293e --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/petrolplastic_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "layer0": "baseelectric:items/petrolplastic_ingot" + } +} 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..0e12fb0 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/psu.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "layer0": "baseelectric:items/psu" + } +} 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..8f9f1f6 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/silicon_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "layer0": "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..e8e077f --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/silicon_mix.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "layer0": "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..201a206 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/solder.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "layer0": "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..8bf7faf --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/solder_mix.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/generic_item", + "textures": { + "layer0": "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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 100% 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 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 f26af02..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:block/electric_battery_array", "y": 90 }, - "active=true,facing=north": { "model": "electricadvantage:block/electric_battery_array" }, - "active=true,facing=south": { "model": "electricadvantage:block/electric_battery_array", "y": 180 }, - "active=true,facing=west": { "model": "electricadvantage:block/electric_battery_array", "y": 270 }, - "active=false,facing=east": { "model": "electricadvantage:block/electric_battery_array", "y": 90 }, - "active=false,facing=north": { "model": "electricadvantage:block/electric_battery_array" }, - "active=false,facing=south": { "model": "electricadvantage:block/electric_battery_array", "y": 180 }, - "active=false,facing=west": { "model": "electricadvantage:block/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 c85de48..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:block/electric_conduit_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=false,west=false": { "model": "electricadvantage:block/electric_conduit_n", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=false,west=false": { "model": "electricadvantage:block/electric_conduit_n", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=false,west=false": { "model": "electricadvantage:block/electric_conduit_n", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=false,west=false": { "model": "electricadvantage:block/electric_conduit_n", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=true,west=false": { "model": "electricadvantage:block/electric_conduit_n", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=false,west=true": { "model": "electricadvantage:block/electric_conduit_n", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=false,west=false": { "model": "electricadvantage:block/electric_conduit_nw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=false,west=false": { "model": "electricadvantage:block/electric_conduit_nw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=false,west=false": { "model": "electricadvantage:block/electric_conduit_nw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=true,west=false": { "model": "electricadvantage:block/electric_conduit_ns", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=false,west=true": { "model": "electricadvantage:block/electric_conduit_nw", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=false,west=false": { "model": "electricadvantage:block/electric_conduit_nw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=false,west=false": { "model": "electricadvantage:block/electric_conduit_nw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=true,west=false": { "model": "electricadvantage:block/electric_conduit_nw", "x": 270, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=false,west=true": { "model": "electricadvantage:block/electric_conduit_ns", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=false,west=false": { "model": "electricadvantage:block/electric_conduit_ns", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=true,west=false": { "model": "electricadvantage:block/electric_conduit_nw", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=false,west=true": { "model": "electricadvantage:block/electric_conduit_nw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=true,west=false": { "model": "electricadvantage:block/electric_conduit_nw", "x": 270, "y": 270, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=false,west=true": { "model": "electricadvantage:block/electric_conduit_nw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=true,west=true": { "model": "electricadvantage:block/electric_conduit_nw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=false,west=false": { "model": "electricadvantage:block/electric_conduit_nuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=false,west=false": { "model": "electricadvantage:block/electric_conduit_nuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=true,west=false": { "model": "electricadvantage:block/electric_conduit_dnu", "x": 0, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=false,west=true": { "model": "electricadvantage:block/electric_conduit_dnu", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=false,west=false": { "model": "electricadvantage:block/electric_conduit_dnu", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=true,west=false": { "model": "electricadvantage:block/electric_conduit_dnu", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=false,west=true": { "model": "electricadvantage:block/electric_conduit_nuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=true,west=false": { "model": "electricadvantage:block/electric_conduit_dnu", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=false,west=true": { "model": "electricadvantage:block/electric_conduit_nuw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=true,west=true": { "model": "electricadvantage:block/electric_conduit_dnu", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=false,west=false": { "model": "electricadvantage:block/electric_conduit_nsw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=true,west=false": { "model": "electricadvantage:block/electric_conduit_nuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=false,west=true": { "model": "electricadvantage:block/electric_conduit_nsw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=true,west=false": { "model": "electricadvantage:block/electric_conduit_nuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=false,west=true": { "model": "electricadvantage:block/electric_conduit_nsw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=true,west=true": { "model": "electricadvantage:block/electric_conduit_dnu", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=true,west=false": { "model": "electricadvantage:block/electric_conduit_dnu", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=false,west=true": { "model": "electricadvantage:block/electric_conduit_nsw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=true,west=true": { "model": "electricadvantage:block/electric_conduit_nuw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=true,west=true": { "model": "electricadvantage:block/electric_conduit_nuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=false,west=false": { "model": "electricadvantage:block/electric_conduit_nsuw", "x": 180, "y": 180, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=true,west=false": { "model": "electricadvantage:block/electric_conduit_nsuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=false,west=true": { "model": "electricadvantage:block/electric_conduit_nsuw", "x": 180, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=true,west=false": { "model": "electricadvantage:block/electric_conduit_nsuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=false,west=true": { "model": "electricadvantage:block/electric_conduit_nsuw", "x": 180, "y": 270, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=true,west=true": { "model": "electricadvantage:block/electric_conduit_ensw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=true,west=false": { "model": "electricadvantage:block/electric_conduit_ensw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=false,west=true": { "model": "electricadvantage:block/electric_conduit_nsuw", "x": 180, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=true,west=true": { "model": "electricadvantage:block/electric_conduit_nsuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=true,west=true": { "model": "electricadvantage:block/electric_conduit_nsuw", "x": 90, "y": 270, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=true,west=false": { "model": "electricadvantage:block/electric_conduit_nsuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=false,west=true": { "model": "electricadvantage:block/electric_conduit_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=true,west=true": { "model": "electricadvantage:block/electric_conduit_nsuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=true,west=true": { "model": "electricadvantage:block/electric_conduit_nsuw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=true,west=true": { "model": "electricadvantage:block/electric_conduit_nsuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=true,west=false": { "model": "electricadvantage:block/electric_conduit_desuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=false,west=true": { "model": "electricadvantage:block/electric_conduit_desuw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=true,west=true": { "model": "electricadvantage:block/electric_conduit_desuw", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=true,west=true": { "model": "electricadvantage:block/electric_conduit_desuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=true,west=true": { "model": "electricadvantage:block/electric_conduit_desuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=true,west=true": { "model": "electricadvantage:block/electric_conduit_desuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=true,west=true": { "model": "electricadvantage:block/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 9042a82..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:block/electric_crusher_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:block/electric_crusher_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:block/electric_crusher_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:block/electric_crusher_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:block/electric_crusher_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:block/electric_crusher_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:block/electric_crusher_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:block/electric_crusher_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:block/electric_crusher_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:block/electric_crusher_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:block/electric_crusher_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:block/electric_crusher_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:block/electric_crusher_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:block/electric_crusher_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:block/electric_crusher_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:block/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 1f85ab7..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_drill.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "active=true,facing=up": { "model": "electricadvantage:block/electric_drill_on", "x":270 }, - "active=true,facing=down": { "model": "electricadvantage:block/electric_drill_on", "x": 90 }, - "active=true,facing=east": { "model": "electricadvantage:block/electric_drill_on", "y": 90 }, - "active=true,facing=north": { "model": "electricadvantage:block/electric_drill_on" }, - "active=true,facing=south": { "model": "electricadvantage:block/electric_drill_on", "y": 180 }, - "active=true,facing=west": { "model": "electricadvantage:block/electric_drill_on", "y": 270 }, - "active=false,facing=up": { "model": "electricadvantage:block/electric_drill_off", "x":270 }, - "active=false,facing=down": { "model": "electricadvantage:block/electric_drill_off", "x": 90 }, - "active=false,facing=east": { "model": "electricadvantage:block/electric_drill_off", "y": 90 }, - "active=false,facing=north": { "model": "electricadvantage:block/electric_drill_off" }, - "active=false,facing=south": { "model": "electricadvantage:block/electric_drill_off", "y": 180 }, - "active=false,facing=west": { "model": "electricadvantage:block/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 df2151e..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:block/electric_fabricator_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:block/electric_fabricator_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:block/electric_fabricator_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:block/electric_fabricator_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:block/electric_fabricator_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:block/electric_fabricator_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:block/electric_fabricator_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:block/electric_fabricator_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:block/electric_fabricator_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:block/electric_fabricator_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:block/electric_fabricator_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:block/electric_fabricator_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:block/electric_fabricator_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:block/electric_fabricator_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:block/electric_fabricator_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:block/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 6fccb9e..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:block/electric_furnace_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:block/electric_furnace_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:block/electric_furnace_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:block/electric_furnace_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:block/electric_furnace_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:block/electric_furnace_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:block/electric_furnace_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:block/electric_furnace_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:block/electric_furnace_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:block/electric_furnace_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:block/electric_furnace_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:block/electric_furnace_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:block/electric_furnace_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:block/electric_furnace_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:block/electric_furnace_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:block/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 a2d0446..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:block/electric_oven_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:block/electric_oven_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:block/electric_oven_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:block/electric_oven_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:block/electric_oven_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:block/electric_oven_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:block/electric_oven_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:block/electric_oven_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:block/electric_oven_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:block/electric_oven_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:block/electric_oven_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:block/electric_oven_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:block/electric_oven_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:block/electric_oven_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:block/electric_oven_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:block/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 aeb3d1b..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:block/electric_pcb_printer_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:block/electric_pcb_printer_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:block/electric_pcb_printer_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:block/electric_pcb_printer_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:block/electric_pcb_printer_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:block/electric_pcb_printer_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:block/electric_pcb_printer_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:block/electric_pcb_printer_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:block/electric_pcb_printer_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:block/electric_pcb_printer_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:block/electric_pcb_printer_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:block/electric_pcb_printer_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:block/electric_pcb_printer_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:block/electric_pcb_printer_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:block/electric_pcb_printer_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:block/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 35a48a2..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:block/electric_pump_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:block/electric_pump_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:block/electric_pump_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:block/electric_pump_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:block/electric_pump_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:block/electric_pump_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:block/electric_pump_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:block/electric_pump_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:block/electric_pump_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:block/electric_pump_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:block/electric_pump_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:block/electric_pump_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:block/electric_pump_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:block/electric_pump_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:block/electric_pump_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:block/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 7d8c62a..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:block/electric_still_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:block/electric_still_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:block/electric_still_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:block/electric_still_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:block/electric_still_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:block/electric_still_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:block/electric_still_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:block/electric_still_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:block/electric_still_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:block/electric_still_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:block/electric_still_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:block/electric_still_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:block/electric_still_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:block/electric_still_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:block/electric_still_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:block/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 82b5ec2..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_switch.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "active=false": { "model": "electricadvantage:block/electric_switch_off"}, - "active=true": { "model": "electricadvantage:block/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 956a5d1..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:block/electric_track_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=false,west=false": { "model": "electricadvantage:block/electric_track_n", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=false,west=false": { "model": "electricadvantage:block/electric_track_n", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=false,west=false": { "model": "electricadvantage:block/electric_track_n", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=false,west=false": { "model": "electricadvantage:block/electric_track_n", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=true,west=false": { "model": "electricadvantage:block/electric_track_n", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=false,west=true": { "model": "electricadvantage:block/electric_track_n", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=false,west=false": { "model": "electricadvantage:block/electric_track_nw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=false,west=false": { "model": "electricadvantage:block/electric_track_nw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=false,west=false": { "model": "electricadvantage:block/electric_track_nw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=true,west=false": { "model": "electricadvantage:block/electric_track_ns", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=false,west=true": { "model": "electricadvantage:block/electric_track_nw", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=false,west=false": { "model": "electricadvantage:block/electric_track_nw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=false,west=false": { "model": "electricadvantage:block/electric_track_nw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=true,west=false": { "model": "electricadvantage:block/electric_track_nw", "x": 270, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=false,west=true": { "model": "electricadvantage:block/electric_track_ns", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=false,west=false": { "model": "electricadvantage:block/electric_track_ns", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=true,west=false": { "model": "electricadvantage:block/electric_track_nw", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=false,west=true": { "model": "electricadvantage:block/electric_track_nw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=true,west=false": { "model": "electricadvantage:block/electric_track_nw", "x": 270, "y": 270, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=false,west=true": { "model": "electricadvantage:block/electric_track_nw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=true,west=true": { "model": "electricadvantage:block/electric_track_nw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=false,west=false": { "model": "electricadvantage:block/electric_track_nuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=false,west=false": { "model": "electricadvantage:block/electric_track_nuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=true,west=false": { "model": "electricadvantage:block/electric_track_dnu", "x": 0, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=false,west=true": { "model": "electricadvantage:block/electric_track_dnu", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=false,west=false": { "model": "electricadvantage:block/electric_track_dnu", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=true,west=false": { "model": "electricadvantage:block/electric_track_dnu", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=false,west=true": { "model": "electricadvantage:block/electric_track_nuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=true,west=false": { "model": "electricadvantage:block/electric_track_dnu", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=false,west=true": { "model": "electricadvantage:block/electric_track_nuw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=true,west=true": { "model": "electricadvantage:block/electric_track_dnu", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=false,west=false": { "model": "electricadvantage:block/electric_track_nsw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=true,west=false": { "model": "electricadvantage:block/electric_track_nuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=false,west=true": { "model": "electricadvantage:block/electric_track_nsw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=true,west=false": { "model": "electricadvantage:block/electric_track_nuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=false,west=true": { "model": "electricadvantage:block/electric_track_nsw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=true,west=true": { "model": "electricadvantage:block/electric_track_dnu", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=true,west=false": { "model": "electricadvantage:block/electric_track_dnu", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=false,west=true": { "model": "electricadvantage:block/electric_track_nsw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=true,west=true": { "model": "electricadvantage:block/electric_track_nuw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=true,west=true": { "model": "electricadvantage:block/electric_track_nuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=false,west=false": { "model": "electricadvantage:block/electric_track_nsuw", "x": 180, "y": 180, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=true,west=false": { "model": "electricadvantage:block/electric_track_nsuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=false,west=true": { "model": "electricadvantage:block/electric_track_nsuw", "x": 180, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=true,west=false": { "model": "electricadvantage:block/electric_track_nsuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=false,west=true": { "model": "electricadvantage:block/electric_track_nsuw", "x": 180, "y": 270, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=true,west=true": { "model": "electricadvantage:block/electric_track_ensw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=true,west=false": { "model": "electricadvantage:block/electric_track_ensw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=false,west=true": { "model": "electricadvantage:block/electric_track_nsuw", "x": 180, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=true,west=true": { "model": "electricadvantage:block/electric_track_nsuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=true,west=true": { "model": "electricadvantage:block/electric_track_nsuw", "x": 90, "y": 270, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=true,west=false": { "model": "electricadvantage:block/electric_track_nsuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=false,west=true": { "model": "electricadvantage:block/electric_track_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=true,west=true": { "model": "electricadvantage:block/electric_track_nsuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=true,west=true": { "model": "electricadvantage:block/electric_track_nsuw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=true,west=true": { "model": "electricadvantage:block/electric_track_nsuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=true,west=false": { "model": "electricadvantage:block/electric_track_desuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=false,west=true": { "model": "electricadvantage:block/electric_track_desuw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=true,west=true": { "model": "electricadvantage:block/electric_track_desuw", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=true,west=true": { "model": "electricadvantage:block/electric_track_desuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=true,west=true": { "model": "electricadvantage:block/electric_track_desuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=true,west=true": { "model": "electricadvantage:block/electric_track_desuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=true,west=true": { "model": "electricadvantage:block/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 7ba200e..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/geothermal_generator.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "active=true,facing=east": { "model": "electricadvantage:block/geothermal_generator", "y": 90 }, - "active=true,facing=north": { "model": "electricadvantage:block/geothermal_generator" }, - "active=true,facing=south": { "model": "electricadvantage:block/geothermal_generator", "y": 180 }, - "active=true,facing=west": { "model": "electricadvantage:block/geothermal_generator", "y": 270 }, - "active=false,facing=east": { "model": "electricadvantage:block/geothermal_generator", "y": 90 }, - "active=false,facing=north": { "model": "electricadvantage:block/geothermal_generator" }, - "active=false,facing=south": { "model": "electricadvantage:block/geothermal_generator", "y": 180 }, - "active=false,facing=west": { "model": "electricadvantage:block/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 1bd9fd9..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:block/growth_chamber_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:block/growth_chamber_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:block/growth_chamber_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:block/growth_chamber_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:block/growth_chamber_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:block/growth_chamber_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:block/growth_chamber_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:block/growth_chamber_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:block/growth_chamber_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:block/growth_chamber_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:block/growth_chamber_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:block/growth_chamber_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:block/growth_chamber_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:block/growth_chamber_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:block/growth_chamber_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:block/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 cb5898e..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/growth_chamber_controller.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "electricadvantage:block/growth_chamber_controller", "y": 90 }, - "facing=north": { "model": "electricadvantage:block/growth_chamber_controller" }, - "facing=south": { "model": "electricadvantage:block/growth_chamber_controller", "y": 180 }, - "facing=west": { "model": "electricadvantage:block/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 09f47e8..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/hydroelectric_generator.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "active=true,facing=east": { "model": "electricadvantage:block/hydroelectric_generator_on", "y": 90 }, - "active=true,facing=north": { "model": "electricadvantage:block/hydroelectric_generator_on" }, - "active=true,facing=south": { "model": "electricadvantage:block/hydroelectric_generator_on", "y": 180 }, - "active=true,facing=west": { "model": "electricadvantage:block/hydroelectric_generator_on", "y": 270 }, - "active=false,facing=east": { "model": "electricadvantage:block/hydroelectric_generator_off", "y": 90 }, - "active=false,facing=north": { "model": "electricadvantage:block/hydroelectric_generator_off" }, - "active=false,facing=south": { "model": "electricadvantage:block/hydroelectric_generator_off", "y": 180 }, - "active=false,facing=west": { "model": "electricadvantage:block/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 fa7adcd..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:block/laser_turret", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:block/laser_turret" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:block/laser_turret", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:block/laser_turret", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:block/laser_turret", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:block/laser_turret" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:block/laser_turret", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:block/laser_turret", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:block/laser_turret", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:block/laser_turret" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:block/laser_turret", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:block/laser_turret", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:block/laser_turret", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:block/laser_turret" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:block/laser_turret", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:block/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 fa7adcd..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:block/laser_turret", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:block/laser_turret" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:block/laser_turret", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:block/laser_turret", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:block/laser_turret", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:block/laser_turret" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:block/laser_turret", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:block/laser_turret", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:block/laser_turret", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:block/laser_turret" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:block/laser_turret", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:block/laser_turret", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:block/laser_turret", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:block/laser_turret" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:block/laser_turret", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:block/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 3a538f5..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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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:block/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 e35f413..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/li_ore.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "electricadvantage:block/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 c2db894..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/photovoltaic_generator.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "active=true,facing=east": { "model": "electricadvantage:block/photovoltaic_generator", "y": 90 }, - "active=true,facing=north": { "model": "electricadvantage:block/photovoltaic_generator" }, - "active=true,facing=south": { "model": "electricadvantage:block/photovoltaic_generator", "y": 180 }, - "active=true,facing=west": { "model": "electricadvantage:block/photovoltaic_generator", "y": 270 }, - "active=false,facing=east": { "model": "electricadvantage:block/photovoltaic_generator", "y": 90 }, - "active=false,facing=north": { "model": "electricadvantage:block/photovoltaic_generator" }, - "active=false,facing=south": { "model": "electricadvantage:block/photovoltaic_generator", "y": 180 }, - "active=false,facing=west": { "model": "electricadvantage:block/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 2c0dbdc..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:block/plastic_refinery_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:block/plastic_refinery_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:block/plastic_refinery_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:block/plastic_refinery_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:block/plastic_refinery_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:block/plastic_refinery_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:block/plastic_refinery_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:block/plastic_refinery_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:block/plastic_refinery_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:block/plastic_refinery_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:block/plastic_refinery_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:block/plastic_refinery_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:block/plastic_refinery_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:block/plastic_refinery_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:block/plastic_refinery_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:block/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 a25407b..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/pump_pipe_electric.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": {"model": "poweradvantage:block/fluid_pipe_ns", "x": 90, "y": 0, "uvlock": false } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/steam_powered_generator.json b/src/main/resources/assets/electricadvantage/blockstates/steam_powered_generator.json deleted file mode 100644 index 70cfdab..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:block/steam_powered_generator_on", "y": 90 }, - "active=true,facing=north": { "model": "electricadvantage:block/steam_powered_generator_on" }, - "active=true,facing=south": { "model": "electricadvantage:block/steam_powered_generator_on", "y": 180 }, - "active=true,facing=west": { "model": "electricadvantage:block/steam_powered_generator_on", "y": 270 }, - "active=false,facing=east": { "model": "electricadvantage:block/steam_powered_generator_off", "y": 90 }, - "active=false,facing=north": { "model": "electricadvantage:block/steam_powered_generator_off" }, - "active=false,facing=south": { "model": "electricadvantage:block/steam_powered_generator_off", "y": 180 }, - "active=false,facing=west": { "model": "electricadvantage:block/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 47c97b3..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/sulfur_ore.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "electricadvantage:block/sulfur_ore" } - } -} diff --git a/src/main/resources/assets/electricadvantage/lang/de_de.json b/src/main/resources/assets/electricadvantage/lang/de_de.json deleted file mode 100644 index 05039ff..0000000 --- a/src/main/resources/assets/electricadvantage/lang/de_de.json +++ /dev/null @@ -1,92 +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", - "item.electricadvantage.blank_circuit_board": "Leiterplatte (Leer)", - "item.electricadvantage.control_circuit": "Steuerstromkreis", - "item.electricadvantage.integrated_circuit": "Mikrochip", - "item.electricadvantage.psu": "Netzteil", - "item.electricadvantage.silicon_ingot": "Silizium-Ingots", - "item.electricadvantage.silicon_mix": "Silizium-Mischung", - "item.electricadvantage.solder_mix": "Lötmetall Mischung", - "item.electricadvantage.solder": "Lötmetall", - "item.electricadvantage.li_powder": "Pulverisierte Lithium", - "item.electricadvantage.li_ingot": "Lithium-Barren", - "item.electricadvantage.li_nugget": "Lithium Nugget", - "item.electricadvantage.sulfur_powder": "Schwefelpulver", - "item.electricadvantage.lead_acid_battery": "Blei-Säure-Batterie", - "item.electricadvantage.nickel_hydride_battery": "Nickel-Metallhydrid-Batterie", - "item.electricadvantage.alkaline_battery": "Alkali-Batterie", - "item.electricadvantage.lithium_battery": "Lithium-Ionen-Batterie", - "block.electricadvantage.electric_conduit": "Elektrischen Draht", - "block.electricadvantage.electric_track": "Elektro-Gerüst", - "block.electricadvantage.electric_battery_array": "Batterie Array", - "block.electricadvantage.electric_crusher": "Elektrische Felsen-Zerkleinerungsmaschine", - "block.electricadvantage.laser_turret": "Laser-Verteidigung Waffe", - "block.electricadvantage.electric_drill": "Laser Bohrer", - "block.electricadvantage.electric_fabricator": "Automatisierte Fabrik", - "block.electricadvantage.electric_furnace": "Lichtbogenofen", - "block.electricadvantage.electric_oven": "Elektro-Ofen", - "block.electricadvantage.electric_pcb_printer": "PCB Drucker", - "block.electricadvantage.geothermal_generator": "Geothermal Generator", - "block.electricadvantage.hydroelectric_generator": "Hydroelectric Generator", - "block.electricadvantage.photovoltaic_generator": "Photovoltaik-Generator", - "block.electricadvantage.steam_powered_generator": "Pumpenlose Stromerzeuger", - "block.electricadvantage.growth_chamber": "Wachstumskammer", - "block.electricadvantage.growth_chamber_controller": "Wachstumskammer Steuereinheit", - "block.electricadvantage.li_ore": "Lithiumerz", - "block.electricadvantage.sulfur_ore": "Schwefelerz", - "block.electricadvantage.led_bar": "LED Draht", - "block.electricadvantage.electric_switch": "Elektrische Schalter", - "block.electricadvantage.electric_still": "Elektro Brennerei", - "block.electricadvantage.electric_pump": "Elektropumpe", - "block.electricadvantage.plastic_refinery": "Kunststoff-Raffinerie", - "item.electricadvantage.petrolplastic_ingot": "Erdöl Kunststoff Barren", - "block.electricadvantage.pump_pipe_electric": "Pumpenrohr", - "block.electricadvantage.laser_turret_evil": "Laser-Verteidigung Waffe" -} diff --git a/src/main/resources/assets/electricadvantage/lang/en_au.json b/src/main/resources/assets/electricadvantage/lang/en_au.json deleted file mode 100644 index c629c43..0000000 --- a/src/main/resources/assets/electricadvantage/lang/en_au.json +++ /dev/null @@ -1,92 +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", - "item.electricadvantage.blank_circuit_board": "Circuit Board (Blank)", - "item.electricadvantage.control_circuit": "Control Circuit", - "item.electricadvantage.integrated_circuit": "Microchip", - "item.electricadvantage.psu": "Power Supply Unit", - "item.electricadvantage.silicon_ingot": "Silicon Ingot", - "item.electricadvantage.silicon_mix": "Silicon Blend", - "item.electricadvantage.solder_mix": "Solder Blend", - "item.electricadvantage.solder": "Solder", - "item.electricadvantage.li_powder": "Powdered Lithium", - "item.electricadvantage.li_ingot": "Lithium Ingot", - "item.electricadvantage.li_nugget": "Lithium Nugget", - "item.electricadvantage.sulfur_powder": "Powdered Sulfur", - "item.electricadvantage.lead_acid_battery": "Lead-Acid Battery", - "item.electricadvantage.nickel_hydride_battery": "Nickel-Metal Hydride Battery", - "item.electricadvantage.alkaline_battery": "Alkaline Battery", - "item.electricadvantage.lithium_battery": "Lithium-Ion Battery", - "block.electricadvantage.electric_conduit": "Electric Power Cable", - "block.electricadvantage.electric_track": "Electric Scaffold", - "block.electricadvantage.electric_battery_array": "Battery Array", - "block.electricadvantage.electric_crusher": "Electric Rock Crusher", - "block.electricadvantage.laser_turret": "Laser Defense Turret", - "block.electricadvantage.electric_drill": "Electric Mining Drill", - "block.electricadvantage.electric_fabricator": "Automated Assembler", - "block.electricadvantage.electric_furnace": "Electric Arc Furnace", - "block.electricadvantage.electric_oven": "Electric Oven", - "block.electricadvantage.electric_pcb_printer": "PCB Printer", - "block.electricadvantage.geothermal_generator": "Geothermal Generator", - "block.electricadvantage.hydroelectric_generator": "Hydroelectric Generator", - "block.electricadvantage.photovoltaic_generator": "Photovoltaic Generator", - "block.electricadvantage.steam_powered_generator": "Steam-Powered Electric Generator", - "block.electricadvantage.growth_chamber": "Growth Chamber", - "block.electricadvantage.growth_chamber_controller": "Growth Chamber Control Unit", - "block.electricadvantage.li_ore": "Lithium Ore", - "block.electricadvantage.sulfur_ore": "Sulfur Ore", - "block.electricadvantage.led_bar": "LED Bar", - "block.electricadvantage.electric_switch": "Electric Switch", - "block.electricadvantage.electric_still": "Electric Distiller", - "block.electricadvantage.electric_pump": "Electric Pump", - "block.electricadvantage.plastic_refinery": "Petro-Plastic Refinery", - "item.electricadvantage.petrolplastic_ingot": "Petro-Plastic Ingot", - "block.electricadvantage.pump_pipe_electric": "Pump Pipe", - "block.electricadvantage.laser_turret_evil": "Laser Defense Turret" -} diff --git a/src/main/resources/assets/electricadvantage/lang/en_ca.json b/src/main/resources/assets/electricadvantage/lang/en_ca.json deleted file mode 100644 index c629c43..0000000 --- a/src/main/resources/assets/electricadvantage/lang/en_ca.json +++ /dev/null @@ -1,92 +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", - "item.electricadvantage.blank_circuit_board": "Circuit Board (Blank)", - "item.electricadvantage.control_circuit": "Control Circuit", - "item.electricadvantage.integrated_circuit": "Microchip", - "item.electricadvantage.psu": "Power Supply Unit", - "item.electricadvantage.silicon_ingot": "Silicon Ingot", - "item.electricadvantage.silicon_mix": "Silicon Blend", - "item.electricadvantage.solder_mix": "Solder Blend", - "item.electricadvantage.solder": "Solder", - "item.electricadvantage.li_powder": "Powdered Lithium", - "item.electricadvantage.li_ingot": "Lithium Ingot", - "item.electricadvantage.li_nugget": "Lithium Nugget", - "item.electricadvantage.sulfur_powder": "Powdered Sulfur", - "item.electricadvantage.lead_acid_battery": "Lead-Acid Battery", - "item.electricadvantage.nickel_hydride_battery": "Nickel-Metal Hydride Battery", - "item.electricadvantage.alkaline_battery": "Alkaline Battery", - "item.electricadvantage.lithium_battery": "Lithium-Ion Battery", - "block.electricadvantage.electric_conduit": "Electric Power Cable", - "block.electricadvantage.electric_track": "Electric Scaffold", - "block.electricadvantage.electric_battery_array": "Battery Array", - "block.electricadvantage.electric_crusher": "Electric Rock Crusher", - "block.electricadvantage.laser_turret": "Laser Defense Turret", - "block.electricadvantage.electric_drill": "Electric Mining Drill", - "block.electricadvantage.electric_fabricator": "Automated Assembler", - "block.electricadvantage.electric_furnace": "Electric Arc Furnace", - "block.electricadvantage.electric_oven": "Electric Oven", - "block.electricadvantage.electric_pcb_printer": "PCB Printer", - "block.electricadvantage.geothermal_generator": "Geothermal Generator", - "block.electricadvantage.hydroelectric_generator": "Hydroelectric Generator", - "block.electricadvantage.photovoltaic_generator": "Photovoltaic Generator", - "block.electricadvantage.steam_powered_generator": "Steam-Powered Electric Generator", - "block.electricadvantage.growth_chamber": "Growth Chamber", - "block.electricadvantage.growth_chamber_controller": "Growth Chamber Control Unit", - "block.electricadvantage.li_ore": "Lithium Ore", - "block.electricadvantage.sulfur_ore": "Sulfur Ore", - "block.electricadvantage.led_bar": "LED Bar", - "block.electricadvantage.electric_switch": "Electric Switch", - "block.electricadvantage.electric_still": "Electric Distiller", - "block.electricadvantage.electric_pump": "Electric Pump", - "block.electricadvantage.plastic_refinery": "Petro-Plastic Refinery", - "item.electricadvantage.petrolplastic_ingot": "Petro-Plastic Ingot", - "block.electricadvantage.pump_pipe_electric": "Pump Pipe", - "block.electricadvantage.laser_turret_evil": "Laser Defense Turret" -} diff --git a/src/main/resources/assets/electricadvantage/lang/en_en.json b/src/main/resources/assets/electricadvantage/lang/en_en.json deleted file mode 100644 index 7c5769c..0000000 --- a/src/main/resources/assets/electricadvantage/lang/en_en.json +++ /dev/null @@ -1,92 +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", - "item.electricadvantage.blank_circuit_board": "Circuit Board (Blank)", - "item.electricadvantage.control_circuit": "Control Circuit", - "item.electricadvantage.integrated_circuit": "Microchip", - "item.electricadvantage.psu": "Power Supply Unit", - "item.electricadvantage.silicon_ingot": "Silicon Ingot", - "item.electricadvantage.silicon_mix": "Silicon Blend", - "item.electricadvantage.solder_mix": "Solder Blend", - "item.electricadvantage.solder": "Solder", - "item.electricadvantage.li_powder": "Powdered Lithium", - "item.electricadvantage.li_ingot": "Lithium Ingot", - "item.electricadvantage.li_nugget": "Lithium Nugget", - "item.electricadvantage.sulfur_powder": "Powdered Sulfur", - "item.electricadvantage.lead_acid_battery": "Lead-Acid Battery", - "item.electricadvantage.nickel_hydride_battery": "Nickel-Metal Hydride Battery", - "item.electricadvantage.alkaline_battery": "Alkaline Battery", - "item.electricadvantage.lithium_battery": "Lithium-Ion Battery", - "block.electricadvantage.electric_conduit": "Electric Power Cable", - "block.electricadvantage.electric_track": "Electric Scaffold", - "block.electricadvantage.electric_battery_array": "Battery Array", - "block.electricadvantage.electric_crusher": "Electric Rock Crusher", - "block.electricadvantage.laser_turret": "Laser Turret", - "block.electricadvantage.electric_drill": "Electric Mining Drill", - "block.electricadvantage.electric_fabricator": "Automated Assembler", - "block.electricadvantage.electric_furnace": "Electric Arc Furnace", - "block.electricadvantage.electric_oven": "Electric Oven", - "block.electricadvantage.electric_pcb_printer": "PCB Printer", - "block.electricadvantage.geothermal_generator": "Geothermal Generator", - "block.electricadvantage.hydroelectric_generator": "Hydroelectric Generator", - "block.electricadvantage.photovoltaic_generator": "Photovoltaic Generator", - "block.electricadvantage.steam_powered_generator": "Steam-Powered Electric Generator", - "block.electricadvantage.growth_chamber": "Growth Chamber", - "block.electricadvantage.growth_chamber_controller": "Growth Chamber Control Unit", - "block.electricadvantage.li_ore": "Lithium Ore", - "block.electricadvantage.sulfur_ore": "Sulfur Ore", - "block.electricadvantage.led_bar": "LED Bar", - "block.electricadvantage.electric_switch": "Electric Switch", - "block.electricadvantage.electric_still": "Electric Distiller", - "block.electricadvantage.electric_pump": "Electric Pump", - "block.electricadvantage.plastic_refinery": "Petro-Plastic Refinery", - "item.electricadvantage.petrolplastic_ingot": "Petro-Plastic Ingot", - "block.electricadvantage.pump_pipe_electric": "Pump Pipe", - "block.electricadvantage.laser_turret_evil": "Laser Turret" -} diff --git a/src/main/resources/assets/electricadvantage/lang/en_gb.json b/src/main/resources/assets/electricadvantage/lang/en_gb.json deleted file mode 100644 index c629c43..0000000 --- a/src/main/resources/assets/electricadvantage/lang/en_gb.json +++ /dev/null @@ -1,92 +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", - "item.electricadvantage.blank_circuit_board": "Circuit Board (Blank)", - "item.electricadvantage.control_circuit": "Control Circuit", - "item.electricadvantage.integrated_circuit": "Microchip", - "item.electricadvantage.psu": "Power Supply Unit", - "item.electricadvantage.silicon_ingot": "Silicon Ingot", - "item.electricadvantage.silicon_mix": "Silicon Blend", - "item.electricadvantage.solder_mix": "Solder Blend", - "item.electricadvantage.solder": "Solder", - "item.electricadvantage.li_powder": "Powdered Lithium", - "item.electricadvantage.li_ingot": "Lithium Ingot", - "item.electricadvantage.li_nugget": "Lithium Nugget", - "item.electricadvantage.sulfur_powder": "Powdered Sulfur", - "item.electricadvantage.lead_acid_battery": "Lead-Acid Battery", - "item.electricadvantage.nickel_hydride_battery": "Nickel-Metal Hydride Battery", - "item.electricadvantage.alkaline_battery": "Alkaline Battery", - "item.electricadvantage.lithium_battery": "Lithium-Ion Battery", - "block.electricadvantage.electric_conduit": "Electric Power Cable", - "block.electricadvantage.electric_track": "Electric Scaffold", - "block.electricadvantage.electric_battery_array": "Battery Array", - "block.electricadvantage.electric_crusher": "Electric Rock Crusher", - "block.electricadvantage.laser_turret": "Laser Defense Turret", - "block.electricadvantage.electric_drill": "Electric Mining Drill", - "block.electricadvantage.electric_fabricator": "Automated Assembler", - "block.electricadvantage.electric_furnace": "Electric Arc Furnace", - "block.electricadvantage.electric_oven": "Electric Oven", - "block.electricadvantage.electric_pcb_printer": "PCB Printer", - "block.electricadvantage.geothermal_generator": "Geothermal Generator", - "block.electricadvantage.hydroelectric_generator": "Hydroelectric Generator", - "block.electricadvantage.photovoltaic_generator": "Photovoltaic Generator", - "block.electricadvantage.steam_powered_generator": "Steam-Powered Electric Generator", - "block.electricadvantage.growth_chamber": "Growth Chamber", - "block.electricadvantage.growth_chamber_controller": "Growth Chamber Control Unit", - "block.electricadvantage.li_ore": "Lithium Ore", - "block.electricadvantage.sulfur_ore": "Sulfur Ore", - "block.electricadvantage.led_bar": "LED Bar", - "block.electricadvantage.electric_switch": "Electric Switch", - "block.electricadvantage.electric_still": "Electric Distiller", - "block.electricadvantage.electric_pump": "Electric Pump", - "block.electricadvantage.plastic_refinery": "Petro-Plastic Refinery", - "item.electricadvantage.petrolplastic_ingot": "Petro-Plastic Ingot", - "block.electricadvantage.pump_pipe_electric": "Pump Pipe", - "block.electricadvantage.laser_turret_evil": "Laser Defense Turret" -} diff --git a/src/main/resources/assets/electricadvantage/lang/en_pt.json b/src/main/resources/assets/electricadvantage/lang/en_pt.json deleted file mode 100644 index 7c5769c..0000000 --- a/src/main/resources/assets/electricadvantage/lang/en_pt.json +++ /dev/null @@ -1,92 +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", - "item.electricadvantage.blank_circuit_board": "Circuit Board (Blank)", - "item.electricadvantage.control_circuit": "Control Circuit", - "item.electricadvantage.integrated_circuit": "Microchip", - "item.electricadvantage.psu": "Power Supply Unit", - "item.electricadvantage.silicon_ingot": "Silicon Ingot", - "item.electricadvantage.silicon_mix": "Silicon Blend", - "item.electricadvantage.solder_mix": "Solder Blend", - "item.electricadvantage.solder": "Solder", - "item.electricadvantage.li_powder": "Powdered Lithium", - "item.electricadvantage.li_ingot": "Lithium Ingot", - "item.electricadvantage.li_nugget": "Lithium Nugget", - "item.electricadvantage.sulfur_powder": "Powdered Sulfur", - "item.electricadvantage.lead_acid_battery": "Lead-Acid Battery", - "item.electricadvantage.nickel_hydride_battery": "Nickel-Metal Hydride Battery", - "item.electricadvantage.alkaline_battery": "Alkaline Battery", - "item.electricadvantage.lithium_battery": "Lithium-Ion Battery", - "block.electricadvantage.electric_conduit": "Electric Power Cable", - "block.electricadvantage.electric_track": "Electric Scaffold", - "block.electricadvantage.electric_battery_array": "Battery Array", - "block.electricadvantage.electric_crusher": "Electric Rock Crusher", - "block.electricadvantage.laser_turret": "Laser Turret", - "block.electricadvantage.electric_drill": "Electric Mining Drill", - "block.electricadvantage.electric_fabricator": "Automated Assembler", - "block.electricadvantage.electric_furnace": "Electric Arc Furnace", - "block.electricadvantage.electric_oven": "Electric Oven", - "block.electricadvantage.electric_pcb_printer": "PCB Printer", - "block.electricadvantage.geothermal_generator": "Geothermal Generator", - "block.electricadvantage.hydroelectric_generator": "Hydroelectric Generator", - "block.electricadvantage.photovoltaic_generator": "Photovoltaic Generator", - "block.electricadvantage.steam_powered_generator": "Steam-Powered Electric Generator", - "block.electricadvantage.growth_chamber": "Growth Chamber", - "block.electricadvantage.growth_chamber_controller": "Growth Chamber Control Unit", - "block.electricadvantage.li_ore": "Lithium Ore", - "block.electricadvantage.sulfur_ore": "Sulfur Ore", - "block.electricadvantage.led_bar": "LED Bar", - "block.electricadvantage.electric_switch": "Electric Switch", - "block.electricadvantage.electric_still": "Electric Distiller", - "block.electricadvantage.electric_pump": "Electric Pump", - "block.electricadvantage.plastic_refinery": "Petro-Plastic Refinery", - "item.electricadvantage.petrolplastic_ingot": "Petro-Plastic Ingot", - "block.electricadvantage.pump_pipe_electric": "Pump Pipe", - "block.electricadvantage.laser_turret_evil": "Laser Turret" -} diff --git a/src/main/resources/assets/electricadvantage/lang/en_us.json b/src/main/resources/assets/electricadvantage/lang/en_us.json deleted file mode 100644 index 7c5769c..0000000 --- a/src/main/resources/assets/electricadvantage/lang/en_us.json +++ /dev/null @@ -1,92 +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", - "item.electricadvantage.blank_circuit_board": "Circuit Board (Blank)", - "item.electricadvantage.control_circuit": "Control Circuit", - "item.electricadvantage.integrated_circuit": "Microchip", - "item.electricadvantage.psu": "Power Supply Unit", - "item.electricadvantage.silicon_ingot": "Silicon Ingot", - "item.electricadvantage.silicon_mix": "Silicon Blend", - "item.electricadvantage.solder_mix": "Solder Blend", - "item.electricadvantage.solder": "Solder", - "item.electricadvantage.li_powder": "Powdered Lithium", - "item.electricadvantage.li_ingot": "Lithium Ingot", - "item.electricadvantage.li_nugget": "Lithium Nugget", - "item.electricadvantage.sulfur_powder": "Powdered Sulfur", - "item.electricadvantage.lead_acid_battery": "Lead-Acid Battery", - "item.electricadvantage.nickel_hydride_battery": "Nickel-Metal Hydride Battery", - "item.electricadvantage.alkaline_battery": "Alkaline Battery", - "item.electricadvantage.lithium_battery": "Lithium-Ion Battery", - "block.electricadvantage.electric_conduit": "Electric Power Cable", - "block.electricadvantage.electric_track": "Electric Scaffold", - "block.electricadvantage.electric_battery_array": "Battery Array", - "block.electricadvantage.electric_crusher": "Electric Rock Crusher", - "block.electricadvantage.laser_turret": "Laser Turret", - "block.electricadvantage.electric_drill": "Electric Mining Drill", - "block.electricadvantage.electric_fabricator": "Automated Assembler", - "block.electricadvantage.electric_furnace": "Electric Arc Furnace", - "block.electricadvantage.electric_oven": "Electric Oven", - "block.electricadvantage.electric_pcb_printer": "PCB Printer", - "block.electricadvantage.geothermal_generator": "Geothermal Generator", - "block.electricadvantage.hydroelectric_generator": "Hydroelectric Generator", - "block.electricadvantage.photovoltaic_generator": "Photovoltaic Generator", - "block.electricadvantage.steam_powered_generator": "Steam-Powered Electric Generator", - "block.electricadvantage.growth_chamber": "Growth Chamber", - "block.electricadvantage.growth_chamber_controller": "Growth Chamber Control Unit", - "block.electricadvantage.li_ore": "Lithium Ore", - "block.electricadvantage.sulfur_ore": "Sulfur Ore", - "block.electricadvantage.led_bar": "LED Bar", - "block.electricadvantage.electric_switch": "Electric Switch", - "block.electricadvantage.electric_still": "Electric Distiller", - "block.electricadvantage.electric_pump": "Electric Pump", - "block.electricadvantage.plastic_refinery": "Petro-Plastic Refinery", - "item.electricadvantage.petrolplastic_ingot": "Petro-Plastic Ingot", - "block.electricadvantage.pump_pipe_electric": "Pump Pipe", - "block.electricadvantage.laser_turret_evil": "Laser Turret" -} diff --git a/src/main/resources/assets/electricadvantage/lang/es_es.json b/src/main/resources/assets/electricadvantage/lang/es_es.json deleted file mode 100644 index 30088ae..0000000 --- a/src/main/resources/assets/electricadvantage/lang/es_es.json +++ /dev/null @@ -1,92 +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", - "item.electricadvantage.blank_circuit_board": "Placa de Circuito (Blanco)", - "item.electricadvantage.control_circuit": "Circuito de Computadora", - "item.electricadvantage.integrated_circuit": "Microchip", - "item.electricadvantage.psu": "Unidad de Fuente de Alimentación", - "item.electricadvantage.silicon_ingot": "Silicio Lingote", - "item.electricadvantage.silicon_mix": "Blend Silicio", - "item.electricadvantage.solder_mix": "Blend Soldadura", - "item.electricadvantage.solder": "Soldadura", - "item.electricadvantage.li_powder": "Polvo de Litio", - "item.electricadvantage.li_ingot": "Litio Lingote", - "item.electricadvantage.li_nugget": "Pepita de Litio", - "item.electricadvantage.sulfur_powder": "Azufre en Polvo", - "item.electricadvantage.lead_acid_battery": "Plomo-Ácido de la Batería", - "item.electricadvantage.nickel_hydride_battery": "Níquel e Hidruro Metálico", - "item.electricadvantage.alkaline_battery": "Batería Alcalina", - "item.electricadvantage.lithium_battery": "Batería de Litio-Ion", - "block.electricadvantage.electric_conduit": "Cable de Energía Eléctrica", - "block.electricadvantage.electric_track": "Eléctrica Andamios", - "block.electricadvantage.electric_battery_array": "Batería Matriz", - "block.electricadvantage.electric_crusher": "Eléctrica de la Roca Trituradora", - "block.electricadvantage.laser_turret": "Laser Defensa Torreta", - "block.electricadvantage.electric_drill": "Eléctrica Minería Taladro", - "block.electricadvantage.electric_fabricator": "Automatizado Ensamblador", - "block.electricadvantage.electric_furnace": "Horno de Arco Eléctrico", - "block.electricadvantage.electric_oven": "Horno Eléctrico", - "block.electricadvantage.electric_pcb_printer": "PCB Impresora", - "block.electricadvantage.geothermal_generator": "Geotérmica Generador", - "block.electricadvantage.hydroelectric_generator": "Hidroeléctrico Generador", - "block.electricadvantage.photovoltaic_generator": "Fotovoltaica Generador", - "block.electricadvantage.steam_powered_generator": "a Vapor Generador Eléctrico", - "block.electricadvantage.growth_chamber": "Cámara Crecimiento", - "block.electricadvantage.growth_chamber_controller": "Unidad de Control de Crecimiento Cámara", - "block.electricadvantage.li_ore": "Mineral de Litio", - "block.electricadvantage.sulfur_ore": "Mineral de Azufre", - "block.electricadvantage.led_bar": "Luz LED", - "block.electricadvantage.electric_switch": "Interruptor Eléctrico", - "block.electricadvantage.electric_still": "Destilador Eléctrico", - "block.electricadvantage.electric_pump": "Bomba Eléctrica", - "block.electricadvantage.plastic_refinery": "Refinería de Plástico", - "item.electricadvantage.petrolplastic_ingot": "Petróleo Lingote de Plástico", - "block.electricadvantage.pump_pipe_electric": "Tubería de la Bomba", - "block.electricadvantage.laser_turret_evil": "Laser Defensa Torreta" -} diff --git a/src/main/resources/assets/electricadvantage/lang/es_mx.json b/src/main/resources/assets/electricadvantage/lang/es_mx.json deleted file mode 100644 index 30088ae..0000000 --- a/src/main/resources/assets/electricadvantage/lang/es_mx.json +++ /dev/null @@ -1,92 +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", - "item.electricadvantage.blank_circuit_board": "Placa de Circuito (Blanco)", - "item.electricadvantage.control_circuit": "Circuito de Computadora", - "item.electricadvantage.integrated_circuit": "Microchip", - "item.electricadvantage.psu": "Unidad de Fuente de Alimentación", - "item.electricadvantage.silicon_ingot": "Silicio Lingote", - "item.electricadvantage.silicon_mix": "Blend Silicio", - "item.electricadvantage.solder_mix": "Blend Soldadura", - "item.electricadvantage.solder": "Soldadura", - "item.electricadvantage.li_powder": "Polvo de Litio", - "item.electricadvantage.li_ingot": "Litio Lingote", - "item.electricadvantage.li_nugget": "Pepita de Litio", - "item.electricadvantage.sulfur_powder": "Azufre en Polvo", - "item.electricadvantage.lead_acid_battery": "Plomo-Ácido de la Batería", - "item.electricadvantage.nickel_hydride_battery": "Níquel e Hidruro Metálico", - "item.electricadvantage.alkaline_battery": "Batería Alcalina", - "item.electricadvantage.lithium_battery": "Batería de Litio-Ion", - "block.electricadvantage.electric_conduit": "Cable de Energía Eléctrica", - "block.electricadvantage.electric_track": "Eléctrica Andamios", - "block.electricadvantage.electric_battery_array": "Batería Matriz", - "block.electricadvantage.electric_crusher": "Eléctrica de la Roca Trituradora", - "block.electricadvantage.laser_turret": "Laser Defensa Torreta", - "block.electricadvantage.electric_drill": "Eléctrica Minería Taladro", - "block.electricadvantage.electric_fabricator": "Automatizado Ensamblador", - "block.electricadvantage.electric_furnace": "Horno de Arco Eléctrico", - "block.electricadvantage.electric_oven": "Horno Eléctrico", - "block.electricadvantage.electric_pcb_printer": "PCB Impresora", - "block.electricadvantage.geothermal_generator": "Geotérmica Generador", - "block.electricadvantage.hydroelectric_generator": "Hidroeléctrico Generador", - "block.electricadvantage.photovoltaic_generator": "Fotovoltaica Generador", - "block.electricadvantage.steam_powered_generator": "a Vapor Generador Eléctrico", - "block.electricadvantage.growth_chamber": "Cámara Crecimiento", - "block.electricadvantage.growth_chamber_controller": "Unidad de Control de Crecimiento Cámara", - "block.electricadvantage.li_ore": "Mineral de Litio", - "block.electricadvantage.sulfur_ore": "Mineral de Azufre", - "block.electricadvantage.led_bar": "Luz LED", - "block.electricadvantage.electric_switch": "Interruptor Eléctrico", - "block.electricadvantage.electric_still": "Destilador Eléctrico", - "block.electricadvantage.electric_pump": "Bomba Eléctrica", - "block.electricadvantage.plastic_refinery": "Refinería de Plástico", - "item.electricadvantage.petrolplastic_ingot": "Petróleo Lingote de Plástico", - "block.electricadvantage.pump_pipe_electric": "Tubería de la Bomba", - "block.electricadvantage.laser_turret_evil": "Laser Defensa Torreta" -} diff --git a/src/main/resources/assets/electricadvantage/lang/it_it.json b/src/main/resources/assets/electricadvantage/lang/it_it.json deleted file mode 100644 index 10452d5..0000000 --- a/src/main/resources/assets/electricadvantage/lang/it_it.json +++ /dev/null @@ -1,92 +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", - "item.electricadvantage.blank_circuit_board": "Scheda di Circuito (Vuoto)", - "item.electricadvantage.control_circuit": "Circuito di Controllo", - "item.electricadvantage.integrated_circuit": "Microcircuito Integrato", - "item.electricadvantage.psu": "Alimentatore", - "item.electricadvantage.silicon_ingot": "Silicio Lingotto", - "item.electricadvantage.silicon_mix": "Silicio Miscela", - "item.electricadvantage.solder_mix": "Saldatura Miscela", - "item.electricadvantage.solder": "Saldatura", - "item.electricadvantage.li_powder": "Polvere di Litio", - "item.electricadvantage.li_ingot": "Litio Lingotto", - "item.electricadvantage.li_nugget": "Pepita d'Litio", - "item.electricadvantage.sulfur_powder": "Zolfo in Polvere", - "item.electricadvantage.lead_acid_battery": "Batteria al Piombo", - "item.electricadvantage.nickel_hydride_battery": "Ni-MH batteria", - "item.electricadvantage.alkaline_battery": "Batteria Alcalina", - "item.electricadvantage.lithium_battery": "Agli Ioni di Litio", - "block.electricadvantage.electric_conduit": "Cavo Alettrico di Alimentazione", - "block.electricadvantage.electric_track": "Ponteggio Elettrico", - "block.electricadvantage.electric_battery_array": "Array Batteria", - "block.electricadvantage.electric_crusher": "Polverizzatore Masso a Elettrico Alimentata", - "block.electricadvantage.laser_turret": "Laser Difesa Torretta", - "block.electricadvantage.electric_drill": "Trapano Elettrico", - "block.electricadvantage.electric_fabricator": "Fabbrica Automatizzata", - "block.electricadvantage.electric_furnace": "Forno Elettrico ad Arco", - "block.electricadvantage.electric_oven": "Forno Elettrico", - "block.electricadvantage.electric_pcb_printer": "PCB Stampante", - "block.electricadvantage.geothermal_generator": "Geotermica Generatore", - "block.electricadvantage.hydroelectric_generator": "idroelettrica Generatore", - "block.electricadvantage.photovoltaic_generator": "Fotovoltaico Generatore", - "block.electricadvantage.steam_powered_generator": "Generatore Elettrico a Vapore", - "block.electricadvantage.growth_chamber": "Camera di Crescita", - "block.electricadvantage.growth_chamber_controller": "Controllore Camera di Crescita", - "block.electricadvantage.li_ore": "Minerale di litio", - "block.electricadvantage.sulfur_ore": "Minerale di Zolfo", - "block.electricadvantage.led_bar": "Luce a led", - "block.electricadvantage.electric_switch": "Interruttore Elettrico", - "block.electricadvantage.electric_still": "Distillatore Elettrico", - "block.electricadvantage.electric_pump": "Pompa Elettricaa", - "block.electricadvantage.plastic_refinery": "Raffineria Plastica", - "item.electricadvantage.petrolplastic_ingot": "Petrolio Plastica Lingotto", - "block.electricadvantage.pump_pipe_electric": "Tubo Pompa", - "block.electricadvantage.laser_turret_evil": "Laser Difesa Torretta" -} diff --git a/src/main/resources/assets/electricadvantage/lang/ja_jp.json b/src/main/resources/assets/electricadvantage/lang/ja_jp.json deleted file mode 100644 index 84d5ee8..0000000 --- a/src/main/resources/assets/electricadvantage/lang/ja_jp.json +++ /dev/null @@ -1,92 +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": "ポンプ配管", - "item.electricadvantage.blank_circuit_board": "回路基板 (空の)", - "item.electricadvantage.control_circuit": "コンピューター回路", - "item.electricadvantage.integrated_circuit": "マイクロチップ", - "item.electricadvantage.psu": "電源ユニット", - "item.electricadvantage.silicon_ingot": "シリコン", - "item.electricadvantage.silicon_mix": "シリコンレシピ", - "item.electricadvantage.solder_mix": "はんだレシピ", - "item.electricadvantage.solder": "はんだ", - "item.electricadvantage.li_powder": "リチウム粉末", - "item.electricadvantage.li_ingot": "リチウム金属", - "item.electricadvantage.li_nugget": "リチウムナゲット", - "item.electricadvantage.sulfur_powder": "硫黄粉末", - "item.electricadvantage.lead_acid_battery": "鉛蓄電池", - "item.electricadvantage.nickel_hydride_battery": "ニッケル水素バッテリー", - "item.electricadvantage.alkaline_battery": "アルカリ電池", - "item.electricadvantage.lithium_battery": "リチウムイオン電池", - "block.electricadvantage.electric_conduit": "電線", - "block.electricadvantage.electric_track": "電動足場", - "block.electricadvantage.electric_battery_array": "電池貯蔵", - "block.electricadvantage.electric_crusher": "電気岩クラッシャー", - "block.electricadvantage.laser_turret": "レーザー砲塔", - "block.electricadvantage.electric_drill": "電気ドリル", - "block.electricadvantage.electric_fabricator": "ロボット工場", - "block.electricadvantage.electric_furnace": "電気炉", - "block.electricadvantage.electric_oven": "電気オーブン", - "block.electricadvantage.electric_pcb_printer": "回路基板プリンター", - "block.electricadvantage.geothermal_generator": "地熱発電", - "block.electricadvantage.hydroelectric_generator": "水力発電機", - "block.electricadvantage.photovoltaic_generator": "太陽電池パネル", - "block.electricadvantage.steam_powered_generator": "蒸気駆動の発電機", - "block.electricadvantage.growth_chamber": "植物生長室", - "block.electricadvantage.growth_chamber_controller": "植物成長室コントローラ", - "block.electricadvantage.li_ore": "リチウム 鉱石", - "block.electricadvantage.sulfur_ore": "硫黄鉱石", - "block.electricadvantage.led_bar": "LEDライト", - "block.electricadvantage.electric_switch": "電気スイッチ", - "block.electricadvantage.electric_still": "電気蒸留器", - "block.electricadvantage.electric_pump": "電気ポンプ", - "block.electricadvantage.plastic_refinery": "プラスチック製油所", - "item.electricadvantage.petrolplastic_ingot": "石油系プラスチックインゴット", - "block.electricadvantage.pump_pipe_electric": "ポンプ配管", - "block.electricadvantage.laser_turret_evil": "レーザー砲塔" -} diff --git a/src/main/resources/assets/electricadvantage/lang/ko_ko.json b/src/main/resources/assets/electricadvantage/lang/ko_ko.json deleted file mode 100644 index d527227..0000000 --- a/src/main/resources/assets/electricadvantage/lang/ko_ko.json +++ /dev/null @@ -1,91 +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": "펌프 파이프", - "item.electricadvantage.blank_circuit_board": "회로 기판 (빈)", - "item.electricadvantage.control_circuit": "제어 회로", - "item.electricadvantage.integrated_circuit": "마이크로 칩", - "item.electricadvantage.psu": "전원 공급 장치", - "item.electricadvantage.silicon_ingot": "실리콘 잉곳", - "item.electricadvantage.silicon_mix": "실리콘 혼합", - "item.electricadvantage.solder_mix": "솔더 혼합", - "item.electricadvantage.solder": "솔더", - "item.electricadvantage.li_powder": "분말 리튬", - "item.electricadvantage.li_ingot": "리튬 잉곳", - "item.electricadvantage.li_nugget": "리튬 너겟", - "item.electricadvantage.sulfur_powder": "분말 유황", - "item.electricadvantage.lead_acid_battery": "납 축전지", - "item.electricadvantage.nickel_hydride_battery": "니켈 수소 배터리", - "item.electricadvantage.alkaline_battery": "알카라인 배터리", - "item.electricadvantage.lithium_battery": "리튬 이온 배터리", - "block.electricadvantage.electric_conduit": "전력 케이블", - "block.electricadvantage.electric_track": "전기 비계", - "block.electricadvantage.electric_battery_array": "전지 어레이", - "block.electricadvantage.electric_crusher": "전기 락 크러셔", - "block.electricadvantage.laser_turret": "레이저 방어 터렛", - "block.electricadvantage.electric_drill": "전기 마이닝 드릴", - "block.electricadvantage.electric_fabricator": "자동 어셈블러", - "block.electricadvantage.electric_furnace": "전기로", - "block.electricadvantage.electric_oven": "전기 오븐", - "block.electricadvantage.electric_pcb_printer": "회로 기판 프린터", - "block.electricadvantage.geothermal_generator": "지열 발전기", - "block.electricadvantage.hydroelectric_generator": "수력 발전기", - "block.electricadvantage.photovoltaic_generator": "태양 광 발전기", - "block.electricadvantage.steam_powered_generator": "증기 발전기", - "block.electricadvantage.growth_chamber": "성장 상공 회의소", - "block.electricadvantage.growth_chamber_controller": "성장 챔버 제어 장치", - "block.electricadvantage.li_ore": "리튬 광석", - "block.electricadvantage.sulfur_ore": "유황 광석", - "block.electricadvantage.led_bar": "LED 조명", - "block.electricadvantage.electric_switch": "전기 스위치", - "block.electricadvantage.electric_still": "전기 증류기", - "block.electricadvantage.electric_pump": "전기 펌프", - "block.electricadvantage.plastic_refinery": "플라스틱 정유", - "item.electricadvantage.petrolplastic_ingot": "석유 수지 잉곳", - "block.electricadvantage.pump_pipe_electric": "펌프 파이프", - "block.electricadvantage.laser_turret_evil": "레이저 방어 터렛" -} diff --git a/src/main/resources/assets/electricadvantage/lang/pt_br.json b/src/main/resources/assets/electricadvantage/lang/pt_br.json deleted file mode 100644 index 3140e93..0000000 --- a/src/main/resources/assets/electricadvantage/lang/pt_br.json +++ /dev/null @@ -1,92 +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", - "item.electricadvantage.blank_circuit_board": "Placa de Circuito (Vago)", - "item.electricadvantage.control_circuit": "Circuito de Controle", - "item.electricadvantage.integrated_circuit": "Circuito Integrado", - "item.electricadvantage.psu": "Unidade de Alimentação", - "item.electricadvantage.silicon_ingot": "Silício Lingote", - "item.electricadvantage.silicon_mix": "Mistura de Silício", - "item.electricadvantage.solder_mix": "Mistura de Solda", - "item.electricadvantage.solder": "Solda", - "item.electricadvantage.li_powder": "Pó de Lítio", - "item.electricadvantage.li_ingot": "Lítio Lingote", - "item.electricadvantage.li_nugget": "Pepita de Lítio", - "item.electricadvantage.sulfur_powder": "Enxofre em Pó", - "item.electricadvantage.lead_acid_battery": "Bateria de Chumbo Ácido", - "item.electricadvantage.nickel_hydride_battery": "Bateria Níquel-Hidreto Metálico", - "item.electricadvantage.alkaline_battery": "Bateria Alcalina", - "item.electricadvantage.lithium_battery": "Bateria de Lítio", - "block.electricadvantage.electric_conduit": "Fio Elétrico", - "block.electricadvantage.electric_track": "Elétrica Andaime", - "block.electricadvantage.electric_battery_array": "Armazenamento da Bateria", - "block.electricadvantage.electric_crusher": "Triturador de Rocha Elétrica", - "block.electricadvantage.laser_turret": "Torre de Arma a Laser", - "block.electricadvantage.electric_drill": "Broca Mineração Elétrica", - "block.electricadvantage.electric_fabricator": "Fábrica Automatizada", - "block.electricadvantage.electric_furnace": "Forno Elétrico a Arco", - "block.electricadvantage.electric_oven": "Forno Elétrico", - "block.electricadvantage.electric_pcb_printer": "Impressora Circuito", - "block.electricadvantage.geothermal_generator": "Gerador de Elétrico Geotérmica", - "block.electricadvantage.hydroelectric_generator": "Gerador Hidrelétrico", - "block.electricadvantage.photovoltaic_generator": "Painel Solar", - "block.electricadvantage.steam_powered_generator": "a Vapor Gerador Elétrico", - "block.electricadvantage.growth_chamber": "Câmara de Crescimento", - "block.electricadvantage.growth_chamber_controller": "Unidade de Controle de Crescimento Câmara", - "block.electricadvantage.li_ore": "Minério de Lítio", - "block.electricadvantage.sulfur_ore": "Minério de Enxofre", - "block.electricadvantage.led_bar": "Luz LED", - "block.electricadvantage.electric_switch": "Chave Elétrica", - "block.electricadvantage.electric_still": "Destilador Elétrico", - "block.electricadvantage.electric_pump": "Bomba Elétrica", - "block.electricadvantage.plastic_refinery": "Refinaria de Plástico", - "item.electricadvantage.petrolplastic_ingot": "Petróleo Plástico Lingote", - "block.electricadvantage.pump_pipe_electric": "Tubo de Bomba", - "block.electricadvantage.laser_turret_evil": "Torre de Arma a Laser" -} diff --git a/src/main/resources/assets/electricadvantage/lang/zh_cn.json b/src/main/resources/assets/electricadvantage/lang/zh_cn.json deleted file mode 100644 index d881a85..0000000 --- a/src/main/resources/assets/electricadvantage/lang/zh_cn.json +++ /dev/null @@ -1,92 +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": "泵管", - "item.electricadvantage.blank_circuit_board": "电路板（空白）", - "item.electricadvantage.control_circuit": "控制电路", - "item.electricadvantage.integrated_circuit": "微芯片", - "item.electricadvantage.psu": "电源单元", - "item.electricadvantage.silicon_ingot": "硅锭", - "item.electricadvantage.silicon_mix": "硅混合", - "item.electricadvantage.solder_mix": "焊接混合", - "item.electricadvantage.solder": "焊料", - "item.electricadvantage.li_powder": "粉状锂", - "item.electricadvantage.li_ingot": "锂锭", - "item.electricadvantage.li_nugget": "锂掘金", - "item.electricadvantage.sulfur_powder": "硫粉", - "item.electricadvantage.lead_acid_battery": "铅酸蓄电池", - "item.electricadvantage.nickel_hydride_battery": "镍氢电池", - "item.electricadvantage.alkaline_battery": "碱性电池", - "item.electricadvantage.lithium_battery": "锂离子电池", - "block.electricadvantage.electric_conduit": "电力电缆", - "block.electricadvantage.electric_track": "电动脚手架", - "block.electricadvantage.electric_battery_array": "电池阵列", - "block.electricadvantage.electric_crusher": "电碎石机", - "block.electricadvantage.laser_turret": "激光防御炮塔", - "block.electricadvantage.electric_drill": "电矿钻", - "block.electricadvantage.electric_fabricator": "自动汇编", - "block.electricadvantage.electric_furnace": "电弧炉", - "block.electricadvantage.electric_oven": "电烤箱", - "block.electricadvantage.electric_pcb_printer": " 电路板打印机", - "block.electricadvantage.geothermal_generator": "热发电机", - "block.electricadvantage.hydroelectric_generator": "水轮发电机", - "block.electricadvantage.photovoltaic_generator": "光电发生器", - "block.electricadvantage.steam_powered_generator": "蒸汽为动力的电动发电机", - "block.electricadvantage.growth_chamber": "生长箱", - "block.electricadvantage.growth_chamber_controller": "生长箱控制单元", - "block.electricadvantage.li_ore": "锂矿", - "block.electricadvantage.sulfur_ore": "硫矿石", - "block.electricadvantage.led_bar": "LED燈", - "block.electricadvantage.electric_switch": "電器開關", - "block.electricadvantage.electric_still": "電熱蒸餾水", - "block.electricadvantage.electric_pump": "電動泵", - "block.electricadvantage.plastic_refinery": "塑料煉油廠", - "item.electricadvantage.petrolplastic_ingot": "石油膠錠", - "block.electricadvantage.pump_pipe_electric": "泵管", - "block.electricadvantage.laser_turret_evil": "激光防御炮塔" -} 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 d9cc7b6..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/machine_side", - "top": "electricadvantage:blocks/machine_top", - "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/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 2eecc46..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": { - "layer0": "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 38fb66c..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/control_circuit.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "layer0": "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/generic_item.json b/src/main/resources/assets/electricadvantage/models/item/generic_item.json deleted file mode 100644 index a0a6658..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/generic_item.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "electricadvantage:items/blank_circuit_board" - } -} 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 1cb8270..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/integrated_circuit.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "layer0": "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 94cc2ce..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/li_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "layer0": "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 dbf17f3..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/li_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "layer0": "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 b8d4fbb..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/li_powder.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "layer0": "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 f640ac9..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/petrolplastic_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "layer0": "electricadvantage:items/petrolplastic_ingot" - } -} 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 06aba98..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/psu.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "layer0": "electricadvantage:items/psu" - } -} 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 1e15ca5..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/silicon_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "layer0": "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 f8584b4..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/silicon_mix.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "layer0": "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 35b5559..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/solder.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "layer0": "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 caad3bf..0000000 --- a/src/main/resources/assets/electricadvantage/models/item/solder_mix.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "electricadvantage:item/generic_item", - "textures": { - "layer0": "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/data/electricadvantage/advancements/recipes/alkaline_battery.json b/src/main/resources/data/baseelectric/advancements/recipes/alkaline_battery.json similarity index 92% rename from src/main/resources/data/electricadvantage/advancements/recipes/alkaline_battery.json rename to src/main/resources/data/baseelectric/advancements/recipes/alkaline_battery.json index 262ad40..fed98f0 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/alkaline_battery.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/alkaline_battery.json @@ -44,7 +44,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:alkaline_battery" + "recipe": "baseelectric:alkaline_battery" } } }, @@ -59,7 +59,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:alkaline_battery" + "baseelectric:alkaline_battery" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/blank_circuit_board_ingot_normal.json b/src/main/resources/data/baseelectric/advancements/recipes/blank_circuit_board_ingot_normal.json similarity index 84% rename from src/main/resources/data/electricadvantage/advancements/recipes/blank_circuit_board_ingot_normal.json rename to src/main/resources/data/baseelectric/advancements/recipes/blank_circuit_board_ingot_normal.json index ef89620..c22123c 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/blank_circuit_board_ingot_normal.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/blank_circuit_board_ingot_normal.json @@ -24,7 +24,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:blank_circuit_board_ingot_normal" + "recipe": "baseelectric:blank_circuit_board_ingot_normal" } } }, @@ -37,7 +37,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:blank_circuit_board_ingot_normal" + "baseelectric:blank_circuit_board_ingot_normal" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/blank_circuit_board_plate.json b/src/main/resources/data/baseelectric/advancements/recipes/blank_circuit_board_plate.json similarity index 86% rename from src/main/resources/data/electricadvantage/advancements/recipes/blank_circuit_board_plate.json rename to src/main/resources/data/baseelectric/advancements/recipes/blank_circuit_board_plate.json index 0ac9a97..91e5294 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/blank_circuit_board_plate.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/blank_circuit_board_plate.json @@ -24,7 +24,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:blank_circuit_board_plate" + "recipe": "baseelectric:blank_circuit_board_plate" } } }, @@ -37,7 +37,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:blank_circuit_board_plate" + "baseelectric:blank_circuit_board_plate" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/control_circuit.json b/src/main/resources/data/baseelectric/advancements/recipes/control_circuit.json similarity index 85% rename from src/main/resources/data/electricadvantage/advancements/recipes/control_circuit.json rename to src/main/resources/data/baseelectric/advancements/recipes/control_circuit.json index ac2170b..2687409 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/control_circuit.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/control_circuit.json @@ -6,7 +6,7 @@ "conditions": { "items": [ { - "item": "electricadvantage:blank_circuit_board" + "item": "baseelectric:blank_circuit_board" } ] } @@ -34,7 +34,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:control_circuit" + "recipe": "baseelectric:control_circuit" } } }, @@ -48,7 +48,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:control_circuit" + "baseelectric:control_circuit" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/electric_battery_array.json b/src/main/resources/data/baseelectric/advancements/recipes/electric_battery_array.json similarity index 91% rename from src/main/resources/data/electricadvantage/advancements/recipes/electric_battery_array.json rename to src/main/resources/data/baseelectric/advancements/recipes/electric_battery_array.json index aab8cf7..a0436c6 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/electric_battery_array.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/electric_battery_array.json @@ -44,7 +44,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:electric_battery_array" + "recipe": "baseelectric:electric_battery_array" } } }, @@ -59,7 +59,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:electric_battery_array" + "baseelectric:electric_battery_array" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/electric_conduit_plastic_ingot.json b/src/main/resources/data/baseelectric/advancements/recipes/electric_conduit_plastic_ingot.json similarity index 85% rename from src/main/resources/data/electricadvantage/advancements/recipes/electric_conduit_plastic_ingot.json rename to src/main/resources/data/baseelectric/advancements/recipes/electric_conduit_plastic_ingot.json index 71d3f2f..81136f5 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/electric_conduit_plastic_ingot.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/electric_conduit_plastic_ingot.json @@ -24,7 +24,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:electric_conduit_plastic_ingot" + "recipe": "baseelectric:electric_conduit_plastic_ingot" } } }, @@ -37,7 +37,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:electric_conduit_plastic_ingot" + "baseelectric:electric_conduit_plastic_ingot" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/electric_conduit_plastic_rod.json b/src/main/resources/data/baseelectric/advancements/recipes/electric_conduit_plastic_rod.json similarity index 85% rename from src/main/resources/data/electricadvantage/advancements/recipes/electric_conduit_plastic_rod.json rename to src/main/resources/data/baseelectric/advancements/recipes/electric_conduit_plastic_rod.json index 1113778..6152022 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/electric_conduit_plastic_rod.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/electric_conduit_plastic_rod.json @@ -24,7 +24,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:electric_conduit_plastic_rod" + "recipe": "baseelectric:electric_conduit_plastic_rod" } } }, @@ -37,7 +37,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:electric_conduit_plastic_rod" + "baseelectric:electric_conduit_plastic_rod" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/electric_conduit_rubber_ingot.json b/src/main/resources/data/baseelectric/advancements/recipes/electric_conduit_rubber_ingot.json similarity index 85% rename from src/main/resources/data/electricadvantage/advancements/recipes/electric_conduit_rubber_ingot.json rename to src/main/resources/data/baseelectric/advancements/recipes/electric_conduit_rubber_ingot.json index 34e1308..ac4e96c 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/electric_conduit_rubber_ingot.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/electric_conduit_rubber_ingot.json @@ -24,7 +24,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:electric_conduit_rubber_ingot" + "recipe": "baseelectric:electric_conduit_rubber_ingot" } } }, @@ -37,7 +37,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:electric_conduit_rubber_ingot" + "baseelectric:electric_conduit_rubber_ingot" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/electric_conduit_rubber_rod.json b/src/main/resources/data/baseelectric/advancements/recipes/electric_conduit_rubber_rod.json similarity index 85% rename from src/main/resources/data/electricadvantage/advancements/recipes/electric_conduit_rubber_rod.json rename to src/main/resources/data/baseelectric/advancements/recipes/electric_conduit_rubber_rod.json index 02ebcf7..56f16dc 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/electric_conduit_rubber_rod.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/electric_conduit_rubber_rod.json @@ -24,7 +24,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:electric_conduit_rubber_rod" + "recipe": "baseelectric:electric_conduit_rubber_rod" } } }, @@ -37,7 +37,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:electric_conduit_rubber_rod" + "baseelectric:electric_conduit_rubber_rod" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/electric_crusher.json b/src/main/resources/data/baseelectric/advancements/recipes/electric_crusher.json similarity index 93% rename from src/main/resources/data/electricadvantage/advancements/recipes/electric_crusher.json rename to src/main/resources/data/baseelectric/advancements/recipes/electric_crusher.json index 3c6d550..705c2c3 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/electric_crusher.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/electric_crusher.json @@ -54,7 +54,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:electric_crusher" + "recipe": "baseelectric:electric_crusher" } } }, @@ -70,7 +70,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:electric_crusher" + "baseelectric:electric_crusher" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/electric_drill.json b/src/main/resources/data/baseelectric/advancements/recipes/electric_drill.json similarity index 92% rename from src/main/resources/data/electricadvantage/advancements/recipes/electric_drill.json rename to src/main/resources/data/baseelectric/advancements/recipes/electric_drill.json index 23a9e46..05b5746 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/electric_drill.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/electric_drill.json @@ -44,7 +44,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:electric_drill" + "recipe": "baseelectric:electric_drill" } } }, @@ -59,7 +59,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:electric_drill" + "baseelectric:electric_drill" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/electric_fabricator.json b/src/main/resources/data/baseelectric/advancements/recipes/electric_fabricator.json similarity index 92% rename from src/main/resources/data/electricadvantage/advancements/recipes/electric_fabricator.json rename to src/main/resources/data/baseelectric/advancements/recipes/electric_fabricator.json index e811829..8d7aa7f 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/electric_fabricator.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/electric_fabricator.json @@ -44,7 +44,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:electric_fabricator" + "recipe": "baseelectric:electric_fabricator" } } }, @@ -59,7 +59,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:electric_fabricator" + "baseelectric:electric_fabricator" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/electric_furnace.json b/src/main/resources/data/baseelectric/advancements/recipes/electric_furnace.json similarity index 88% rename from src/main/resources/data/electricadvantage/advancements/recipes/electric_furnace.json rename to src/main/resources/data/baseelectric/advancements/recipes/electric_furnace.json index e85ea1e..98b29d4 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/electric_furnace.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/electric_furnace.json @@ -24,7 +24,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:electric_furnace" + "recipe": "baseelectric:electric_furnace" } } }, @@ -37,7 +37,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:electric_furnace" + "baseelectric:electric_furnace" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/electric_oven.json b/src/main/resources/data/baseelectric/advancements/recipes/electric_oven.json similarity index 92% rename from src/main/resources/data/electricadvantage/advancements/recipes/electric_oven.json rename to src/main/resources/data/baseelectric/advancements/recipes/electric_oven.json index 97f423d..0257ce6 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/electric_oven.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/electric_oven.json @@ -44,7 +44,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:electric_oven" + "recipe": "baseelectric:electric_oven" } } }, @@ -59,7 +59,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:electric_oven" + "baseelectric:electric_oven" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/electric_pump.json b/src/main/resources/data/baseelectric/advancements/recipes/electric_pump.json similarity index 93% rename from src/main/resources/data/electricadvantage/advancements/recipes/electric_pump.json rename to src/main/resources/data/baseelectric/advancements/recipes/electric_pump.json index 53acf4d..f8516c6 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/electric_pump.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/electric_pump.json @@ -54,7 +54,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:electric_pump" + "recipe": "baseelectric:electric_pump" } } }, @@ -70,7 +70,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:electric_pump" + "baseelectric:electric_pump" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/electric_still.json b/src/main/resources/data/baseelectric/advancements/recipes/electric_still.json similarity index 92% rename from src/main/resources/data/electricadvantage/advancements/recipes/electric_still.json rename to src/main/resources/data/baseelectric/advancements/recipes/electric_still.json index 91639e9..9c92b30 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/electric_still.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/electric_still.json @@ -44,7 +44,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:electric_still" + "recipe": "baseelectric:electric_still" } } }, @@ -59,7 +59,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:electric_still" + "baseelectric:electric_still" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/electric_switch.json b/src/main/resources/data/baseelectric/advancements/recipes/electric_switch.json similarity index 90% rename from src/main/resources/data/electricadvantage/advancements/recipes/electric_switch.json rename to src/main/resources/data/baseelectric/advancements/recipes/electric_switch.json index 4aac598..d3b5981 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/electric_switch.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/electric_switch.json @@ -34,7 +34,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:electric_switch" + "recipe": "baseelectric:electric_switch" } } }, @@ -48,7 +48,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:electric_switch" + "baseelectric:electric_switch" ] } } diff --git a/src/main/resources/data/baseelectric/advancements/recipes/electric_track.json b/src/main/resources/data/baseelectric/advancements/recipes/electric_track.json new file mode 100644 index 0000000..30d1008 --- /dev/null +++ b/src/main/resources/data/baseelectric/advancements/recipes/electric_track.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "baseelectric:electric_conduit" + } + ] + } + }, + "has_ingredient_2": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "basepower:steel_frame" + } + ] + } + }, + "has_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "baseelectric:electric_track" + } + } + }, + "requirements": [ + [ + "has_ingredient_1", + "has_ingredient_2", + "has_recipe" + ] + ], + "rewards": { + "recipes": [ + "baseelectric:electric_track" + ] + } +} diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/growth_chamber.json b/src/main/resources/data/baseelectric/advancements/recipes/growth_chamber.json similarity index 93% rename from src/main/resources/data/electricadvantage/advancements/recipes/growth_chamber.json rename to src/main/resources/data/baseelectric/advancements/recipes/growth_chamber.json index b5617b1..f36008e 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/growth_chamber.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/growth_chamber.json @@ -54,7 +54,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:growth_chamber" + "recipe": "baseelectric:growth_chamber" } } }, @@ -70,7 +70,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:growth_chamber" + "baseelectric:growth_chamber" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/growth_chamber_controller.json b/src/main/resources/data/baseelectric/advancements/recipes/growth_chamber_controller.json similarity index 92% rename from src/main/resources/data/electricadvantage/advancements/recipes/growth_chamber_controller.json rename to src/main/resources/data/baseelectric/advancements/recipes/growth_chamber_controller.json index c3f9817..3e64354 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/growth_chamber_controller.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/growth_chamber_controller.json @@ -54,7 +54,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:growth_chamber_controller" + "recipe": "baseelectric:growth_chamber_controller" } } }, @@ -70,7 +70,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:growth_chamber_controller" + "baseelectric:growth_chamber_controller" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/hydroelectric_generator.json b/src/main/resources/data/baseelectric/advancements/recipes/hydroelectric_generator.json similarity index 91% rename from src/main/resources/data/electricadvantage/advancements/recipes/hydroelectric_generator.json rename to src/main/resources/data/baseelectric/advancements/recipes/hydroelectric_generator.json index fc59a9d..bcd7b35 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/hydroelectric_generator.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/hydroelectric_generator.json @@ -44,7 +44,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:hydroelectric_generator" + "recipe": "baseelectric:hydroelectric_generator" } } }, @@ -59,7 +59,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:hydroelectric_generator" + "baseelectric:hydroelectric_generator" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/integrated_circuit_copper_normal.json b/src/main/resources/data/baseelectric/advancements/recipes/integrated_circuit_copper_normal.json similarity index 84% rename from src/main/resources/data/electricadvantage/advancements/recipes/integrated_circuit_copper_normal.json rename to src/main/resources/data/baseelectric/advancements/recipes/integrated_circuit_copper_normal.json index 8327834..600d50a 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/integrated_circuit_copper_normal.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/integrated_circuit_copper_normal.json @@ -24,7 +24,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:integrated_circuit_copper_normal" + "recipe": "baseelectric:integrated_circuit_copper_normal" } } }, @@ -37,7 +37,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:integrated_circuit_copper_normal" + "baseelectric:integrated_circuit_copper_normal" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/integrated_circuit_copper_tech.json b/src/main/resources/data/baseelectric/advancements/recipes/integrated_circuit_copper_tech.json similarity index 90% rename from src/main/resources/data/electricadvantage/advancements/recipes/integrated_circuit_copper_tech.json rename to src/main/resources/data/baseelectric/advancements/recipes/integrated_circuit_copper_tech.json index fa1b4cd..f66ada2 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/integrated_circuit_copper_tech.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/integrated_circuit_copper_tech.json @@ -44,7 +44,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:integrated_circuit_copper_tech" + "recipe": "baseelectric:integrated_circuit_copper_tech" } } }, @@ -59,7 +59,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:integrated_circuit_copper_tech" + "baseelectric:integrated_circuit_copper_tech" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/integrated_circuit_gold_normal.json b/src/main/resources/data/baseelectric/advancements/recipes/integrated_circuit_gold_normal.json similarity index 85% rename from src/main/resources/data/electricadvantage/advancements/recipes/integrated_circuit_gold_normal.json rename to src/main/resources/data/baseelectric/advancements/recipes/integrated_circuit_gold_normal.json index dc62986..dada91a 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/integrated_circuit_gold_normal.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/integrated_circuit_gold_normal.json @@ -24,7 +24,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:integrated_circuit_gold_normal" + "recipe": "baseelectric:integrated_circuit_gold_normal" } } }, @@ -37,7 +37,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:integrated_circuit_gold_normal" + "baseelectric:integrated_circuit_gold_normal" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/integrated_circuit_gold_tech.json b/src/main/resources/data/baseelectric/advancements/recipes/integrated_circuit_gold_tech.json similarity index 90% rename from src/main/resources/data/electricadvantage/advancements/recipes/integrated_circuit_gold_tech.json rename to src/main/resources/data/baseelectric/advancements/recipes/integrated_circuit_gold_tech.json index ee1d711..f4e7a4c 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/integrated_circuit_gold_tech.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/integrated_circuit_gold_tech.json @@ -44,7 +44,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:integrated_circuit_gold_tech" + "recipe": "baseelectric:integrated_circuit_gold_tech" } } }, @@ -59,7 +59,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:integrated_circuit_gold_tech" + "baseelectric:integrated_circuit_gold_tech" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/integrated_circuit_tin_normal.json b/src/main/resources/data/baseelectric/advancements/recipes/integrated_circuit_tin_normal.json similarity index 85% rename from src/main/resources/data/electricadvantage/advancements/recipes/integrated_circuit_tin_normal.json rename to src/main/resources/data/baseelectric/advancements/recipes/integrated_circuit_tin_normal.json index b67d971..c453c4c 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/integrated_circuit_tin_normal.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/integrated_circuit_tin_normal.json @@ -24,7 +24,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:integrated_circuit_tin_normal" + "recipe": "baseelectric:integrated_circuit_tin_normal" } } }, @@ -37,7 +37,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:integrated_circuit_tin_normal" + "baseelectric:integrated_circuit_tin_normal" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/integrated_circuit_tin_tech.json b/src/main/resources/data/baseelectric/advancements/recipes/integrated_circuit_tin_tech.json similarity index 90% rename from src/main/resources/data/electricadvantage/advancements/recipes/integrated_circuit_tin_tech.json rename to src/main/resources/data/baseelectric/advancements/recipes/integrated_circuit_tin_tech.json index a234004..a8986dd 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/integrated_circuit_tin_tech.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/integrated_circuit_tin_tech.json @@ -44,7 +44,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:integrated_circuit_tin_tech" + "recipe": "baseelectric:integrated_circuit_tin_tech" } } }, @@ -59,7 +59,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:integrated_circuit_tin_tech" + "baseelectric:integrated_circuit_tin_tech" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/laser_turret_diamond_emerald.json b/src/main/resources/data/baseelectric/advancements/recipes/laser_turret_diamond_emerald.json similarity index 92% rename from src/main/resources/data/electricadvantage/advancements/recipes/laser_turret_diamond_emerald.json rename to src/main/resources/data/baseelectric/advancements/recipes/laser_turret_diamond_emerald.json index d9885ca..4561af3 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/laser_turret_diamond_emerald.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/laser_turret_diamond_emerald.json @@ -54,7 +54,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:laser_turret_diamond_emerald" + "recipe": "baseelectric:laser_turret_diamond_emerald" } } }, @@ -70,7 +70,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:laser_turret_diamond_emerald" + "baseelectric:laser_turret_diamond_emerald" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/laser_turret_emerald_diamond.json b/src/main/resources/data/baseelectric/advancements/recipes/laser_turret_emerald_diamond.json similarity index 92% rename from src/main/resources/data/electricadvantage/advancements/recipes/laser_turret_emerald_diamond.json rename to src/main/resources/data/baseelectric/advancements/recipes/laser_turret_emerald_diamond.json index 0657f86..e85fbf7 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/laser_turret_emerald_diamond.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/laser_turret_emerald_diamond.json @@ -54,7 +54,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:laser_turret_emerald_diamond" + "recipe": "baseelectric:laser_turret_emerald_diamond" } } }, @@ -70,7 +70,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:laser_turret_emerald_diamond" + "baseelectric:laser_turret_emerald_diamond" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/lead_acid_battery_dust_sulfur.json b/src/main/resources/data/baseelectric/advancements/recipes/lead_acid_battery_dust_sulfur.json similarity index 90% rename from src/main/resources/data/electricadvantage/advancements/recipes/lead_acid_battery_dust_sulfur.json rename to src/main/resources/data/baseelectric/advancements/recipes/lead_acid_battery_dust_sulfur.json index fc09e75..248bff0 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/lead_acid_battery_dust_sulfur.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/lead_acid_battery_dust_sulfur.json @@ -44,7 +44,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:lead_acid_battery_dust_sulfur" + "recipe": "baseelectric:lead_acid_battery_dust_sulfur" } } }, @@ -59,7 +59,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:lead_acid_battery_dust_sulfur" + "baseelectric:lead_acid_battery_dust_sulfur" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/lead_acid_battery_sulfur.json b/src/main/resources/data/baseelectric/advancements/recipes/lead_acid_battery_sulfur.json similarity index 91% rename from src/main/resources/data/electricadvantage/advancements/recipes/lead_acid_battery_sulfur.json rename to src/main/resources/data/baseelectric/advancements/recipes/lead_acid_battery_sulfur.json index 36ee8b3..d942a7c 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/lead_acid_battery_sulfur.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/lead_acid_battery_sulfur.json @@ -44,7 +44,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:lead_acid_battery_sulfur" + "recipe": "baseelectric:lead_acid_battery_sulfur" } } }, @@ -59,7 +59,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:lead_acid_battery_sulfur" + "baseelectric:lead_acid_battery_sulfur" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/led_bar.json b/src/main/resources/data/baseelectric/advancements/recipes/led_bar.json similarity index 92% rename from src/main/resources/data/electricadvantage/advancements/recipes/led_bar.json rename to src/main/resources/data/baseelectric/advancements/recipes/led_bar.json index 2b930e8..2eeb86f 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/led_bar.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/led_bar.json @@ -34,7 +34,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:led_bar" + "recipe": "baseelectric:led_bar" } } }, @@ -48,7 +48,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:led_bar" + "baseelectric:led_bar" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/lithium_battery.json b/src/main/resources/data/baseelectric/advancements/recipes/lithium_battery.json similarity index 92% rename from src/main/resources/data/electricadvantage/advancements/recipes/lithium_battery.json rename to src/main/resources/data/baseelectric/advancements/recipes/lithium_battery.json index 3f7e590..8a449ca 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/lithium_battery.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/lithium_battery.json @@ -44,7 +44,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:lithium_battery" + "recipe": "baseelectric:lithium_battery" } } }, @@ -59,7 +59,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:lithium_battery" + "baseelectric:lithium_battery" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/lithium_ingot_from_nuggets.json b/src/main/resources/data/baseelectric/advancements/recipes/lithium_ingot_from_nuggets.json similarity index 80% rename from src/main/resources/data/electricadvantage/advancements/recipes/lithium_ingot_from_nuggets.json rename to src/main/resources/data/baseelectric/advancements/recipes/lithium_ingot_from_nuggets.json index b2c780c..044e5f5 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/lithium_ingot_from_nuggets.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/lithium_ingot_from_nuggets.json @@ -14,7 +14,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:lithium_ingot_from_nuggets" + "recipe": "baseelectric:lithium_ingot_from_nuggets" } } }, @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:lithium_ingot_from_nuggets" + "baseelectric:lithium_ingot_from_nuggets" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/lithium_ingot_from_ore.json b/src/main/resources/data/baseelectric/advancements/recipes/lithium_ingot_from_ore.json similarity index 74% rename from src/main/resources/data/electricadvantage/advancements/recipes/lithium_ingot_from_ore.json rename to src/main/resources/data/baseelectric/advancements/recipes/lithium_ingot_from_ore.json index 08d14d9..9f463be 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/lithium_ingot_from_ore.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/lithium_ingot_from_ore.json @@ -6,7 +6,7 @@ "conditions": { "items": [ { - "item": "electricadvantage:li_ore" + "item": "baseelectric:li_ore" } ] } @@ -14,7 +14,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:lithium_ingot_from_ore" + "recipe": "baseelectric:lithium_ingot_from_ore" } } }, @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:lithium_ingot_from_ore" + "baseelectric:lithium_ingot_from_ore" ] } } diff --git a/src/main/resources/data/baseelectric/advancements/recipes/lithium_ingot_from_powder.json b/src/main/resources/data/baseelectric/advancements/recipes/lithium_ingot_from_powder.json new file mode 100644 index 0000000..d59344c --- /dev/null +++ b/src/main/resources/data/baseelectric/advancements/recipes/lithium_ingot_from_powder.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "baseelectric:li_powder" + } + ] + } + }, + "has_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "baseelectric:lithium_ingot_from_powder" + } + } + }, + "requirements": [ + [ + "has_ingredient_1", + "has_recipe" + ] + ], + "rewards": { + "recipes": [ + "baseelectric:lithium_ingot_from_powder" + ] + } +} diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/lithium_nuggets.json b/src/main/resources/data/baseelectric/advancements/recipes/lithium_nuggets.json similarity index 83% rename from src/main/resources/data/electricadvantage/advancements/recipes/lithium_nuggets.json rename to src/main/resources/data/baseelectric/advancements/recipes/lithium_nuggets.json index 83387d6..4cb6996 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/lithium_nuggets.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/lithium_nuggets.json @@ -14,7 +14,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:lithium_nuggets" + "recipe": "baseelectric:lithium_nuggets" } } }, @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:lithium_nuggets" + "baseelectric:lithium_nuggets" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/nickel_hydride_battery.json b/src/main/resources/data/baseelectric/advancements/recipes/nickel_hydride_battery.json similarity index 91% rename from src/main/resources/data/electricadvantage/advancements/recipes/nickel_hydride_battery.json rename to src/main/resources/data/baseelectric/advancements/recipes/nickel_hydride_battery.json index f7f51c4..c3af038 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/nickel_hydride_battery.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/nickel_hydride_battery.json @@ -44,7 +44,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:nickel_hydride_battery" + "recipe": "baseelectric:nickel_hydride_battery" } } }, @@ -59,7 +59,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:nickel_hydride_battery" + "baseelectric:nickel_hydride_battery" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/photovoltaic_generator.json b/src/main/resources/data/baseelectric/advancements/recipes/photovoltaic_generator.json similarity index 91% rename from src/main/resources/data/electricadvantage/advancements/recipes/photovoltaic_generator.json rename to src/main/resources/data/baseelectric/advancements/recipes/photovoltaic_generator.json index 10ec133..818e45b 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/photovoltaic_generator.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/photovoltaic_generator.json @@ -44,7 +44,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:photovoltaic_generator" + "recipe": "baseelectric:photovoltaic_generator" } } }, @@ -59,7 +59,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:photovoltaic_generator" + "baseelectric:photovoltaic_generator" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/plastic_refinery.json b/src/main/resources/data/baseelectric/advancements/recipes/plastic_refinery.json similarity index 93% rename from src/main/resources/data/electricadvantage/advancements/recipes/plastic_refinery.json rename to src/main/resources/data/baseelectric/advancements/recipes/plastic_refinery.json index 5b2934e..618561c 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/plastic_refinery.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/plastic_refinery.json @@ -54,7 +54,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:plastic_refinery" + "recipe": "baseelectric:plastic_refinery" } } }, @@ -70,7 +70,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:plastic_refinery" + "baseelectric:plastic_refinery" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/power_supply_unit_iron_normal.json b/src/main/resources/data/baseelectric/advancements/recipes/power_supply_unit_iron_normal.json similarity index 88% rename from src/main/resources/data/electricadvantage/advancements/recipes/power_supply_unit_iron_normal.json rename to src/main/resources/data/baseelectric/advancements/recipes/power_supply_unit_iron_normal.json index 442d954..4e0cfaa 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/power_supply_unit_iron_normal.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/power_supply_unit_iron_normal.json @@ -34,7 +34,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:power_supply_unit_iron_normal" + "recipe": "baseelectric:power_supply_unit_iron_normal" } } }, @@ -48,7 +48,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:power_supply_unit_iron_normal" + "baseelectric:power_supply_unit_iron_normal" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/power_supply_unit_plate_steel_apocalyptic.json b/src/main/resources/data/baseelectric/advancements/recipes/power_supply_unit_plate_steel_apocalyptic.json similarity index 86% rename from src/main/resources/data/electricadvantage/advancements/recipes/power_supply_unit_plate_steel_apocalyptic.json rename to src/main/resources/data/baseelectric/advancements/recipes/power_supply_unit_plate_steel_apocalyptic.json index 033f918..a92fbf9 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/power_supply_unit_plate_steel_apocalyptic.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/power_supply_unit_plate_steel_apocalyptic.json @@ -34,7 +34,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:power_supply_unit_plate_steel_apocalyptic" + "recipe": "baseelectric:power_supply_unit_plate_steel_apocalyptic" } } }, @@ -48,7 +48,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:power_supply_unit_plate_steel_apocalyptic" + "baseelectric:power_supply_unit_plate_steel_apocalyptic" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/power_supply_unit_plate_steel_tech.json b/src/main/resources/data/baseelectric/advancements/recipes/power_supply_unit_plate_steel_tech.json similarity index 87% rename from src/main/resources/data/electricadvantage/advancements/recipes/power_supply_unit_plate_steel_tech.json rename to src/main/resources/data/baseelectric/advancements/recipes/power_supply_unit_plate_steel_tech.json index 68a1ea2..661ed46 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/power_supply_unit_plate_steel_tech.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/power_supply_unit_plate_steel_tech.json @@ -34,7 +34,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:power_supply_unit_plate_steel_tech" + "recipe": "baseelectric:power_supply_unit_plate_steel_tech" } } }, @@ -48,7 +48,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:power_supply_unit_plate_steel_tech" + "baseelectric:power_supply_unit_plate_steel_tech" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/power_supply_unit_steel_normal.json b/src/main/resources/data/baseelectric/advancements/recipes/power_supply_unit_steel_normal.json similarity index 88% rename from src/main/resources/data/electricadvantage/advancements/recipes/power_supply_unit_steel_normal.json rename to src/main/resources/data/baseelectric/advancements/recipes/power_supply_unit_steel_normal.json index 9d1ade2..47b79d3 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/power_supply_unit_steel_normal.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/power_supply_unit_steel_normal.json @@ -34,7 +34,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:power_supply_unit_steel_normal" + "recipe": "baseelectric:power_supply_unit_steel_normal" } } }, @@ -48,7 +48,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:power_supply_unit_steel_normal" + "baseelectric:power_supply_unit_steel_normal" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/silicon_blend.json b/src/main/resources/data/baseelectric/advancements/recipes/silicon_blend.json similarity index 88% rename from src/main/resources/data/electricadvantage/advancements/recipes/silicon_blend.json rename to src/main/resources/data/baseelectric/advancements/recipes/silicon_blend.json index 835d345..4029923 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/silicon_blend.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/silicon_blend.json @@ -24,7 +24,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:silicon_blend" + "recipe": "baseelectric:silicon_blend" } } }, @@ -37,7 +37,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:silicon_blend" + "baseelectric:silicon_blend" ] } } diff --git a/src/main/resources/data/baseelectric/advancements/recipes/silicon_ingot_from_blend.json b/src/main/resources/data/baseelectric/advancements/recipes/silicon_ingot_from_blend.json new file mode 100644 index 0000000..f7001be --- /dev/null +++ b/src/main/resources/data/baseelectric/advancements/recipes/silicon_ingot_from_blend.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ingredient_1": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "baseelectric:silicon_mix" + } + ] + } + }, + "has_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "baseelectric:silicon_ingot_from_blend" + } + } + }, + "requirements": [ + [ + "has_ingredient_1", + "has_recipe" + ] + ], + "rewards": { + "recipes": [ + "baseelectric:silicon_ingot_from_blend" + ] + } +} diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/solder_blend_tin_lead.json b/src/main/resources/data/baseelectric/advancements/recipes/solder_blend_tin_lead.json similarity index 86% rename from src/main/resources/data/electricadvantage/advancements/recipes/solder_blend_tin_lead.json rename to src/main/resources/data/baseelectric/advancements/recipes/solder_blend_tin_lead.json index 9054d7e..c1eaa7c 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/solder_blend_tin_lead.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/solder_blend_tin_lead.json @@ -24,7 +24,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:solder_blend_tin_lead" + "recipe": "baseelectric:solder_blend_tin_lead" } } }, @@ -37,7 +37,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:solder_blend_tin_lead" + "baseelectric:solder_blend_tin_lead" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/solder_blend_tin_silver.json b/src/main/resources/data/baseelectric/advancements/recipes/solder_blend_tin_silver.json similarity index 86% rename from src/main/resources/data/electricadvantage/advancements/recipes/solder_blend_tin_silver.json rename to src/main/resources/data/baseelectric/advancements/recipes/solder_blend_tin_silver.json index ad40fb0..eafbf22 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/solder_blend_tin_silver.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/solder_blend_tin_silver.json @@ -24,7 +24,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:solder_blend_tin_silver" + "recipe": "baseelectric:solder_blend_tin_silver" } } }, @@ -37,7 +37,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:solder_blend_tin_silver" + "baseelectric:solder_blend_tin_silver" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/solder_from_blend.json b/src/main/resources/data/baseelectric/advancements/recipes/solder_from_blend.json similarity index 75% rename from src/main/resources/data/electricadvantage/advancements/recipes/solder_from_blend.json rename to src/main/resources/data/baseelectric/advancements/recipes/solder_from_blend.json index 9981a8b..7215c7d 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/solder_from_blend.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/solder_from_blend.json @@ -6,7 +6,7 @@ "conditions": { "items": [ { - "item": "electricadvantage:solder_mix" + "item": "baseelectric:solder_mix" } ] } @@ -14,7 +14,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:solder_from_blend" + "recipe": "baseelectric:solder_from_blend" } } }, @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:solder_from_blend" + "baseelectric:solder_from_blend" ] } } diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/steam_powered_generator.json b/src/main/resources/data/baseelectric/advancements/recipes/steam_powered_generator.json similarity index 92% rename from src/main/resources/data/electricadvantage/advancements/recipes/steam_powered_generator.json rename to src/main/resources/data/baseelectric/advancements/recipes/steam_powered_generator.json index 4494cfb..6081d96 100644 --- a/src/main/resources/data/electricadvantage/advancements/recipes/steam_powered_generator.json +++ b/src/main/resources/data/baseelectric/advancements/recipes/steam_powered_generator.json @@ -54,7 +54,7 @@ "has_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "electricadvantage:steam_powered_generator" + "recipe": "baseelectric:steam_powered_generator" } } }, @@ -70,7 +70,7 @@ ], "rewards": { "recipes": [ - "electricadvantage:steam_powered_generator" + "baseelectric:steam_powered_generator" ] } } diff --git a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_furnace.json b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_battery_array.json similarity index 82% rename from src/main/resources/data/electricadvantage/loot_tables/blocks/electric_furnace.json rename to src/main/resources/data/baseelectric/loot_tables/blocks/electric_battery_array.json index 93133a1..6a94f75 100644 --- a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_furnace.json +++ b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_battery_array.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "electricadvantage:electric_furnace" + "name": "baseelectric:electric_battery_array" } ], "conditions": [ diff --git a/src/main/resources/data/baseelectric/loot_tables/blocks/electric_conduit.json b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_conduit.json new file mode 100644 index 0000000..15087c5 --- /dev/null +++ b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_conduit.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "baseelectric:electric_conduit" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/baseelectric/loot_tables/blocks/electric_crusher.json b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_crusher.json new file mode 100644 index 0000000..818d76f --- /dev/null +++ b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_crusher.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "baseelectric:electric_crusher" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/baseelectric/loot_tables/blocks/electric_drill.json b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_drill.json new file mode 100644 index 0000000..2c32b16 --- /dev/null +++ b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_drill.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "baseelectric:electric_drill" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_still.json b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_fabricator.json similarity index 83% rename from src/main/resources/data/electricadvantage/loot_tables/blocks/electric_still.json rename to src/main/resources/data/baseelectric/loot_tables/blocks/electric_fabricator.json index 3bf810f..b4ea1cb 100644 --- a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_still.json +++ b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_fabricator.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "electricadvantage:electric_still" + "name": "baseelectric:electric_fabricator" } ], "conditions": [ diff --git a/src/main/resources/data/baseelectric/loot_tables/blocks/electric_furnace.json b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_furnace.json new file mode 100644 index 0000000..68d02a7 --- /dev/null +++ b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_furnace.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "baseelectric:electric_furnace" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_oven.json b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_oven.json similarity index 83% rename from src/main/resources/data/electricadvantage/loot_tables/blocks/electric_oven.json rename to src/main/resources/data/baseelectric/loot_tables/blocks/electric_oven.json index 3dbf628..2f571c3 100644 --- a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_oven.json +++ b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_oven.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "electricadvantage:electric_oven" + "name": "baseelectric:electric_oven" } ], "conditions": [ diff --git a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_pump.json b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_pump.json similarity index 83% rename from src/main/resources/data/electricadvantage/loot_tables/blocks/electric_pump.json rename to src/main/resources/data/baseelectric/loot_tables/blocks/electric_pump.json index 3035bfa..9562204 100644 --- a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_pump.json +++ b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_pump.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "electricadvantage:electric_pump" + "name": "baseelectric:electric_pump" } ], "conditions": [ diff --git a/src/main/resources/data/baseelectric/loot_tables/blocks/electric_still.json b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_still.json new file mode 100644 index 0000000..ac7b944 --- /dev/null +++ b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_still.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "baseelectric:electric_still" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/baseelectric/loot_tables/blocks/electric_switch.json b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_switch.json new file mode 100644 index 0000000..4f0a064 --- /dev/null +++ b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_switch.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "baseelectric:electric_switch" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/baseelectric/loot_tables/blocks/electric_track.json b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_track.json new file mode 100644 index 0000000..460b61c --- /dev/null +++ b/src/main/resources/data/baseelectric/loot_tables/blocks/electric_track.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "baseelectric:electric_track" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/baseelectric/loot_tables/blocks/growth_chamber.json b/src/main/resources/data/baseelectric/loot_tables/blocks/growth_chamber.json new file mode 100644 index 0000000..33a8fe0 --- /dev/null +++ b/src/main/resources/data/baseelectric/loot_tables/blocks/growth_chamber.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "baseelectric:growth_chamber" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_fabricator.json b/src/main/resources/data/baseelectric/loot_tables/blocks/growth_chamber_controller.json similarity index 81% rename from src/main/resources/data/electricadvantage/loot_tables/blocks/electric_fabricator.json rename to src/main/resources/data/baseelectric/loot_tables/blocks/growth_chamber_controller.json index 9710bd3..0f010d3 100644 --- a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_fabricator.json +++ b/src/main/resources/data/baseelectric/loot_tables/blocks/growth_chamber_controller.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "electricadvantage:electric_fabricator" + "name": "baseelectric:growth_chamber_controller" } ], "conditions": [ diff --git a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_crusher.json b/src/main/resources/data/baseelectric/loot_tables/blocks/hydroelectric_generator.json similarity index 82% rename from src/main/resources/data/electricadvantage/loot_tables/blocks/electric_crusher.json rename to src/main/resources/data/baseelectric/loot_tables/blocks/hydroelectric_generator.json index 2f6ba03..29434f8 100644 --- a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_crusher.json +++ b/src/main/resources/data/baseelectric/loot_tables/blocks/hydroelectric_generator.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "electricadvantage:electric_crusher" + "name": "baseelectric:hydroelectric_generator" } ], "conditions": [ diff --git a/src/main/resources/data/electricadvantage/loot_tables/blocks/laser_turret.json b/src/main/resources/data/baseelectric/loot_tables/blocks/laser_turret.json similarity index 84% rename from src/main/resources/data/electricadvantage/loot_tables/blocks/laser_turret.json rename to src/main/resources/data/baseelectric/loot_tables/blocks/laser_turret.json index 9c40877..fc59573 100644 --- a/src/main/resources/data/electricadvantage/loot_tables/blocks/laser_turret.json +++ b/src/main/resources/data/baseelectric/loot_tables/blocks/laser_turret.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "electricadvantage:laser_turret" + "name": "baseelectric:laser_turret" } ], "conditions": [ diff --git a/src/main/resources/data/baseelectric/loot_tables/blocks/laser_turret_evil.json b/src/main/resources/data/baseelectric/loot_tables/blocks/laser_turret_evil.json new file mode 100644 index 0000000..0a1d9f2 --- /dev/null +++ b/src/main/resources/data/baseelectric/loot_tables/blocks/laser_turret_evil.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "baseelectric:laser_turret_evil" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/electricadvantage/loot_tables/blocks/led_bar.json b/src/main/resources/data/baseelectric/loot_tables/blocks/led_bar.json similarity index 85% rename from src/main/resources/data/electricadvantage/loot_tables/blocks/led_bar.json rename to src/main/resources/data/baseelectric/loot_tables/blocks/led_bar.json index 8ebeedd..afba020 100644 --- a/src/main/resources/data/electricadvantage/loot_tables/blocks/led_bar.json +++ b/src/main/resources/data/baseelectric/loot_tables/blocks/led_bar.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "electricadvantage:led_bar" + "name": "baseelectric:led_bar" } ], "conditions": [ diff --git a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_conduit.json b/src/main/resources/data/baseelectric/loot_tables/blocks/photovoltaic_generator.json similarity index 82% rename from src/main/resources/data/electricadvantage/loot_tables/blocks/electric_conduit.json rename to src/main/resources/data/baseelectric/loot_tables/blocks/photovoltaic_generator.json index b6a5470..5808dc3 100644 --- a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_conduit.json +++ b/src/main/resources/data/baseelectric/loot_tables/blocks/photovoltaic_generator.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "electricadvantage:electric_conduit" + "name": "baseelectric:photovoltaic_generator" } ], "conditions": [ diff --git a/src/main/resources/data/baseelectric/loot_tables/blocks/plastic_refinery.json b/src/main/resources/data/baseelectric/loot_tables/blocks/plastic_refinery.json new file mode 100644 index 0000000..1f7c313 --- /dev/null +++ b/src/main/resources/data/baseelectric/loot_tables/blocks/plastic_refinery.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "baseelectric:plastic_refinery" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} diff --git a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_drill.json b/src/main/resources/data/baseelectric/loot_tables/blocks/steam_powered_generator.json similarity index 82% rename from src/main/resources/data/electricadvantage/loot_tables/blocks/electric_drill.json rename to src/main/resources/data/baseelectric/loot_tables/blocks/steam_powered_generator.json index 5082c42..4bc9b77 100644 --- a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_drill.json +++ b/src/main/resources/data/baseelectric/loot_tables/blocks/steam_powered_generator.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "electricadvantage:electric_drill" + "name": "baseelectric:steam_powered_generator" } ], "conditions": [ diff --git a/src/main/resources/data/electricadvantage/loot_tables/chests/advantage_parts.json b/src/main/resources/data/baseelectric/loot_tables/chests/advantage_parts.json similarity index 84% rename from src/main/resources/data/electricadvantage/loot_tables/chests/advantage_parts.json rename to src/main/resources/data/baseelectric/loot_tables/chests/advantage_parts.json index 248037f..ebdde5e 100644 --- a/src/main/resources/data/electricadvantage/loot_tables/chests/advantage_parts.json +++ b/src/main/resources/data/baseelectric/loot_tables/chests/advantage_parts.json @@ -10,7 +10,7 @@ }, { "type": "item", - "name": "electricadvantage:psu", + "name": "baseelectric:psu", "weight": 6, "functions": [ { @@ -24,7 +24,7 @@ }, { "type": "item", - "name": "electricadvantage:electric_conduit", + "name": "baseelectric:electric_conduit", "weight": 12, "functions": [ { @@ -38,7 +38,7 @@ }, { "type": "item", - "name": "electricadvantage:led_bar", + "name": "baseelectric:led_bar", "weight": 6, "functions": [ { @@ -52,7 +52,7 @@ }, { "type": "item", - "name": "electricadvantage:solder", + "name": "baseelectric:solder", "weight": 6, "functions": [ { @@ -66,7 +66,7 @@ }, { "type": "item", - "name": "electricadvantage:integrated_circuit", + "name": "baseelectric:integrated_circuit", "weight": 3, "functions": [ { @@ -80,7 +80,7 @@ }, { "type": "item", - "name": "electricadvantage:lead_acid_battery", + "name": "baseelectric:lead_acid_battery", "weight": 8, "functions": [ { @@ -94,7 +94,7 @@ }, { "type": "item", - "name": "electricadvantage:nickel_hydride_battery", + "name": "baseelectric:nickel_hydride_battery", "weight": 4, "functions": [ { @@ -108,7 +108,7 @@ }, { "type": "item", - "name": "electricadvantage:alkaline_battery", + "name": "baseelectric:alkaline_battery", "weight": 2, "functions": [ { @@ -122,7 +122,7 @@ }, { "type": "item", - "name": "electricadvantage:lithium_battery", + "name": "baseelectric:lithium_battery", "weight": 1, "functions": [ { diff --git a/src/main/resources/data/electricadvantage/recipes/alkaline_battery.json b/src/main/resources/data/baseelectric/recipes/alkaline_battery.json similarity index 67% rename from src/main/resources/data/electricadvantage/recipes/alkaline_battery.json rename to src/main/resources/data/baseelectric/recipes/alkaline_battery.json index c2e0f6a..c3e8985 100644 --- a/src/main/resources/data/electricadvantage/recipes/alkaline_battery.json +++ b/src/main/resources/data/baseelectric/recipes/alkaline_battery.json @@ -20,20 +20,20 @@ } }, "result": { - "item": "electricadvantage:alkaline_battery" + "item": "baseelectric:alkaline_battery" }, - "group": "electricadvantage:alkaline_battery", + "group": "baseelectric:alkaline_battery", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/iron" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/zinc" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plastic" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/blank_circuit_board_ingot_normal.json b/src/main/resources/data/baseelectric/recipes/blank_circuit_board_ingot_normal.json similarity index 58% rename from src/main/resources/data/electricadvantage/recipes/blank_circuit_board_ingot_normal.json rename to src/main/resources/data/baseelectric/recipes/blank_circuit_board_ingot_normal.json index ef899bb..5853396 100644 --- a/src/main/resources/data/electricadvantage/recipes/blank_circuit_board_ingot_normal.json +++ b/src/main/resources/data/baseelectric/recipes/blank_circuit_board_ingot_normal.json @@ -9,22 +9,22 @@ } ], "result": { - "item": "electricadvantage:blank_circuit_board", + "item": "baseelectric:blank_circuit_board", "count": 2 }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "NORMAL" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/copper" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plastic" } ], - "group": "electricadvantage:blank_circuit_board" + "group": "baseelectric:blank_circuit_board" } diff --git a/src/main/resources/data/electricadvantage/recipes/blank_circuit_board_plate.json b/src/main/resources/data/baseelectric/recipes/blank_circuit_board_plate.json similarity index 60% rename from src/main/resources/data/electricadvantage/recipes/blank_circuit_board_plate.json rename to src/main/resources/data/baseelectric/recipes/blank_circuit_board_plate.json index fd0b1d7..924834d 100644 --- a/src/main/resources/data/electricadvantage/recipes/blank_circuit_board_plate.json +++ b/src/main/resources/data/baseelectric/recipes/blank_circuit_board_plate.json @@ -9,17 +9,17 @@ } ], "result": { - "item": "electricadvantage:blank_circuit_board", + "item": "baseelectric:blank_circuit_board", "count": 2 }, - "group": "electricadvantage:blank_circuit_board", + "group": "baseelectric:blank_circuit_board", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plastic" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/copper" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/control_circuit.json b/src/main/resources/data/baseelectric/recipes/control_circuit.json similarity index 54% rename from src/main/resources/data/electricadvantage/recipes/control_circuit.json rename to src/main/resources/data/baseelectric/recipes/control_circuit.json index e7ed909..c5a2557 100644 --- a/src/main/resources/data/electricadvantage/recipes/control_circuit.json +++ b/src/main/resources/data/baseelectric/recipes/control_circuit.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "electricadvantage:blank_circuit_board" + "item": "baseelectric:blank_circuit_board" }, { "tag": "forge:microchips" @@ -12,16 +12,16 @@ } ], "result": { - "item": "electricadvantage:control_circuit" + "item": "baseelectric:control_circuit" }, - "group": "electricadvantage:control_circuit", + "group": "baseelectric:control_circuit", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:microchips" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:solder" } ] diff --git a/src/main/resources/data/baseelectric/recipes/crushing_control_circuit.json b/src/main/resources/data/baseelectric/recipes/crushing_control_circuit.json new file mode 100644 index 0000000..2aba934 --- /dev/null +++ b/src/main/resources/data/baseelectric/recipes/crushing_control_circuit.json @@ -0,0 +1,20 @@ +{ + "type": "basemetals:crushing", + "ingredient": { + "item": "baseelectric:control_circuit" + }, + "result": { + "item": "baseelectric:integrated_circuit", + "count": 1 + }, + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "basemetals" + }, + { + "type": "baseelectric:recipe_mode", + "mode": "APOCALYPTIC" + } + ] +} diff --git a/src/main/resources/data/electricadvantage/recipes/crushing_electric_furnace.json b/src/main/resources/data/baseelectric/recipes/crushing_electric_furnace.json similarity index 63% rename from src/main/resources/data/electricadvantage/recipes/crushing_electric_furnace.json rename to src/main/resources/data/baseelectric/recipes/crushing_electric_furnace.json index 14c925b..b29f0ee 100644 --- a/src/main/resources/data/electricadvantage/recipes/crushing_electric_furnace.json +++ b/src/main/resources/data/baseelectric/recipes/crushing_electric_furnace.json @@ -1,10 +1,10 @@ { "type": "basemetals:crushing", "ingredient": { - "item": "electricadvantage:electric_furnace" + "item": "baseelectric:electric_furnace" }, "result": { - "item": "electricadvantage:psu", + "item": "baseelectric:psu", "count": 1 }, "conditions": [ @@ -13,7 +13,7 @@ "modid": "basemetals" }, { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "APOCALYPTIC" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/crushing_lithium_ingot.json b/src/main/resources/data/baseelectric/recipes/crushing_lithium_ingot.json similarity index 75% rename from src/main/resources/data/electricadvantage/recipes/crushing_lithium_ingot.json rename to src/main/resources/data/baseelectric/recipes/crushing_lithium_ingot.json index c27ec25..eac6eff 100644 --- a/src/main/resources/data/electricadvantage/recipes/crushing_lithium_ingot.json +++ b/src/main/resources/data/baseelectric/recipes/crushing_lithium_ingot.json @@ -4,7 +4,7 @@ "tag": "forge:ingots/lithium" }, "result": { - "item": "electricadvantage:li_powder", + "item": "baseelectric:li_powder", "count": 1 }, "conditions": [ @@ -13,7 +13,7 @@ "modid": "basemetals" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/lithium" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/crushing_lithium_ore.json b/src/main/resources/data/baseelectric/recipes/crushing_lithium_ore.json similarity index 75% rename from src/main/resources/data/electricadvantage/recipes/crushing_lithium_ore.json rename to src/main/resources/data/baseelectric/recipes/crushing_lithium_ore.json index f12e324..de3bfc9 100644 --- a/src/main/resources/data/electricadvantage/recipes/crushing_lithium_ore.json +++ b/src/main/resources/data/baseelectric/recipes/crushing_lithium_ore.json @@ -4,7 +4,7 @@ "tag": "forge:ores/lithium" }, "result": { - "item": "electricadvantage:li_powder", + "item": "baseelectric:li_powder", "count": 2 }, "conditions": [ @@ -13,7 +13,7 @@ "modid": "basemetals" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ores/lithium" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/crushing_photovoltaic_generator.json b/src/main/resources/data/baseelectric/recipes/crushing_photovoltaic_generator.json similarity index 62% rename from src/main/resources/data/electricadvantage/recipes/crushing_photovoltaic_generator.json rename to src/main/resources/data/baseelectric/recipes/crushing_photovoltaic_generator.json index eb3f0c0..3fd4852 100644 --- a/src/main/resources/data/electricadvantage/recipes/crushing_photovoltaic_generator.json +++ b/src/main/resources/data/baseelectric/recipes/crushing_photovoltaic_generator.json @@ -1,10 +1,10 @@ { "type": "basemetals:crushing", "ingredient": { - "item": "electricadvantage:photovoltaic_generator" + "item": "baseelectric:photovoltaic_generator" }, "result": { - "item": "electricadvantage:psu", + "item": "baseelectric:psu", "count": 1 }, "conditions": [ @@ -13,7 +13,7 @@ "modid": "basemetals" }, { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "APOCALYPTIC" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/crushing_psu.json b/src/main/resources/data/baseelectric/recipes/crushing_psu.json similarity index 63% rename from src/main/resources/data/electricadvantage/recipes/crushing_psu.json rename to src/main/resources/data/baseelectric/recipes/crushing_psu.json index af2d99b..289c1ed 100644 --- a/src/main/resources/data/electricadvantage/recipes/crushing_psu.json +++ b/src/main/resources/data/baseelectric/recipes/crushing_psu.json @@ -1,10 +1,10 @@ { "type": "basemetals:crushing", "ingredient": { - "item": "electricadvantage:psu" + "item": "baseelectric:psu" }, "result": { - "item": "electricadvantage:control_circuit", + "item": "baseelectric:control_circuit", "count": 1 }, "conditions": [ @@ -13,7 +13,7 @@ "modid": "basemetals" }, { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "APOCALYPTIC" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/crushing_steam_powered_generator.json b/src/main/resources/data/baseelectric/recipes/crushing_steam_powered_generator.json similarity index 62% rename from src/main/resources/data/electricadvantage/recipes/crushing_steam_powered_generator.json rename to src/main/resources/data/baseelectric/recipes/crushing_steam_powered_generator.json index 8d18ed4..9f6db76 100644 --- a/src/main/resources/data/electricadvantage/recipes/crushing_steam_powered_generator.json +++ b/src/main/resources/data/baseelectric/recipes/crushing_steam_powered_generator.json @@ -1,10 +1,10 @@ { "type": "basemetals:crushing", "ingredient": { - "item": "electricadvantage:steam_powered_generator" + "item": "baseelectric:steam_powered_generator" }, "result": { - "item": "electricadvantage:psu", + "item": "baseelectric:psu", "count": 1 }, "conditions": [ @@ -13,7 +13,7 @@ "modid": "basemetals" }, { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "APOCALYPTIC" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/crushing_sulfur_ore.json b/src/main/resources/data/baseelectric/recipes/crushing_sulfur_ore.json similarity index 74% rename from src/main/resources/data/electricadvantage/recipes/crushing_sulfur_ore.json rename to src/main/resources/data/baseelectric/recipes/crushing_sulfur_ore.json index 23ee408..6828fdb 100644 --- a/src/main/resources/data/electricadvantage/recipes/crushing_sulfur_ore.json +++ b/src/main/resources/data/baseelectric/recipes/crushing_sulfur_ore.json @@ -4,7 +4,7 @@ "tag": "forge:ores/sulfur" }, "result": { - "item": "electricadvantage:sulfur_powder", + "item": "baseelectric:sulfur_powder", "count": 4 }, "conditions": [ @@ -13,7 +13,7 @@ "modid": "basemetals" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ores/sulfur" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/electric_battery_array.json b/src/main/resources/data/baseelectric/recipes/electric_battery_array.json similarity index 66% rename from src/main/resources/data/electricadvantage/recipes/electric_battery_array.json rename to src/main/resources/data/baseelectric/recipes/electric_battery_array.json index d95f596..c7f5733 100644 --- a/src/main/resources/data/electricadvantage/recipes/electric_battery_array.json +++ b/src/main/resources/data/baseelectric/recipes/electric_battery_array.json @@ -19,20 +19,20 @@ } }, "result": { - "item": "electricadvantage:electric_battery_array" + "item": "baseelectric:electric_battery_array" }, - "group": "electricadvantage:electric_battery_array", + "group": "baseelectric:electric_battery_array", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:power_supply_units" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/electric_conduit_plastic_ingot.json b/src/main/resources/data/baseelectric/recipes/electric_conduit_plastic_ingot.json similarity index 65% rename from src/main/resources/data/electricadvantage/recipes/electric_conduit_plastic_ingot.json rename to src/main/resources/data/baseelectric/recipes/electric_conduit_plastic_ingot.json index af2b75d..d45b00b 100644 --- a/src/main/resources/data/electricadvantage/recipes/electric_conduit_plastic_ingot.json +++ b/src/main/resources/data/baseelectric/recipes/electric_conduit_plastic_ingot.json @@ -14,17 +14,17 @@ } }, "result": { - "item": "electricadvantage:electric_conduit", + "item": "baseelectric:electric_conduit", "count": 6 }, - "group": "electricadvantage:electric_conduit", + "group": "baseelectric:electric_conduit", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/copper" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plastic" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/electric_conduit_plastic_rod.json b/src/main/resources/data/baseelectric/recipes/electric_conduit_plastic_rod.json similarity index 62% rename from src/main/resources/data/electricadvantage/recipes/electric_conduit_plastic_rod.json rename to src/main/resources/data/baseelectric/recipes/electric_conduit_plastic_rod.json index c8a341f..45953bf 100644 --- a/src/main/resources/data/electricadvantage/recipes/electric_conduit_plastic_rod.json +++ b/src/main/resources/data/baseelectric/recipes/electric_conduit_plastic_rod.json @@ -13,16 +13,16 @@ } }, "result": { - "item": "electricadvantage:electric_conduit" + "item": "baseelectric:electric_conduit" }, - "group": "electricadvantage:electric_conduit", + "group": "baseelectric:electric_conduit", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plastic" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:rods/copper" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/electric_conduit_rubber_ingot.json b/src/main/resources/data/baseelectric/recipes/electric_conduit_rubber_ingot.json similarity index 64% rename from src/main/resources/data/electricadvantage/recipes/electric_conduit_rubber_ingot.json rename to src/main/resources/data/baseelectric/recipes/electric_conduit_rubber_ingot.json index fdb23cd..c8d6d8a 100644 --- a/src/main/resources/data/electricadvantage/recipes/electric_conduit_rubber_ingot.json +++ b/src/main/resources/data/baseelectric/recipes/electric_conduit_rubber_ingot.json @@ -14,17 +14,17 @@ } }, "result": { - "item": "electricadvantage:electric_conduit", + "item": "baseelectric:electric_conduit", "count": 6 }, - "group": "electricadvantage:electric_conduit", + "group": "baseelectric:electric_conduit", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/copper" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:rubber" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/electric_conduit_rubber_rod.json b/src/main/resources/data/baseelectric/recipes/electric_conduit_rubber_rod.json similarity index 62% rename from src/main/resources/data/electricadvantage/recipes/electric_conduit_rubber_rod.json rename to src/main/resources/data/baseelectric/recipes/electric_conduit_rubber_rod.json index c6eab54..a516ae6 100644 --- a/src/main/resources/data/electricadvantage/recipes/electric_conduit_rubber_rod.json +++ b/src/main/resources/data/baseelectric/recipes/electric_conduit_rubber_rod.json @@ -13,16 +13,16 @@ } }, "result": { - "item": "electricadvantage:electric_conduit" + "item": "baseelectric:electric_conduit" }, - "group": "electricadvantage:electric_conduit", + "group": "baseelectric:electric_conduit", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:rods/copper" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:rubber" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/electric_crusher.json b/src/main/resources/data/baseelectric/recipes/electric_crusher.json similarity index 66% rename from src/main/resources/data/electricadvantage/recipes/electric_crusher.json rename to src/main/resources/data/baseelectric/recipes/electric_crusher.json index 6f78f68..66c42e2 100644 --- a/src/main/resources/data/electricadvantage/recipes/electric_crusher.json +++ b/src/main/resources/data/baseelectric/recipes/electric_crusher.json @@ -22,28 +22,28 @@ } }, "result": { - "item": "electricadvantage:electric_crusher" + "item": "baseelectric:electric_crusher" }, - "group": "electricadvantage:electric_crusher", + "group": "baseelectric:electric_crusher", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:gems/diamond" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:power_supply_units" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:sprockets" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/electric_drill.json b/src/main/resources/data/baseelectric/recipes/electric_drill.json similarity index 67% rename from src/main/resources/data/electricadvantage/recipes/electric_drill.json rename to src/main/resources/data/baseelectric/recipes/electric_drill.json index 0d5b52e..1a74a51 100644 --- a/src/main/resources/data/electricadvantage/recipes/electric_drill.json +++ b/src/main/resources/data/baseelectric/recipes/electric_drill.json @@ -19,24 +19,24 @@ } }, "result": { - "item": "electricadvantage:electric_drill" + "item": "baseelectric:electric_drill" }, - "group": "electricadvantage:electric_drill", + "group": "baseelectric:electric_drill", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:power_supply_units" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:storage_blocks/diamond" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/electric_fabricator.json b/src/main/resources/data/baseelectric/recipes/electric_fabricator.json similarity index 67% rename from src/main/resources/data/electricadvantage/recipes/electric_fabricator.json rename to src/main/resources/data/baseelectric/recipes/electric_fabricator.json index 896b387..081ff9d 100644 --- a/src/main/resources/data/electricadvantage/recipes/electric_fabricator.json +++ b/src/main/resources/data/baseelectric/recipes/electric_fabricator.json @@ -19,20 +19,20 @@ } }, "result": { - "item": "electricadvantage:electric_fabricator" + "item": "baseelectric:electric_fabricator" }, - "group": "electricadvantage:electric_fabricator", + "group": "baseelectric:electric_fabricator", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:power_supply_units" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/electric_furnace.json b/src/main/resources/data/baseelectric/recipes/electric_furnace.json similarity index 68% rename from src/main/resources/data/electricadvantage/recipes/electric_furnace.json rename to src/main/resources/data/baseelectric/recipes/electric_furnace.json index f78493a..2ddcecd 100644 --- a/src/main/resources/data/electricadvantage/recipes/electric_furnace.json +++ b/src/main/resources/data/baseelectric/recipes/electric_furnace.json @@ -14,12 +14,12 @@ } }, "result": { - "item": "electricadvantage:electric_furnace" + "item": "baseelectric:electric_furnace" }, - "group": "electricadvantage:electric_furnace", + "group": "baseelectric:electric_furnace", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:power_supply_units" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/electric_oven.json b/src/main/resources/data/baseelectric/recipes/electric_oven.json similarity index 68% rename from src/main/resources/data/electricadvantage/recipes/electric_oven.json rename to src/main/resources/data/baseelectric/recipes/electric_oven.json index cef55cd..6d06a39 100644 --- a/src/main/resources/data/electricadvantage/recipes/electric_oven.json +++ b/src/main/resources/data/baseelectric/recipes/electric_oven.json @@ -22,24 +22,24 @@ } }, "result": { - "item": "electricadvantage:electric_oven" + "item": "baseelectric:electric_oven" }, - "group": "electricadvantage:electric_oven", + "group": "baseelectric:electric_oven", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:glass_panes" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:power_supply_units" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/electric_pump.json b/src/main/resources/data/baseelectric/recipes/electric_pump.json similarity index 70% rename from src/main/resources/data/electricadvantage/recipes/electric_pump.json rename to src/main/resources/data/baseelectric/recipes/electric_pump.json index b2d1750..a135d42 100644 --- a/src/main/resources/data/electricadvantage/recipes/electric_pump.json +++ b/src/main/resources/data/baseelectric/recipes/electric_pump.json @@ -22,20 +22,20 @@ } }, "result": { - "item": "electricadvantage:electric_pump" + "item": "baseelectric:electric_pump" }, - "group": "electricadvantage:electric_pump", + "group": "baseelectric:electric_pump", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:power_supply_units" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/electric_still.json b/src/main/resources/data/baseelectric/recipes/electric_still.json similarity index 70% rename from src/main/resources/data/electricadvantage/recipes/electric_still.json rename to src/main/resources/data/baseelectric/recipes/electric_still.json index 09ee3c3..85b8c32 100644 --- a/src/main/resources/data/electricadvantage/recipes/electric_still.json +++ b/src/main/resources/data/baseelectric/recipes/electric_still.json @@ -22,20 +22,20 @@ } }, "result": { - "item": "electricadvantage:electric_still" + "item": "baseelectric:electric_still" }, - "group": "electricadvantage:electric_still", + "group": "baseelectric:electric_still", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:power_supply_units" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/electric_switch.json b/src/main/resources/data/baseelectric/recipes/electric_switch.json similarity index 66% rename from src/main/resources/data/electricadvantage/recipes/electric_switch.json rename to src/main/resources/data/baseelectric/recipes/electric_switch.json index 698048a..85a97fe 100644 --- a/src/main/resources/data/electricadvantage/recipes/electric_switch.json +++ b/src/main/resources/data/baseelectric/recipes/electric_switch.json @@ -16,16 +16,16 @@ } }, "result": { - "item": "electricadvantage:electric_switch" + "item": "baseelectric:electric_switch" }, - "group": "electricadvantage:electric_switch", + "group": "baseelectric:electric_switch", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:wires" } ] diff --git a/src/main/resources/data/baseelectric/recipes/electric_track.json b/src/main/resources/data/baseelectric/recipes/electric_track.json new file mode 100644 index 0000000..1a42bfb --- /dev/null +++ b/src/main/resources/data/baseelectric/recipes/electric_track.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "baseelectric:electric_conduit" + }, + { + "item": "basepower:steel_frame" + } + ], + "result": { + "item": "baseelectric:electric_track" + }, + "group": "baseelectric:electric_track" +} diff --git a/src/main/resources/data/electricadvantage/recipes/growth_chamber.json b/src/main/resources/data/baseelectric/recipes/growth_chamber.json similarity index 68% rename from src/main/resources/data/electricadvantage/recipes/growth_chamber.json rename to src/main/resources/data/baseelectric/recipes/growth_chamber.json index 1171b69..1fdac8c 100644 --- a/src/main/resources/data/electricadvantage/recipes/growth_chamber.json +++ b/src/main/resources/data/baseelectric/recipes/growth_chamber.json @@ -22,24 +22,24 @@ } }, "result": { - "item": "electricadvantage:growth_chamber" + "item": "baseelectric:growth_chamber" }, - "group": "electricadvantage:growth_chamber", + "group": "baseelectric:growth_chamber", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:microchips" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:power_supply_units" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/growth_chamber_controller.json b/src/main/resources/data/baseelectric/recipes/growth_chamber_controller.json similarity index 66% rename from src/main/resources/data/electricadvantage/recipes/growth_chamber_controller.json rename to src/main/resources/data/baseelectric/recipes/growth_chamber_controller.json index e38dcdd..ea97d35 100644 --- a/src/main/resources/data/electricadvantage/recipes/growth_chamber_controller.json +++ b/src/main/resources/data/baseelectric/recipes/growth_chamber_controller.json @@ -22,24 +22,24 @@ } }, "result": { - "item": "electricadvantage:growth_chamber_controller" + "item": "baseelectric:growth_chamber_controller" }, - "group": "electricadvantage:growth_chamber_controller", + "group": "baseelectric:growth_chamber_controller", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:circuit_boards" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:power_supply_units" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/hydroelectric_generator.json b/src/main/resources/data/baseelectric/recipes/hydroelectric_generator.json similarity index 66% rename from src/main/resources/data/electricadvantage/recipes/hydroelectric_generator.json rename to src/main/resources/data/baseelectric/recipes/hydroelectric_generator.json index 992b730..ab2e969 100644 --- a/src/main/resources/data/electricadvantage/recipes/hydroelectric_generator.json +++ b/src/main/resources/data/baseelectric/recipes/hydroelectric_generator.json @@ -22,24 +22,24 @@ } }, "result": { - "item": "electricadvantage:hydroelectric_generator" + "item": "baseelectric:hydroelectric_generator" }, - "group": "electricadvantage:hydroelectric_generator", + "group": "baseelectric:hydroelectric_generator", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:power_supply_units" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:sprockets" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/integrated_circuit_copper_normal.json b/src/main/resources/data/baseelectric/recipes/integrated_circuit_copper_normal.json similarity index 62% rename from src/main/resources/data/electricadvantage/recipes/integrated_circuit_copper_normal.json rename to src/main/resources/data/baseelectric/recipes/integrated_circuit_copper_normal.json index 793b6a7..cd1a4d9 100644 --- a/src/main/resources/data/electricadvantage/recipes/integrated_circuit_copper_normal.json +++ b/src/main/resources/data/baseelectric/recipes/integrated_circuit_copper_normal.json @@ -13,22 +13,22 @@ } }, "result": { - "item": "electricadvantage:integrated_circuit", + "item": "baseelectric:integrated_circuit", "count": 3 }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "NORMAL" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/silicon" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:nuggets/copper" } ], - "group": "electricadvantage:integrated_circuit" + "group": "baseelectric:integrated_circuit" } diff --git a/src/main/resources/data/electricadvantage/recipes/integrated_circuit_copper_tech.json b/src/main/resources/data/baseelectric/recipes/integrated_circuit_copper_tech.json similarity index 64% rename from src/main/resources/data/electricadvantage/recipes/integrated_circuit_copper_tech.json rename to src/main/resources/data/baseelectric/recipes/integrated_circuit_copper_tech.json index 3404793..228c158 100644 --- a/src/main/resources/data/electricadvantage/recipes/integrated_circuit_copper_tech.json +++ b/src/main/resources/data/baseelectric/recipes/integrated_circuit_copper_tech.json @@ -20,30 +20,30 @@ } }, "result": { - "item": "electricadvantage:integrated_circuit", + "item": "baseelectric:integrated_circuit", "count": 3 }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "TECH_PROGRESSION" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:dusts/redstone" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/silicon" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:nuggets/copper" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plastic" } ], - "group": "electricadvantage:integrated_circuit" + "group": "baseelectric:integrated_circuit" } diff --git a/src/main/resources/data/electricadvantage/recipes/integrated_circuit_gold_normal.json b/src/main/resources/data/baseelectric/recipes/integrated_circuit_gold_normal.json similarity index 61% rename from src/main/resources/data/electricadvantage/recipes/integrated_circuit_gold_normal.json rename to src/main/resources/data/baseelectric/recipes/integrated_circuit_gold_normal.json index 9b1d5b0..f933686 100644 --- a/src/main/resources/data/electricadvantage/recipes/integrated_circuit_gold_normal.json +++ b/src/main/resources/data/baseelectric/recipes/integrated_circuit_gold_normal.json @@ -13,22 +13,22 @@ } }, "result": { - "item": "electricadvantage:integrated_circuit", + "item": "baseelectric:integrated_circuit", "count": 3 }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "NORMAL" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/silicon" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:nuggets/gold" } ], - "group": "electricadvantage:integrated_circuit" + "group": "baseelectric:integrated_circuit" } diff --git a/src/main/resources/data/electricadvantage/recipes/integrated_circuit_gold_tech.json b/src/main/resources/data/baseelectric/recipes/integrated_circuit_gold_tech.json similarity index 64% rename from src/main/resources/data/electricadvantage/recipes/integrated_circuit_gold_tech.json rename to src/main/resources/data/baseelectric/recipes/integrated_circuit_gold_tech.json index 355a44b..4918b2d 100644 --- a/src/main/resources/data/electricadvantage/recipes/integrated_circuit_gold_tech.json +++ b/src/main/resources/data/baseelectric/recipes/integrated_circuit_gold_tech.json @@ -20,30 +20,30 @@ } }, "result": { - "item": "electricadvantage:integrated_circuit", + "item": "baseelectric:integrated_circuit", "count": 3 }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "TECH_PROGRESSION" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:dusts/redstone" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/silicon" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:nuggets/gold" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plastic" } ], - "group": "electricadvantage:integrated_circuit" + "group": "baseelectric:integrated_circuit" } diff --git a/src/main/resources/data/electricadvantage/recipes/integrated_circuit_tin_normal.json b/src/main/resources/data/baseelectric/recipes/integrated_circuit_tin_normal.json similarity index 61% rename from src/main/resources/data/electricadvantage/recipes/integrated_circuit_tin_normal.json rename to src/main/resources/data/baseelectric/recipes/integrated_circuit_tin_normal.json index a3d0c3d..b278159 100644 --- a/src/main/resources/data/electricadvantage/recipes/integrated_circuit_tin_normal.json +++ b/src/main/resources/data/baseelectric/recipes/integrated_circuit_tin_normal.json @@ -13,22 +13,22 @@ } }, "result": { - "item": "electricadvantage:integrated_circuit", + "item": "baseelectric:integrated_circuit", "count": 3 }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "NORMAL" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/silicon" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:nuggets/tin" } ], - "group": "electricadvantage:integrated_circuit" + "group": "baseelectric:integrated_circuit" } diff --git a/src/main/resources/data/electricadvantage/recipes/integrated_circuit_tin_tech.json b/src/main/resources/data/baseelectric/recipes/integrated_circuit_tin_tech.json similarity index 64% rename from src/main/resources/data/electricadvantage/recipes/integrated_circuit_tin_tech.json rename to src/main/resources/data/baseelectric/recipes/integrated_circuit_tin_tech.json index a33d39e..62da83a 100644 --- a/src/main/resources/data/electricadvantage/recipes/integrated_circuit_tin_tech.json +++ b/src/main/resources/data/baseelectric/recipes/integrated_circuit_tin_tech.json @@ -20,30 +20,30 @@ } }, "result": { - "item": "electricadvantage:integrated_circuit", + "item": "baseelectric:integrated_circuit", "count": 3 }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "TECH_PROGRESSION" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:dusts/redstone" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/silicon" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:nuggets/tin" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plastic" } ], - "group": "electricadvantage:integrated_circuit" + "group": "baseelectric:integrated_circuit" } diff --git a/src/main/resources/data/electricadvantage/recipes/laser_turret_diamond_emerald.json b/src/main/resources/data/baseelectric/recipes/laser_turret_diamond_emerald.json similarity index 66% rename from src/main/resources/data/electricadvantage/recipes/laser_turret_diamond_emerald.json rename to src/main/resources/data/baseelectric/recipes/laser_turret_diamond_emerald.json index 73f7d30..c577c55 100644 --- a/src/main/resources/data/electricadvantage/recipes/laser_turret_diamond_emerald.json +++ b/src/main/resources/data/baseelectric/recipes/laser_turret_diamond_emerald.json @@ -22,28 +22,28 @@ } }, "result": { - "item": "electricadvantage:laser_turret" + "item": "baseelectric:laser_turret" }, - "group": "electricadvantage:laser_turret", + "group": "baseelectric:laser_turret", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:gems/diamond" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:gems/emerald" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:power_supply_units" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/laser_turret_emerald_diamond.json b/src/main/resources/data/baseelectric/recipes/laser_turret_emerald_diamond.json similarity index 66% rename from src/main/resources/data/electricadvantage/recipes/laser_turret_emerald_diamond.json rename to src/main/resources/data/baseelectric/recipes/laser_turret_emerald_diamond.json index 167f6b3..2a4da72 100644 --- a/src/main/resources/data/electricadvantage/recipes/laser_turret_emerald_diamond.json +++ b/src/main/resources/data/baseelectric/recipes/laser_turret_emerald_diamond.json @@ -22,28 +22,28 @@ } }, "result": { - "item": "electricadvantage:laser_turret" + "item": "baseelectric:laser_turret" }, - "group": "electricadvantage:laser_turret", + "group": "baseelectric:laser_turret", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:gems/diamond" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:gems/emerald" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:power_supply_units" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/lead_acid_battery_dust_sulfur.json b/src/main/resources/data/baseelectric/recipes/lead_acid_battery_dust_sulfur.json similarity index 67% rename from src/main/resources/data/electricadvantage/recipes/lead_acid_battery_dust_sulfur.json rename to src/main/resources/data/baseelectric/recipes/lead_acid_battery_dust_sulfur.json index a9b6e05..c1afd53 100644 --- a/src/main/resources/data/electricadvantage/recipes/lead_acid_battery_dust_sulfur.json +++ b/src/main/resources/data/baseelectric/recipes/lead_acid_battery_dust_sulfur.json @@ -20,20 +20,20 @@ } }, "result": { - "item": "electricadvantage:lead_acid_battery" + "item": "baseelectric:lead_acid_battery" }, - "group": "electricadvantage:lead_acid_battery", + "group": "baseelectric:lead_acid_battery", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:dusts/sulfur" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/lead" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plastic" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/lead_acid_battery_sulfur.json b/src/main/resources/data/baseelectric/recipes/lead_acid_battery_sulfur.json similarity index 66% rename from src/main/resources/data/electricadvantage/recipes/lead_acid_battery_sulfur.json rename to src/main/resources/data/baseelectric/recipes/lead_acid_battery_sulfur.json index 830be4d..2924596 100644 --- a/src/main/resources/data/electricadvantage/recipes/lead_acid_battery_sulfur.json +++ b/src/main/resources/data/baseelectric/recipes/lead_acid_battery_sulfur.json @@ -20,20 +20,20 @@ } }, "result": { - "item": "electricadvantage:lead_acid_battery" + "item": "baseelectric:lead_acid_battery" }, - "group": "electricadvantage:lead_acid_battery", + "group": "baseelectric:lead_acid_battery", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/lead" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plastic" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:sulfur" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/led_bar.json b/src/main/resources/data/baseelectric/recipes/led_bar.json similarity index 66% rename from src/main/resources/data/electricadvantage/recipes/led_bar.json rename to src/main/resources/data/baseelectric/recipes/led_bar.json index 62940d6..1f38a0d 100644 --- a/src/main/resources/data/electricadvantage/recipes/led_bar.json +++ b/src/main/resources/data/baseelectric/recipes/led_bar.json @@ -17,21 +17,21 @@ } }, "result": { - "item": "electricadvantage:led_bar", + "item": "baseelectric:led_bar", "count": 3 }, - "group": "electricadvantage:led_bar", + "group": "baseelectric:led_bar", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:glass_panes" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:microchips" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:wires" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/lithium_battery.json b/src/main/resources/data/baseelectric/recipes/lithium_battery.json similarity index 66% rename from src/main/resources/data/electricadvantage/recipes/lithium_battery.json rename to src/main/resources/data/baseelectric/recipes/lithium_battery.json index f6fc936..105bb57 100644 --- a/src/main/resources/data/electricadvantage/recipes/lithium_battery.json +++ b/src/main/resources/data/baseelectric/recipes/lithium_battery.json @@ -20,24 +20,24 @@ } }, "result": { - "item": "electricadvantage:lithium_battery" + "item": "baseelectric:lithium_battery" }, - "group": "electricadvantage:lithium_battery", + "group": "baseelectric:lithium_battery", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:dusts/carbon" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:dusts/redstone" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/lithium" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plastic" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/lithium_ingot_from_nuggets.json b/src/main/resources/data/baseelectric/recipes/lithium_ingot_from_nuggets.json similarity index 66% rename from src/main/resources/data/electricadvantage/recipes/lithium_ingot_from_nuggets.json rename to src/main/resources/data/baseelectric/recipes/lithium_ingot_from_nuggets.json index 1c63c54..4463c7e 100644 --- a/src/main/resources/data/electricadvantage/recipes/lithium_ingot_from_nuggets.json +++ b/src/main/resources/data/baseelectric/recipes/lithium_ingot_from_nuggets.json @@ -11,13 +11,13 @@ } }, "result": { - "item": "electricadvantage:li_ingot" + "item": "baseelectric:li_ingot" }, "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:nuggets/lithium" } ], - "group": "electricadvantage:li_ingot" + "group": "baseelectric:li_ingot" } diff --git a/src/main/resources/data/electricadvantage/recipes/lithium_ingot_from_ore.json b/src/main/resources/data/baseelectric/recipes/lithium_ingot_from_ore.json similarity index 50% rename from src/main/resources/data/electricadvantage/recipes/lithium_ingot_from_ore.json rename to src/main/resources/data/baseelectric/recipes/lithium_ingot_from_ore.json index 6875bf2..e90ef36 100644 --- a/src/main/resources/data/electricadvantage/recipes/lithium_ingot_from_ore.json +++ b/src/main/resources/data/baseelectric/recipes/lithium_ingot_from_ore.json @@ -1,11 +1,11 @@ { "type": "minecraft:smelting", "ingredient": { - "item": "electricadvantage:li_ore" + "item": "baseelectric:li_ore" }, - "result": "electricadvantage:li_ingot", + "result": "baseelectric:li_ingot", "experience": 0.5, "cookingtime": 200, "conditions": [], - "group": "electricadvantage:li_ingot" + "group": "baseelectric:li_ingot" } diff --git a/src/main/resources/data/baseelectric/recipes/lithium_ingot_from_powder.json b/src/main/resources/data/baseelectric/recipes/lithium_ingot_from_powder.json new file mode 100644 index 0000000..c5547c7 --- /dev/null +++ b/src/main/resources/data/baseelectric/recipes/lithium_ingot_from_powder.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "baseelectric:li_powder" + }, + "result": "baseelectric:li_ingot", + "experience": 0.5, + "cookingtime": 200, + "conditions": [], + "group": "baseelectric:li_ingot" +} diff --git a/src/main/resources/data/electricadvantage/recipes/lithium_nuggets.json b/src/main/resources/data/baseelectric/recipes/lithium_nuggets.json similarity index 62% rename from src/main/resources/data/electricadvantage/recipes/lithium_nuggets.json rename to src/main/resources/data/baseelectric/recipes/lithium_nuggets.json index cb8b1ff..67522fd 100644 --- a/src/main/resources/data/electricadvantage/recipes/lithium_nuggets.json +++ b/src/main/resources/data/baseelectric/recipes/lithium_nuggets.json @@ -6,13 +6,13 @@ } ], "result": { - "item": "electricadvantage:li_nugget", + "item": "baseelectric:li_nugget", "count": 9 }, - "group": "electricadvantage:li_nugget", + "group": "baseelectric:li_nugget", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/lithium" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/nickel_hydride_battery.json b/src/main/resources/data/baseelectric/recipes/nickel_hydride_battery.json similarity index 66% rename from src/main/resources/data/electricadvantage/recipes/nickel_hydride_battery.json rename to src/main/resources/data/baseelectric/recipes/nickel_hydride_battery.json index 16a7abd..3808db2 100644 --- a/src/main/resources/data/electricadvantage/recipes/nickel_hydride_battery.json +++ b/src/main/resources/data/baseelectric/recipes/nickel_hydride_battery.json @@ -20,20 +20,20 @@ } }, "result": { - "item": "electricadvantage:nickel_hydride_battery" + "item": "baseelectric:nickel_hydride_battery" }, - "group": "electricadvantage:nickel_hydride_battery", + "group": "baseelectric:nickel_hydride_battery", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:dusts/redstone" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/nickel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plastic" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/photovoltaic_generator.json b/src/main/resources/data/baseelectric/recipes/photovoltaic_generator.json similarity index 63% rename from src/main/resources/data/electricadvantage/recipes/photovoltaic_generator.json rename to src/main/resources/data/baseelectric/recipes/photovoltaic_generator.json index 4d30454..85a5f16 100644 --- a/src/main/resources/data/electricadvantage/recipes/photovoltaic_generator.json +++ b/src/main/resources/data/baseelectric/recipes/photovoltaic_generator.json @@ -20,29 +20,29 @@ } }, "result": { - "item": "electricadvantage:photovoltaic_generator" + "item": "baseelectric:photovoltaic_generator" }, "conditions": [ { - "type": "electricadvantage:not_recipe_mode", + "type": "baseelectric:not_recipe_mode", "mode": "APOCALYPTIC" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:glass_panes" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/silicon" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:power_supply_units" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:wires" } ], - "group": "electricadvantage:photovoltaic_generator" + "group": "baseelectric:photovoltaic_generator" } diff --git a/src/main/resources/data/electricadvantage/recipes/plastic_refinery.json b/src/main/resources/data/baseelectric/recipes/plastic_refinery.json similarity index 67% rename from src/main/resources/data/electricadvantage/recipes/plastic_refinery.json rename to src/main/resources/data/baseelectric/recipes/plastic_refinery.json index d6dc1e6..31867b7 100644 --- a/src/main/resources/data/electricadvantage/recipes/plastic_refinery.json +++ b/src/main/resources/data/baseelectric/recipes/plastic_refinery.json @@ -22,24 +22,24 @@ } }, "result": { - "item": "electricadvantage:plastic_refinery" + "item": "baseelectric:plastic_refinery" }, - "group": "electricadvantage:plastic_refinery", + "group": "baseelectric:plastic_refinery", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:power_supply_units" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:sprockets" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/power_supply_unit_iron_normal.json b/src/main/resources/data/baseelectric/recipes/power_supply_unit_iron_normal.json similarity index 64% rename from src/main/resources/data/electricadvantage/recipes/power_supply_unit_iron_normal.json rename to src/main/resources/data/baseelectric/recipes/power_supply_unit_iron_normal.json index 5ee3c2e..5d0c8bf 100644 --- a/src/main/resources/data/electricadvantage/recipes/power_supply_unit_iron_normal.json +++ b/src/main/resources/data/baseelectric/recipes/power_supply_unit_iron_normal.json @@ -16,25 +16,25 @@ } }, "result": { - "item": "electricadvantage:psu" + "item": "baseelectric:psu" }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "NORMAL" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:circuit_boards" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/iron" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:wires" } ], - "group": "electricadvantage:psu" + "group": "baseelectric:psu" } diff --git a/src/main/resources/data/electricadvantage/recipes/power_supply_unit_plate_steel_apocalyptic.json b/src/main/resources/data/baseelectric/recipes/power_supply_unit_plate_steel_apocalyptic.json similarity index 64% rename from src/main/resources/data/electricadvantage/recipes/power_supply_unit_plate_steel_apocalyptic.json rename to src/main/resources/data/baseelectric/recipes/power_supply_unit_plate_steel_apocalyptic.json index 43b04e9..ce3a783 100644 --- a/src/main/resources/data/electricadvantage/recipes/power_supply_unit_plate_steel_apocalyptic.json +++ b/src/main/resources/data/baseelectric/recipes/power_supply_unit_plate_steel_apocalyptic.json @@ -16,25 +16,25 @@ } }, "result": { - "item": "electricadvantage:psu" + "item": "baseelectric:psu" }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "APOCALYPTIC" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:circuit_boards" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:wires" } ], - "group": "electricadvantage:psu" + "group": "baseelectric:psu" } diff --git a/src/main/resources/data/electricadvantage/recipes/power_supply_unit_plate_steel_tech.json b/src/main/resources/data/baseelectric/recipes/power_supply_unit_plate_steel_tech.json similarity index 64% rename from src/main/resources/data/electricadvantage/recipes/power_supply_unit_plate_steel_tech.json rename to src/main/resources/data/baseelectric/recipes/power_supply_unit_plate_steel_tech.json index fabb5ac..a6e6a1c 100644 --- a/src/main/resources/data/electricadvantage/recipes/power_supply_unit_plate_steel_tech.json +++ b/src/main/resources/data/baseelectric/recipes/power_supply_unit_plate_steel_tech.json @@ -16,25 +16,25 @@ } }, "result": { - "item": "electricadvantage:psu" + "item": "baseelectric:psu" }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "TECH_PROGRESSION" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:circuit_boards" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:wires" } ], - "group": "electricadvantage:psu" + "group": "baseelectric:psu" } diff --git a/src/main/resources/data/electricadvantage/recipes/power_supply_unit_steel_normal.json b/src/main/resources/data/baseelectric/recipes/power_supply_unit_steel_normal.json similarity index 64% rename from src/main/resources/data/electricadvantage/recipes/power_supply_unit_steel_normal.json rename to src/main/resources/data/baseelectric/recipes/power_supply_unit_steel_normal.json index b7a49fd..b8901a5 100644 --- a/src/main/resources/data/electricadvantage/recipes/power_supply_unit_steel_normal.json +++ b/src/main/resources/data/baseelectric/recipes/power_supply_unit_steel_normal.json @@ -16,25 +16,25 @@ } }, "result": { - "item": "electricadvantage:psu" + "item": "baseelectric:psu" }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "NORMAL" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:circuit_boards" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:ingots/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:wires" } ], - "group": "electricadvantage:psu" + "group": "baseelectric:psu" } diff --git a/src/main/resources/data/electricadvantage/recipes/silicon_blend.json b/src/main/resources/data/baseelectric/recipes/silicon_blend.json similarity index 60% rename from src/main/resources/data/electricadvantage/recipes/silicon_blend.json rename to src/main/resources/data/baseelectric/recipes/silicon_blend.json index 2cf242e..820bd69 100644 --- a/src/main/resources/data/electricadvantage/recipes/silicon_blend.json +++ b/src/main/resources/data/baseelectric/recipes/silicon_blend.json @@ -9,16 +9,16 @@ } ], "result": { - "item": "electricadvantage:silicon_mix" + "item": "baseelectric:silicon_mix" }, - "group": "electricadvantage:silicon_mix", + "group": "baseelectric:silicon_mix", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:dusts/carbon" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:sand" } ] diff --git a/src/main/resources/data/baseelectric/recipes/silicon_ingot_from_blend.json b/src/main/resources/data/baseelectric/recipes/silicon_ingot_from_blend.json new file mode 100644 index 0000000..d843ab4 --- /dev/null +++ b/src/main/resources/data/baseelectric/recipes/silicon_ingot_from_blend.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "baseelectric:silicon_mix" + }, + "result": "baseelectric:silicon_ingot", + "experience": 0.5, + "cookingtime": 200, + "conditions": [], + "group": "baseelectric:silicon_ingot" +} diff --git a/src/main/resources/data/electricadvantage/recipes/solder_blend_tin_lead.json b/src/main/resources/data/baseelectric/recipes/solder_blend_tin_lead.json similarity index 65% rename from src/main/resources/data/electricadvantage/recipes/solder_blend_tin_lead.json rename to src/main/resources/data/baseelectric/recipes/solder_blend_tin_lead.json index 06ece9d..4c808f7 100644 --- a/src/main/resources/data/electricadvantage/recipes/solder_blend_tin_lead.json +++ b/src/main/resources/data/baseelectric/recipes/solder_blend_tin_lead.json @@ -12,17 +12,17 @@ } ], "result": { - "item": "electricadvantage:solder_mix", + "item": "baseelectric:solder_mix", "count": 3 }, - "group": "electricadvantage:solder_mix", + "group": "baseelectric:solder_mix", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:dusts/lead" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:dusts/tin" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/solder_blend_tin_silver.json b/src/main/resources/data/baseelectric/recipes/solder_blend_tin_silver.json similarity index 66% rename from src/main/resources/data/electricadvantage/recipes/solder_blend_tin_silver.json rename to src/main/resources/data/baseelectric/recipes/solder_blend_tin_silver.json index d82bd9c..c9813a0 100644 --- a/src/main/resources/data/electricadvantage/recipes/solder_blend_tin_silver.json +++ b/src/main/resources/data/baseelectric/recipes/solder_blend_tin_silver.json @@ -12,17 +12,17 @@ } ], "result": { - "item": "electricadvantage:solder_mix", + "item": "baseelectric:solder_mix", "count": 3 }, - "group": "electricadvantage:solder_mix", + "group": "baseelectric:solder_mix", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:dusts/silver" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:dusts/tin" } ] diff --git a/src/main/resources/data/electricadvantage/recipes/solder_from_blend.json b/src/main/resources/data/baseelectric/recipes/solder_from_blend.json similarity index 50% rename from src/main/resources/data/electricadvantage/recipes/solder_from_blend.json rename to src/main/resources/data/baseelectric/recipes/solder_from_blend.json index 2ed4010..640976f 100644 --- a/src/main/resources/data/electricadvantage/recipes/solder_from_blend.json +++ b/src/main/resources/data/baseelectric/recipes/solder_from_blend.json @@ -1,11 +1,11 @@ { "type": "minecraft:smelting", "ingredient": { - "item": "electricadvantage:solder_mix" + "item": "baseelectric:solder_mix" }, - "result": "electricadvantage:solder", + "result": "baseelectric:solder", "experience": 0.5, "cookingtime": 200, "conditions": [], - "group": "electricadvantage:solder" + "group": "baseelectric:solder" } diff --git a/src/main/resources/data/electricadvantage/recipes/steam_powered_generator.json b/src/main/resources/data/baseelectric/recipes/steam_powered_generator.json similarity index 65% rename from src/main/resources/data/electricadvantage/recipes/steam_powered_generator.json rename to src/main/resources/data/baseelectric/recipes/steam_powered_generator.json index 77050c1..95d1e72 100644 --- a/src/main/resources/data/electricadvantage/recipes/steam_powered_generator.json +++ b/src/main/resources/data/baseelectric/recipes/steam_powered_generator.json @@ -22,28 +22,28 @@ } }, "result": { - "item": "electricadvantage:steam_powered_generator" + "item": "baseelectric:steam_powered_generator" }, - "group": "electricadvantage:steam_powered_generator", + "group": "baseelectric:steam_powered_generator", "conditions": [ { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:conduits/steam" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:frames/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:governors" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:plates/steel" }, { - "type": "poweradvantage:tag_not_empty", + "type": "basepower:tag_not_empty", "tag": "forge:power_supply_units" } ] diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/electric_track.json b/src/main/resources/data/electricadvantage/advancements/recipes/electric_track.json deleted file mode 100644 index 0d1995d..0000000 --- a/src/main/resources/data/electricadvantage/advancements/recipes/electric_track.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_ingredient_1": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "electricadvantage:electric_conduit" - } - ] - } - }, - "has_ingredient_2": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "poweradvantage:steel_frame" - } - ] - } - }, - "has_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "electricadvantage:electric_track" - } - } - }, - "requirements": [ - [ - "has_ingredient_1", - "has_ingredient_2", - "has_recipe" - ] - ], - "rewards": { - "recipes": [ - "electricadvantage:electric_track" - ] - } -} diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/lithium_ingot_from_powder.json b/src/main/resources/data/electricadvantage/advancements/recipes/lithium_ingot_from_powder.json deleted file mode 100644 index 466343f..0000000 --- a/src/main/resources/data/electricadvantage/advancements/recipes/lithium_ingot_from_powder.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_ingredient_1": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "electricadvantage:li_powder" - } - ] - } - }, - "has_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "electricadvantage:lithium_ingot_from_powder" - } - } - }, - "requirements": [ - [ - "has_ingredient_1", - "has_recipe" - ] - ], - "rewards": { - "recipes": [ - "electricadvantage:lithium_ingot_from_powder" - ] - } -} diff --git a/src/main/resources/data/electricadvantage/advancements/recipes/silicon_ingot_from_blend.json b/src/main/resources/data/electricadvantage/advancements/recipes/silicon_ingot_from_blend.json deleted file mode 100644 index 5d49df2..0000000 --- a/src/main/resources/data/electricadvantage/advancements/recipes/silicon_ingot_from_blend.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_ingredient_1": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "item": "electricadvantage:silicon_mix" - } - ] - } - }, - "has_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "electricadvantage:silicon_ingot_from_blend" - } - } - }, - "requirements": [ - [ - "has_ingredient_1", - "has_recipe" - ] - ], - "rewards": { - "recipes": [ - "electricadvantage:silicon_ingot_from_blend" - ] - } -} diff --git a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_battery_array.json b/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_battery_array.json deleted file mode 100644 index 612335d..0000000 --- a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_battery_array.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "electricadvantage:electric_battery_array" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_switch.json b/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_switch.json deleted file mode 100644 index efe2f05..0000000 --- a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_switch.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "electricadvantage:electric_switch" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_track.json b/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_track.json deleted file mode 100644 index 328b54e..0000000 --- a/src/main/resources/data/electricadvantage/loot_tables/blocks/electric_track.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "electricadvantage:electric_track" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/src/main/resources/data/electricadvantage/loot_tables/blocks/growth_chamber.json b/src/main/resources/data/electricadvantage/loot_tables/blocks/growth_chamber.json deleted file mode 100644 index b9e4203..0000000 --- a/src/main/resources/data/electricadvantage/loot_tables/blocks/growth_chamber.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "electricadvantage:growth_chamber" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/src/main/resources/data/electricadvantage/loot_tables/blocks/growth_chamber_controller.json b/src/main/resources/data/electricadvantage/loot_tables/blocks/growth_chamber_controller.json deleted file mode 100644 index 72c25f2..0000000 --- a/src/main/resources/data/electricadvantage/loot_tables/blocks/growth_chamber_controller.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "electricadvantage:growth_chamber_controller" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/src/main/resources/data/electricadvantage/loot_tables/blocks/hydroelectric_generator.json b/src/main/resources/data/electricadvantage/loot_tables/blocks/hydroelectric_generator.json deleted file mode 100644 index 76ef045..0000000 --- a/src/main/resources/data/electricadvantage/loot_tables/blocks/hydroelectric_generator.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "electricadvantage:hydroelectric_generator" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/src/main/resources/data/electricadvantage/loot_tables/blocks/laser_turret_evil.json b/src/main/resources/data/electricadvantage/loot_tables/blocks/laser_turret_evil.json deleted file mode 100644 index 9d103f7..0000000 --- a/src/main/resources/data/electricadvantage/loot_tables/blocks/laser_turret_evil.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "electricadvantage:laser_turret_evil" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/src/main/resources/data/electricadvantage/loot_tables/blocks/photovoltaic_generator.json b/src/main/resources/data/electricadvantage/loot_tables/blocks/photovoltaic_generator.json deleted file mode 100644 index 25732f9..0000000 --- a/src/main/resources/data/electricadvantage/loot_tables/blocks/photovoltaic_generator.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "electricadvantage:photovoltaic_generator" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/src/main/resources/data/electricadvantage/loot_tables/blocks/plastic_refinery.json b/src/main/resources/data/electricadvantage/loot_tables/blocks/plastic_refinery.json deleted file mode 100644 index ed71f92..0000000 --- a/src/main/resources/data/electricadvantage/loot_tables/blocks/plastic_refinery.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "electricadvantage:plastic_refinery" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/src/main/resources/data/electricadvantage/loot_tables/blocks/steam_powered_generator.json b/src/main/resources/data/electricadvantage/loot_tables/blocks/steam_powered_generator.json deleted file mode 100644 index 4df7e1f..0000000 --- a/src/main/resources/data/electricadvantage/loot_tables/blocks/steam_powered_generator.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "electricadvantage:steam_powered_generator" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/src/main/resources/data/electricadvantage/recipes/crushing_control_circuit.json b/src/main/resources/data/electricadvantage/recipes/crushing_control_circuit.json deleted file mode 100644 index 76772ac..0000000 --- a/src/main/resources/data/electricadvantage/recipes/crushing_control_circuit.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "basemetals:crushing", - "ingredient": { - "item": "electricadvantage:control_circuit" - }, - "result": { - "item": "electricadvantage:integrated_circuit", - "count": 1 - }, - "conditions": [ - { - "type": "forge:mod_loaded", - "modid": "basemetals" - }, - { - "type": "electricadvantage:recipe_mode", - "mode": "APOCALYPTIC" - } - ] -} diff --git a/src/main/resources/data/electricadvantage/recipes/electric_track.json b/src/main/resources/data/electricadvantage/recipes/electric_track.json deleted file mode 100644 index 00a93d0..0000000 --- a/src/main/resources/data/electricadvantage/recipes/electric_track.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "electricadvantage:electric_conduit" - }, - { - "item": "poweradvantage:steel_frame" - } - ], - "result": { - "item": "electricadvantage:electric_track" - }, - "group": "electricadvantage:electric_track" -} diff --git a/src/main/resources/data/electricadvantage/recipes/lithium_ingot_from_powder.json b/src/main/resources/data/electricadvantage/recipes/lithium_ingot_from_powder.json deleted file mode 100644 index b6c13ea..0000000 --- a/src/main/resources/data/electricadvantage/recipes/lithium_ingot_from_powder.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "item": "electricadvantage:li_powder" - }, - "result": "electricadvantage:li_ingot", - "experience": 0.5, - "cookingtime": 200, - "conditions": [], - "group": "electricadvantage:li_ingot" -} diff --git a/src/main/resources/data/electricadvantage/recipes/silicon_ingot_from_blend.json b/src/main/resources/data/electricadvantage/recipes/silicon_ingot_from_blend.json deleted file mode 100644 index d0f1cf9..0000000 --- a/src/main/resources/data/electricadvantage/recipes/silicon_ingot_from_blend.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "item": "electricadvantage:silicon_mix" - }, - "result": "electricadvantage:silicon_ingot", - "experience": 0.5, - "cookingtime": 200, - "conditions": [], - "group": "electricadvantage:silicon_ingot" -} diff --git a/src/main/resources/data/forge/tags/blocks/ores/lithium.json b/src/main/resources/data/forge/tags/blocks/ores/lithium.json index 796eb3c..2d0340c 100644 --- a/src/main/resources/data/forge/tags/blocks/ores/lithium.json +++ b/src/main/resources/data/forge/tags/blocks/ores/lithium.json @@ -1,4 +1,4 @@ { "replace": false, - "values": ["electricadvantage:li_ore"] + "values": ["baseelectric:li_ore"] } diff --git a/src/main/resources/data/forge/tags/blocks/ores/sulfur.json b/src/main/resources/data/forge/tags/blocks/ores/sulfur.json index 8be591e..359b663 100644 --- a/src/main/resources/data/forge/tags/blocks/ores/sulfur.json +++ b/src/main/resources/data/forge/tags/blocks/ores/sulfur.json @@ -1,4 +1,4 @@ { "replace": false, - "values": ["electricadvantage:sulfur_ore"] + "values": ["baseelectric:sulfur_ore"] } diff --git a/src/main/resources/data/forge/tags/items/circuit_boards.json b/src/main/resources/data/forge/tags/items/circuit_boards.json index 6427b28..542fc8e 100644 --- a/src/main/resources/data/forge/tags/items/circuit_boards.json +++ b/src/main/resources/data/forge/tags/items/circuit_boards.json @@ -1,4 +1,4 @@ { "replace": false, - "values": ["electricadvantage:control_circuit"] + "values": ["baseelectric:control_circuit"] } diff --git a/src/main/resources/data/forge/tags/items/dusts/lithium.json b/src/main/resources/data/forge/tags/items/dusts/lithium.json index 0bb2c09..31aa6e2 100644 --- a/src/main/resources/data/forge/tags/items/dusts/lithium.json +++ b/src/main/resources/data/forge/tags/items/dusts/lithium.json @@ -1,4 +1,4 @@ { "replace": false, - "values": ["electricadvantage:li_powder"] + "values": ["baseelectric:li_powder"] } diff --git a/src/main/resources/data/forge/tags/items/dusts/sulfur.json b/src/main/resources/data/forge/tags/items/dusts/sulfur.json index 1f04541..1f9f8ae 100644 --- a/src/main/resources/data/forge/tags/items/dusts/sulfur.json +++ b/src/main/resources/data/forge/tags/items/dusts/sulfur.json @@ -1,4 +1,4 @@ { "replace": false, - "values": ["electricadvantage:sulfur_powder"] + "values": ["baseelectric:sulfur_powder"] } diff --git a/src/main/resources/data/forge/tags/items/ingots/lithium.json b/src/main/resources/data/forge/tags/items/ingots/lithium.json index dcf9ae1..2beb8c7 100644 --- a/src/main/resources/data/forge/tags/items/ingots/lithium.json +++ b/src/main/resources/data/forge/tags/items/ingots/lithium.json @@ -1,4 +1,4 @@ { "replace": false, - "values": ["electricadvantage:li_ingot"] + "values": ["baseelectric:li_ingot"] } diff --git a/src/main/resources/data/forge/tags/items/ingots/plastic.json b/src/main/resources/data/forge/tags/items/ingots/plastic.json index 037a076..02f4e68 100644 --- a/src/main/resources/data/forge/tags/items/ingots/plastic.json +++ b/src/main/resources/data/forge/tags/items/ingots/plastic.json @@ -1,4 +1,4 @@ { "replace": false, - "values": ["electricadvantage:petrolplastic_ingot"] + "values": ["baseelectric:petrolplastic_ingot"] } diff --git a/src/main/resources/data/forge/tags/items/ingots/silicon.json b/src/main/resources/data/forge/tags/items/ingots/silicon.json index b1e560b..24411ee 100644 --- a/src/main/resources/data/forge/tags/items/ingots/silicon.json +++ b/src/main/resources/data/forge/tags/items/ingots/silicon.json @@ -1,4 +1,4 @@ { "replace": false, - "values": ["electricadvantage:silicon_ingot"] + "values": ["baseelectric:silicon_ingot"] } diff --git a/src/main/resources/data/forge/tags/items/microchips.json b/src/main/resources/data/forge/tags/items/microchips.json index cd3cc2c..44a272c 100644 --- a/src/main/resources/data/forge/tags/items/microchips.json +++ b/src/main/resources/data/forge/tags/items/microchips.json @@ -1,4 +1,4 @@ { "replace": false, - "values": ["electricadvantage:integrated_circuit"] + "values": ["baseelectric:integrated_circuit"] } diff --git a/src/main/resources/data/forge/tags/items/nuggets/lithium.json b/src/main/resources/data/forge/tags/items/nuggets/lithium.json index 3044471..7d1c44d 100644 --- a/src/main/resources/data/forge/tags/items/nuggets/lithium.json +++ b/src/main/resources/data/forge/tags/items/nuggets/lithium.json @@ -1,4 +1,4 @@ { "replace": false, - "values": ["electricadvantage:li_nugget"] + "values": ["baseelectric:li_nugget"] } diff --git a/src/main/resources/data/forge/tags/items/ores/lithium.json b/src/main/resources/data/forge/tags/items/ores/lithium.json index 796eb3c..2d0340c 100644 --- a/src/main/resources/data/forge/tags/items/ores/lithium.json +++ b/src/main/resources/data/forge/tags/items/ores/lithium.json @@ -1,4 +1,4 @@ { "replace": false, - "values": ["electricadvantage:li_ore"] + "values": ["baseelectric:li_ore"] } diff --git a/src/main/resources/data/forge/tags/items/ores/sulfur.json b/src/main/resources/data/forge/tags/items/ores/sulfur.json index 8be591e..359b663 100644 --- a/src/main/resources/data/forge/tags/items/ores/sulfur.json +++ b/src/main/resources/data/forge/tags/items/ores/sulfur.json @@ -1,4 +1,4 @@ { "replace": false, - "values": ["electricadvantage:sulfur_ore"] + "values": ["baseelectric:sulfur_ore"] } diff --git a/src/main/resources/data/forge/tags/items/plastic.json b/src/main/resources/data/forge/tags/items/plastic.json index 037a076..02f4e68 100644 --- a/src/main/resources/data/forge/tags/items/plastic.json +++ b/src/main/resources/data/forge/tags/items/plastic.json @@ -1,4 +1,4 @@ { "replace": false, - "values": ["electricadvantage:petrolplastic_ingot"] + "values": ["baseelectric:petrolplastic_ingot"] } diff --git a/src/main/resources/data/forge/tags/items/power_supply_units.json b/src/main/resources/data/forge/tags/items/power_supply_units.json index 69b2004..6b2175d 100644 --- a/src/main/resources/data/forge/tags/items/power_supply_units.json +++ b/src/main/resources/data/forge/tags/items/power_supply_units.json @@ -1,4 +1,4 @@ { "replace": false, - "values": ["electricadvantage:psu"] + "values": ["baseelectric:psu"] } diff --git a/src/main/resources/data/forge/tags/items/solder.json b/src/main/resources/data/forge/tags/items/solder.json index 8abd047..c7e1e20 100644 --- a/src/main/resources/data/forge/tags/items/solder.json +++ b/src/main/resources/data/forge/tags/items/solder.json @@ -1,4 +1,4 @@ { "replace": false, - "values": ["electricadvantage:solder"] + "values": ["baseelectric:solder"] } diff --git a/src/main/resources/data/forge/tags/items/sulfur.json b/src/main/resources/data/forge/tags/items/sulfur.json index 1f04541..1f9f8ae 100644 --- a/src/main/resources/data/forge/tags/items/sulfur.json +++ b/src/main/resources/data/forge/tags/items/sulfur.json @@ -1,4 +1,4 @@ { "replace": false, - "values": ["electricadvantage:sulfur_powder"] + "values": ["baseelectric:sulfur_powder"] } diff --git a/src/main/resources/data/forge/tags/items/wires.json b/src/main/resources/data/forge/tags/items/wires.json index 1391f4f..8bd1a4b 100644 --- a/src/main/resources/data/forge/tags/items/wires.json +++ b/src/main/resources/data/forge/tags/items/wires.json @@ -1,4 +1,4 @@ { "replace": false, - "values": ["electricadvantage:electric_conduit"] + "values": ["baseelectric:electric_conduit"] } diff --git a/src/test/java/zone/moddev/mc/electricadvantage/blocks/NativeBlockContractTest.java b/src/test/java/zone/moddev/mc/baseelectric/blocks/NativeBlockContractTest.java similarity index 93% rename from src/test/java/zone/moddev/mc/electricadvantage/blocks/NativeBlockContractTest.java rename to src/test/java/zone/moddev/mc/baseelectric/blocks/NativeBlockContractTest.java index a5bb02d..5e12d82 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/blocks/NativeBlockContractTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/blocks/NativeBlockContractTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.blocks; +package zone.moddev.mc.baseelectric.blocks; import cyano.poweradvantage.api.ConduitBlock; import cyano.poweradvantage.api.PowerConnectorContext; @@ -16,10 +16,10 @@ import net.minecraft.world.World; import org.junit.BeforeClass; import org.junit.Test; -import zone.moddev.mc.electricadvantage.init.Power; -import zone.moddev.mc.electricadvantage.machines.ElectricDrillBlock; -import zone.moddev.mc.electricadvantage.machines.LaserTurretBlock; -import zone.moddev.mc.electricadvantage.machines.PhotovoltaicGeneratorBlock; +import zone.moddev.mc.baseelectric.init.Power; +import zone.moddev.mc.baseelectric.machines.ElectricDrillBlock; +import zone.moddev.mc.baseelectric.machines.LaserTurretBlock; +import zone.moddev.mc.baseelectric.machines.PhotovoltaicGeneratorBlock; import static org.junit.Assert.*; public class NativeBlockContractTest { diff --git a/src/test/java/zone/moddev/mc/electricadvantage/blocks/OreHarvestContractTest.java b/src/test/java/zone/moddev/mc/baseelectric/blocks/OreHarvestContractTest.java similarity index 98% rename from src/test/java/zone/moddev/mc/electricadvantage/blocks/OreHarvestContractTest.java rename to src/test/java/zone/moddev/mc/baseelectric/blocks/OreHarvestContractTest.java index 309a58a..0fb1ae4 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/blocks/OreHarvestContractTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/blocks/OreHarvestContractTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.blocks; +package zone.moddev.mc.baseelectric.blocks; import com.mojang.authlib.GameProfile; import java.lang.reflect.Field; 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 95% 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 d68016c..8f83ac9 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.Collections; @@ -76,12 +76,12 @@ private static ListNBT motion(double x, double y, double z) { private static EntityType turbineType() { return EntityType.Builder.of(HydroturbineEntity::new, EntityClassification.MISC) - .sized(1, 1).build("electricadvantage:test_anchored_turbine"); + .sized(1, 1).build("baseelectric:test_anchored_turbine"); } private static EntityType controlType() { return EntityType.Builder.of(ControlEntity::new, EntityClassification.MISC) - .sized(1, 1).build("electricadvantage:test_native_motion_control"); + .sized(1, 1).build("baseelectric:test_native_motion_control"); } private static World world() throws Exception { diff --git a/src/test/java/zone/moddev/mc/electricadvantage/entities/HydroturbinePersistenceTest.java b/src/test/java/zone/moddev/mc/baseelectric/entities/HydroturbinePersistenceTest.java similarity index 96% rename from src/test/java/zone/moddev/mc/electricadvantage/entities/HydroturbinePersistenceTest.java rename to src/test/java/zone/moddev/mc/baseelectric/entities/HydroturbinePersistenceTest.java index c338fa2..07d2054 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/entities/HydroturbinePersistenceTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/entities/HydroturbinePersistenceTest.java @@ -1,9 +1,9 @@ -package zone.moddev.mc.electricadvantage.entities; +package zone.moddev.mc.baseelectric.entities; import java.lang.reflect.Field; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.BlockPos; -import zone.moddev.mc.electricadvantage.machines.HydroelectricGeneratorTileEntity; +import zone.moddev.mc.baseelectric.machines.HydroelectricGeneratorTileEntity; import org.junit.Test; import static org.junit.Assert.*; diff --git a/src/test/java/zone/moddev/mc/electricadvantage/graphics/RendererBufferContractTest.java b/src/test/java/zone/moddev/mc/baseelectric/graphics/RendererBufferContractTest.java similarity index 97% rename from src/test/java/zone/moddev/mc/electricadvantage/graphics/RendererBufferContractTest.java rename to src/test/java/zone/moddev/mc/baseelectric/graphics/RendererBufferContractTest.java index aacd515..1e172c8 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/graphics/RendererBufferContractTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/graphics/RendererBufferContractTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.graphics; +package zone.moddev.mc.baseelectric.graphics; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; @@ -13,9 +13,9 @@ import net.minecraft.util.registry.Bootstrap; import org.junit.BeforeClass; import org.junit.Test; -import zone.moddev.mc.electricadvantage.init.Power; -import zone.moddev.mc.electricadvantage.machines.ElectricDrillTileEntity; -import zone.moddev.mc.electricadvantage.machines.LaserTurretTileEntity; +import zone.moddev.mc.baseelectric.init.Power; +import zone.moddev.mc.baseelectric.machines.ElectricDrillTileEntity; +import zone.moddev.mc.baseelectric.machines.LaserTurretTileEntity; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine; 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 95% 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 d575f97..a0f38ca 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 org.junit.Test; import static org.junit.Assert.*; 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 81% 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 7d2c7fe..ab029c8 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 static org.junit.Assert.assertEquals; @@ -27,9 +27,9 @@ private static void assertDefaults(boolean mineralogy, boolean baseMinerals, JsonObject root = OreSpawnWorldGen.createProvider(mineralogy, baseMinerals).toJson(); JsonObject ores = root.getAsJsonObject("ores"); assertEquals(sulfurEnabled, - ores.getAsJsonObject("electricadvantage:ore/sulfur").get("enabled").getAsBoolean()); + ores.getAsJsonObject("baseelectric:ore/sulfur").get("enabled").getAsBoolean()); assertEquals(lithiumEnabled, - ores.getAsJsonObject("electricadvantage:ore/lithium").get("enabled").getAsBoolean()); + ores.getAsJsonObject("baseelectric:ore/lithium").get("enabled").getAsBoolean()); assertEquals(2, ores.size()); } } diff --git a/src/test/java/zone/moddev/mc/electricadvantage/init/VillagesTest.java b/src/test/java/zone/moddev/mc/baseelectric/init/VillagesTest.java similarity index 97% rename from src/test/java/zone/moddev/mc/electricadvantage/init/VillagesTest.java rename to src/test/java/zone/moddev/mc/baseelectric/init/VillagesTest.java index 491bbb2..6578fc4 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/init/VillagesTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/init/VillagesTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; import java.util.Random; import net.minecraft.item.MerchantOffer; 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 98% 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 f9996cd..a3e9ebc 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.CompoundNBT; import net.minecraft.nbt.ListNBT; 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 98% 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 d3f3f9a..0b419da 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 cyano.poweradvantage.api.fluid.FluidStack; import java.lang.reflect.Field; @@ -16,7 +16,7 @@ import net.minecraft.world.server.ServerWorld; 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 4a6fee0..9a14d08 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 cyano.poweradvantage.api.fluid.FluidStack; import java.lang.reflect.Field; @@ -30,7 +30,7 @@ import net.minecraft.world.server.ServerWorld; 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 99% 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 1257255..873673c 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/machines/ElectricOperationalRedstoneCacheTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalRedstoneCacheTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import cyano.poweradvantage.api.PoweredEntity; import java.lang.reflect.Field; 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 1c0ae73..20be31c 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 93% 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 cc09173..f740e17 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 cyano.poweradvantage.api.fluid.FluidStack; import java.lang.reflect.Method; @@ -6,8 +6,8 @@ import net.minecraft.util.registry.Bootstrap; import org.junit.BeforeClass; import org.junit.Test; -import zone.moddev.mc.poweradvantage.registry.still.recipe.DistillationRecipe; -import zone.moddev.mc.poweradvantage.registry.still.recipe.ExplicitFluidReference; +import zone.moddev.mc.basepower.registry.still.recipe.DistillationRecipe; +import zone.moddev.mc.basepower.registry.still.recipe.ExplicitFluidReference; import static org.junit.Assert.*; 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 97% 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 759f079..689e18e 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.nbt.CompoundNBT; import org.junit.Test; diff --git a/src/test/java/zone/moddev/mc/electricadvantage/machines/LaserTurretGeometryTest.java b/src/test/java/zone/moddev/mc/baseelectric/machines/LaserTurretGeometryTest.java similarity index 96% rename from src/test/java/zone/moddev/mc/electricadvantage/machines/LaserTurretGeometryTest.java rename to src/test/java/zone/moddev/mc/baseelectric/machines/LaserTurretGeometryTest.java index e1def17..cfc8b1e 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/machines/LaserTurretGeometryTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/machines/LaserTurretGeometryTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; diff --git a/src/test/java/zone/moddev/mc/baseelectric/migration/ElectricLegacyMigrationsTest.java b/src/test/java/zone/moddev/mc/baseelectric/migration/ElectricLegacyMigrationsTest.java new file mode 100644 index 0000000..a5a2016 --- /dev/null +++ b/src/test/java/zone/moddev/mc/baseelectric/migration/ElectricLegacyMigrationsTest.java @@ -0,0 +1,29 @@ +package zone.moddev.mc.baseelectric.migration; + +import static org.junit.Assert.assertEquals; + +import cyano.poweradvantage.api.migration.LegacyMigrationApi; +import net.minecraft.util.Direction; +import org.junit.Test; + +public class ElectricLegacyMigrationsTest { + @Test public void preservesAllSixDrillFacingsAndActiveFlag() { + for (Direction facing : Direction.values()) { + int metadata = facing.get3DDataValue() | 8; + assertEquals(facing, ElectricLegacyMigrations.legacyDrillFacing(metadata)); + assertEquals(true, ElectricLegacyMigrations.legacyDrillActive(metadata)); + } + } + + @Test public void aliasesLegacyTileAndHydroturbineIds() { + ElectricLegacyMigrations.register(); + assertEquals("baseelectric:led", LegacyMigrationApi.tileTarget("baseelectric:l_e_d")); + assertEquals("baseelectric:led", LegacyMigrationApi.tileTarget("baseelectric.l_e_d")); + assertEquals("baseelectric:electric_furnace", + LegacyMigrationApi.tileTarget("minecraft:baseelectric.electric_furnace")); + assertEquals("baseelectric:hydroturbine", + LegacyMigrationApi.entityTarget("minecraft:baseelectric.Hydroturbine")); + assertEquals("baseelectric:hydroturbine", + LegacyMigrationApi.entityTarget("baseelectric.baseelectric.Hydroturbine")); + } +} diff --git a/src/test/java/zone/moddev/mc/electricadvantage/recipe/RecipeConditionsTest.java b/src/test/java/zone/moddev/mc/baseelectric/recipe/RecipeConditionsTest.java similarity index 92% rename from src/test/java/zone/moddev/mc/electricadvantage/recipe/RecipeConditionsTest.java rename to src/test/java/zone/moddev/mc/baseelectric/recipe/RecipeConditionsTest.java index 7e7ffd6..13db56f 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/recipe/RecipeConditionsTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/recipe/RecipeConditionsTest.java @@ -1,10 +1,10 @@ -package zone.moddev.mc.electricadvantage.recipe; +package zone.moddev.mc.baseelectric.recipe; import java.util.Locale; import com.google.gson.JsonObject; import org.junit.Test; -import zone.moddev.mc.poweradvantage.PowerAdvantage; -import zone.moddev.mc.poweradvantage.RecipeMode; +import zone.moddev.mc.basepower.PowerAdvantage; +import zone.moddev.mc.basepower.RecipeMode; import static org.junit.Assert.*; public class RecipeConditionsTest { diff --git a/src/test/java/zone/moddev/mc/electricadvantage/resources/BlockLootResourceTest.java b/src/test/java/zone/moddev/mc/baseelectric/resources/BlockLootResourceTest.java similarity index 87% rename from src/test/java/zone/moddev/mc/electricadvantage/resources/BlockLootResourceTest.java rename to src/test/java/zone/moddev/mc/baseelectric/resources/BlockLootResourceTest.java index 728dd1b..d08cc0d 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/resources/BlockLootResourceTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/resources/BlockLootResourceTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.resources; +package zone.moddev.mc.baseelectric.resources; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -12,8 +12,8 @@ public class BlockLootResourceTest { @Test public void everyOrdinaryBlockKeepsItsOwnNativeItemDrop() throws Exception { - Path root = Paths.get("src/main/resources/data/electricadvantage/loot_tables/blocks"); - try (Stream states = Files.list(Paths.get("src/main/resources/assets/electricadvantage/blockstates"))) { + Path root = Paths.get("src/main/resources/data/baseelectric/loot_tables/blocks"); + try (Stream states = Files.list(Paths.get("src/main/resources/assets/baseelectric/blockstates"))) { for (Path state : (Iterable) states.filter(path -> path.toString().endsWith(".json"))::iterator) { String id = state.getFileName().toString().replace(".json", ""); // Two retained asset-only models are not registered blocks. @@ -27,7 +27,7 @@ public class BlockLootResourceTest { assertEquals(1, pool.get("rolls").getAsInt()); JsonObject entry = pool.getAsJsonArray("entries").get(0).getAsJsonObject(); assertEquals("minecraft:item", entry.get("type").getAsString()); - assertEquals("electricadvantage:" + id, entry.get("name").getAsString()); + assertEquals("baseelectric:" + id, entry.get("name").getAsString()); } } assertFalse(Files.exists(root.resolve("pump_pipe_electric.json"))); diff --git a/src/test/java/zone/moddev/mc/electricadvantage/resources/BuildWorkflowContractTest.java b/src/test/java/zone/moddev/mc/baseelectric/resources/BuildWorkflowContractTest.java similarity index 88% rename from src/test/java/zone/moddev/mc/electricadvantage/resources/BuildWorkflowContractTest.java rename to src/test/java/zone/moddev/mc/baseelectric/resources/BuildWorkflowContractTest.java index ca10fab..7e32414 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/resources/BuildWorkflowContractTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/resources/BuildWorkflowContractTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.resources; +package zone.moddev.mc.baseelectric.resources; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -32,8 +32,8 @@ public class BuildWorkflowContractTest { @Test public void dependencyPolicyPrecedesEveryPinnedCheckout() throws Exception { for (String helper : new String[] {"tools/verify-native-port.js", "tools/verification/Verify-ElectricEcj.ps1"}) { String source = new String(Files.readAllBytes(Paths.get(helper)), StandardCharsets.UTF_8); - assertTrue(helper, source.contains("bcb75bfa91c14751ebf1e31865e1ec0ffa82c0b7")); - assertTrue(helper, source.contains("2FB923944A456B4F26AB2F9212C646469CE3F49BFD4DAE894C15559B48908386")); + assertTrue(helper, source.contains("a21d0653129912e8d45bc443080b211eb09ae88c")); + assertTrue(helper, source.contains("156674F6DF6007D351AD419416344356F6586452077FCAE2E9BC9404EE14A14B")); assertFalse(helper, source.contains("2116a35a40dd150d79e7dfdcdc891637793178b7")); assertFalse(helper, source.contains("F58B93DAF03CF303F32B18CCCA140E55E886A2BA82732A3F286ADF3E31194B6A")); } @@ -43,12 +43,12 @@ public class BuildWorkflowContractTest { assertTrue(policy > 0); assertTrue(policy < source.indexOf("repository: MinecraftModDevelopmentMods/OreSpawn")); assertTrue(policy < source.indexOf("repository: MinecraftModDevelopmentMods/BaseMetals")); - assertTrue(policy < source.indexOf("repository: MinecraftModDevelopmentMods/PowerAdvantage")); + assertTrue(policy < source.indexOf("repository: MinecraftModDevelopmentMods/basePower")); assertTrue(source.contains("ref: a113e5d767169189f0e35ade1e173a12d550b00e")); assertTrue(source.contains("ref: 995f6cc4dd2d5eecc628a42e5c43fa5390c24bca")); assertTrue(source.contains("BaseMetals-3.1.1.116051-deobf.jar")); - assertTrue(source.contains("ref: bcb75bfa91c14751ebf1e31865e1ec0ffa82c0b7")); - assertTrue(source.contains("2FB923944A456B4F26AB2F9212C646469CE3F49BFD4DAE894C15559B48908386")); + assertTrue(source.contains("ref: a21d0653129912e8d45bc443080b211eb09ae88c")); + assertTrue(source.contains("156674F6DF6007D351AD419416344356F6586452077FCAE2E9BC9404EE14A14B")); assertFalse(source.contains("098d4625abc8a849bd1a11dcf697b3fee0cade7b")); assertFalse(source.contains("78E58DD2AB04E2B9F3267E5735C64AAE7E93EAC97571CB04485038862C853ED3")); assertFalse(source.contains("ce90c24c302d0ff3565db2db0c6c94a3b5f21f83")); diff --git a/src/test/java/zone/moddev/mc/electricadvantage/resources/ClientResourceContractTest.java b/src/test/java/zone/moddev/mc/baseelectric/resources/ClientResourceContractTest.java similarity index 92% rename from src/test/java/zone/moddev/mc/electricadvantage/resources/ClientResourceContractTest.java rename to src/test/java/zone/moddev/mc/baseelectric/resources/ClientResourceContractTest.java index 7f984dc..053fdfa 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/resources/ClientResourceContractTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/resources/ClientResourceContractTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.resources; +package zone.moddev.mc.baseelectric.resources; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -15,7 +15,7 @@ public class ClientResourceContractTest { private static final Path ROOT = Paths.get("src/main/resources"); - private static final Path ASSETS = ROOT.resolve("assets/electricadvantage"); + private static final Path ASSETS = ROOT.resolve("assets/baseelectric"); @Test public void blockstatesUseLiteralModelPaths() throws Exception { try (Stream files = Files.walk(ASSETS.resolve("blockstates"))) { @@ -55,7 +55,7 @@ public class ClientResourceContractTest { JsonObject locale = read(file); for (Map.Entry entry : locale.entrySet()) { String key = entry.getKey(); - if (!(key.startsWith("tile.electricadvantage.") || key.startsWith("item.electricadvantage.")) + if (!(key.startsWith("tile.baseelectric.") || key.startsWith("item.baseelectric.")) || !key.endsWith(".name")) continue; String alias = key.substring(0, key.length() - 5); if (alias.startsWith("tile.")) alias = "block." + alias.substring(5); @@ -80,7 +80,7 @@ private static void reference(String id, String directory, String suffix, Path f String path = parts.length == 2 ? parts[1] : parts[0]; if ("minecraft".equals(namespace) && path.startsWith("builtin/")) return; String resource = "assets/" + namespace + "/" + directory + "/" + path + suffix; - boolean exists = "electricadvantage".equals(namespace) ? Files.isRegularFile(ROOT.resolve(resource)) + boolean exists = "baseelectric".equals(namespace) ? Files.isRegularFile(ROOT.resolve(resource)) : ClientResourceContractTest.class.getClassLoader().getResource(resource) != null; assertTrue(file + " references missing " + resource, exists); } diff --git a/src/test/java/zone/moddev/mc/electricadvantage/resources/RecipeRegistrationThreadTest.java b/src/test/java/zone/moddev/mc/baseelectric/resources/RecipeRegistrationThreadTest.java similarity index 91% rename from src/test/java/zone/moddev/mc/electricadvantage/resources/RecipeRegistrationThreadTest.java rename to src/test/java/zone/moddev/mc/baseelectric/resources/RecipeRegistrationThreadTest.java index e7ffab3..58ecefb 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/resources/RecipeRegistrationThreadTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/resources/RecipeRegistrationThreadTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.resources; +package zone.moddev.mc.baseelectric.resources; import java.io.InputStream; import org.junit.Test; @@ -14,11 +14,11 @@ public class RecipeRegistrationThreadTest { @Test public void sharedForgeConditionsAreRegisteredAfterParallelSetup() throws Exception { ClassNode node = new ClassNode(); - try (InputStream input = getClass().getResourceAsStream("/zone/moddev/mc/electricadvantage/ElectricAdvantage.class")) { + try (InputStream input = getClass().getResourceAsStream("/zone/moddev/mc/baseelectric/ElectricAdvantage.class")) { assertNotNull(input); new ClassReader(input).accept(node, 0); } - String conditions = "zone/moddev/mc/electricadvantage/recipe/RecipeConditions"; + String conditions = "zone/moddev/mc/baseelectric/recipe/RecipeConditions"; int queued = 0; for (MethodNode method : node.methods) { boolean registrationRunnable = false; diff --git a/src/test/java/zone/moddev/mc/electricadvantage/resources/RecipeResourceTest.java b/src/test/java/zone/moddev/mc/baseelectric/resources/RecipeResourceTest.java similarity index 91% rename from src/test/java/zone/moddev/mc/electricadvantage/resources/RecipeResourceTest.java rename to src/test/java/zone/moddev/mc/baseelectric/resources/RecipeResourceTest.java index e8ce5cc..5c2aed4 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/resources/RecipeResourceTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/resources/RecipeResourceTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.resources; +package zone.moddev.mc.baseelectric.resources; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -19,7 +19,7 @@ public class RecipeResourceTest { @Test public void allRecipesUseTheNativeOneFifteenDataPackLocationAndSerializers() throws IOException { - Path recipes = Paths.get("src/main/resources/data/electricadvantage/recipes"); + Path recipes = Paths.get("src/main/resources/data/baseelectric/recipes"); List files; try (Stream stream = Files.list(recipes)) { files = stream.filter(path -> path.toString().endsWith(".json")) @@ -44,6 +44,6 @@ public class RecipeResourceTest { assertEquals(46, crafting); assertEquals(4, smelting); assertEquals(8, crushing); - assertFalse(Files.exists(Paths.get("src/main/resources/assets/electricadvantage/recipes"))); + assertFalse(Files.exists(Paths.get("src/main/resources/assets/baseelectric/recipes"))); } } diff --git a/src/test/java/zone/moddev/mc/electricadvantage/resources/RecipeUnlockContractTest.java b/src/test/java/zone/moddev/mc/baseelectric/resources/RecipeUnlockContractTest.java similarity index 98% rename from src/test/java/zone/moddev/mc/electricadvantage/resources/RecipeUnlockContractTest.java rename to src/test/java/zone/moddev/mc/baseelectric/resources/RecipeUnlockContractTest.java index 5866cd8..3f38fcc 100644 --- a/src/test/java/zone/moddev/mc/electricadvantage/resources/RecipeUnlockContractTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/resources/RecipeUnlockContractTest.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.resources; +package zone.moddev.mc.baseelectric.resources; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -21,7 +21,7 @@ import static org.junit.Assert.*; public class RecipeUnlockContractTest { - private static final String MOD = "electricadvantage"; + private static final String MOD = "baseelectric"; private static final Path DATA = Paths.get("src/main/resources/data", MOD); private static final Set IGNORED = new LinkedHashSet<>(java.util.Arrays.asList( "item:minecraft:stick", "item:minecraft:string", "item:minecraft:feather", "tag:forge:rods/wooden")); diff --git a/src/test/java/zone/moddev/mc/electricadvantage/migration/ElectricLegacyMigrationsTest.java b/src/test/java/zone/moddev/mc/electricadvantage/migration/ElectricLegacyMigrationsTest.java deleted file mode 100644 index de29e94..0000000 --- a/src/test/java/zone/moddev/mc/electricadvantage/migration/ElectricLegacyMigrationsTest.java +++ /dev/null @@ -1,29 +0,0 @@ -package zone.moddev.mc.electricadvantage.migration; - -import static org.junit.Assert.assertEquals; - -import cyano.poweradvantage.api.migration.LegacyMigrationApi; -import net.minecraft.util.Direction; -import org.junit.Test; - -public class ElectricLegacyMigrationsTest { - @Test public void preservesAllSixDrillFacingsAndActiveFlag() { - for (Direction facing : Direction.values()) { - int metadata = facing.get3DDataValue() | 8; - assertEquals(facing, ElectricLegacyMigrations.legacyDrillFacing(metadata)); - assertEquals(true, ElectricLegacyMigrations.legacyDrillActive(metadata)); - } - } - - @Test public void aliasesLegacyTileAndHydroturbineIds() { - ElectricLegacyMigrations.register(); - assertEquals("electricadvantage:led", LegacyMigrationApi.tileTarget("electricadvantage:l_e_d")); - assertEquals("electricadvantage:led", LegacyMigrationApi.tileTarget("electricadvantage.l_e_d")); - assertEquals("electricadvantage:electric_furnace", - LegacyMigrationApi.tileTarget("minecraft:electricadvantage.electric_furnace")); - assertEquals("electricadvantage:hydroturbine", - LegacyMigrationApi.entityTarget("minecraft:electricadvantage.Hydroturbine")); - assertEquals("electricadvantage:hydroturbine", - LegacyMigrationApi.entityTarget("electricadvantage.electricadvantage.Hydroturbine")); - } -} diff --git a/tools/verification/AuditedJUnit.java b/tools/verification/AuditedJUnit.java index a544297..c1d390a 100644 --- a/tools/verification/AuditedJUnit.java +++ b/tools/verification/AuditedJUnit.java @@ -1,4 +1,4 @@ -package zone.moddev.mc.electricadvantage.verification; +package zone.moddev.mc.baseelectric.verification; import java.io.FileOutputStream; import javax.xml.stream.XMLOutputFactory; diff --git a/tools/verification/Verify-ElectricEcj.ps1 b/tools/verification/Verify-ElectricEcj.ps1 index f941090..b1924c2 100644 --- a/tools/verification/Verify-ElectricEcj.ps1 +++ b/tools/verification/Verify-ElectricEcj.ps1 @@ -71,8 +71,8 @@ $report = [ordered]@{ status = 'RUNNING'; project = $ProjectRoot; evidence = $Ev try { $properties = ConvertFrom-StringData -StringData (Get-Content -LiteralPath (Join-Path $ProjectRoot 'gradle.properties') -Raw) if ($properties.mod_id -ne 'electricadvantage' -or $properties.mod_version -ne '2.2.8.116051' -or - $properties.poweradvantage_source_ref -ne 'bcb75bfa91c14751ebf1e31865e1ec0ffa82c0b7' -or - $properties.poweradvantage_deobf_sha256 -ne '2FB923944A456B4F26AB2F9212C646469CE3F49BFD4DAE894C15559B48908386') { + $properties.poweradvantage_source_ref -ne 'a21d0653129912e8d45bc443080b211eb09ae88c' -or + $properties.poweradvantage_deobf_sha256 -ne '156674F6DF6007D351AD419416344356F6586452077FCAE2E9BC9404EE14A14B') { throw 'This verifier requires the pinned Electric 1.16.5 candidate' } $report.compiler = Get-Pin $Compiler @@ -99,7 +99,7 @@ try { if (!$scope -or $scope.Split(',') -contains 'main') { $mainLibraries += $file } if (!$scope -or $scope.Split(',') -contains 'test') { $testLibraries += $file } } - foreach ($dependency in @(@{ prefix = 'PowerAdvantage-'; hash = $properties.poweradvantage_deobf_sha256 }, + foreach ($dependency in @(@{ prefix = 'basePower-'; hash = $properties.poweradvantage_deobf_sha256 }, @{ prefix = 'BaseMetals-'; hash = $properties.basemetals_deobf_sha256 }, @{ prefix = 'OreSpawn-'; hash = $properties.orespawn_deobf_sha256 })) { $matching = @($report.libraries | Where-Object { [IO.Path]::GetFileName($_.path).StartsWith($dependency.prefix) }) if ($matching.Count -ne 1 -or $matching[0].sha256 -ne $dependency.hash) { throw "Typed dependency pin mismatch: $($dependency.prefix)" } diff --git a/tools/verify-native-port.js b/tools/verify-native-port.js index 08ad1ba..ec060b3 100644 --- a/tools/verify-native-port.js +++ b/tools/verify-native-port.js @@ -5,7 +5,7 @@ const { execFileSync } = require('node:child_process'); const root = path.resolve(__dirname, '..'); const baseline = '74aa1cee1ddec821ebcd12b9f8b0515b7aec61d9'; -const javaRoot = 'src/main/java/zone/moddev/mc/electricadvantage/'; +const javaRoot = 'src/main/java/zone/moddev/mc/baseelectric/'; const read = name => fs.readFileSync(path.join(root, name), 'utf8'); const git = (...args) => execFileSync('git', args, { cwd: root }); const tracked = git('ls-tree', '-r', '--name-only', baseline).toString().trim().split('\n'); @@ -17,7 +17,7 @@ function check(name, run) { function strings(source) { const tokens = source.match(/"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\/\/[^\n]*|\/\*[\s\S]*?\*\//g) || []; return tokens.filter(token => token.startsWith('"')) - .filter(token => token !== '"2.2.7.115021"' && token !== '"2.2.8.116051"').sort(); + .filter(token => token !== '"2.2.7.115021"' && token !== '"2.2.9.116051"').sort(); } function numbers(source) { const tokens = source.match(/"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\/\/[^\n]*|\/\*[\s\S]*?\*\/|[A-Za-z_$][A-Za-z0-9_$]*|(?:0[xX][\da-fA-F_]+|(?:\d[\d_]*\.?[\d_]*|\.\d[\d_]*)(?:[eE][+-]?[\d_]+)?)[dDfFlL]?/g) || []; @@ -28,9 +28,9 @@ check('Exact native target metadata', () => { const properties = read('gradle.properties'); for (const pair of ['minecraft_version=1.16.5', 'forge_version=36.2.34', 'mapping_channel=official', 'mapping_version=1.16.5', 'mcp_version=20210115.111550', - 'mod_version=2.2.8.116051', 'poweradvantage_version=2.4.7.116051', - 'poweradvantage_source_ref=bcb75bfa91c14751ebf1e31865e1ec0ffa82c0b7', - 'poweradvantage_deobf_sha256=2FB923944A456B4F26AB2F9212C646469CE3F49BFD4DAE894C15559B48908386', + 'mod_version=2.2.9.116051', 'poweradvantage_version=2.4.8.116051', + 'poweradvantage_source_ref=a21d0653129912e8d45bc443080b211eb09ae88c', + 'poweradvantage_deobf_sha256=156674F6DF6007D351AD419416344356F6586452077FCAE2E9BC9404EE14A14B', 'basemetals_version=3.1.1.116051', 'orespawn_version=4.1.0.116051', 'java_version=8', 'gradle_java_version=17']) { assert(properties.split(/\r?\n/).includes(pair), pair); @@ -49,7 +49,7 @@ check('Production string identities and NBT keys match the accepted 115 source', } }); check('Production numeric constants and rendering test tolerances match 115', () => { - const rendererTest = 'src/test/java/zone/moddev/mc/electricadvantage/graphics/RendererBufferContractTest.java'; + const rendererTest = 'src/test/java/zone/moddev/mc/baseelectric/graphics/RendererBufferContractTest.java'; for (const name of tracked.filter(name => name.startsWith(javaRoot) && name.endsWith('.java') || name === rendererTest)) { assert.deepEqual(numbers(read(name)), numbers(git('show', `${baseline}:${name}`).toString()), name); } From d3d05d724957072323c872f9ed91e4c80bfe9bd6 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Sat, 7 Nov 2026 23:56:52 +0000 Subject: [PATCH 2/3] Pin baseElectric to the released basePower for 1.16.5 --- .github/workflows/ci.yml | 5 ++- .github/workflows/codeql-analysis.yml | 5 ++- CHANGELOG.txt | 1 + README.md | 31 ++++++----------- build.gradle | 50 ++++++++++++++++----------- gradle.properties | 6 ++-- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8601dd9..cb124d3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: set -euo pipefail power_ref="$(sed -n 's/^poweradvantage_source_ref=//p' gradle.properties | tr -d '\r')" power_sha="$(sed -n 's/^poweradvantage_deobf_sha256=//p' gradle.properties | tr -d '\r')" - if [[ "$power_ref" != "a21d0653129912e8d45bc443080b211eb09ae88c" || "$power_sha" != "156674F6DF6007D351AD419416344356F6586452077FCAE2E9BC9404EE14A14B" ]]; then + if [[ ! "$power_ref" =~ ^[a-f0-9]{40}$ || ! "$power_sha" =~ ^[A-F0-9]{64}$ ]]; then echo "PowerAdvantage 1.16.5 source/deobf pin differs from the audited candidate" >&2 exit 1 fi @@ -52,8 +52,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: repository: MinecraftModDevelopmentMods/basePower - # Local-only Power source; publish upstream before hosted builds. - ref: a21d0653129912e8d45bc443080b211eb09ae88c + ref: ${{ steps.pins.outputs.power_ref }} path: .ci-dependencies/PowerAdvantage - name: Install pinned Java 25 Mavenizer runtime uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0c20f7f..daafaf1 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -31,7 +31,7 @@ jobs: set -euo pipefail power_ref="$(sed -n 's/^poweradvantage_source_ref=//p' gradle.properties | tr -d '\r')" power_sha="$(sed -n 's/^poweradvantage_deobf_sha256=//p' gradle.properties | tr -d '\r')" - if [[ "$power_ref" != "a21d0653129912e8d45bc443080b211eb09ae88c" || "$power_sha" != "156674F6DF6007D351AD419416344356F6586452077FCAE2E9BC9404EE14A14B" ]]; then + if [[ ! "$power_ref" =~ ^[a-f0-9]{40}$ || ! "$power_sha" =~ ^[A-F0-9]{64}$ ]]; then echo "PowerAdvantage 1.16.5 source/deobf pin differs from the audited candidate" >&2 exit 1 fi @@ -52,8 +52,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: repository: MinecraftModDevelopmentMods/basePower - # Local-only Power source; publish upstream before hosted builds. - ref: a21d0653129912e8d45bc443080b211eb09ae88c + ref: ${{ steps.pins.outputs.power_ref }} path: .ci-dependencies/PowerAdvantage - name: Install pinned Java 25 Mavenizer runtime uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 diff --git a/CHANGELOG.txt b/CHANGELOG.txt index c6d7f08..d54d14e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -2,6 +2,7 @@ baseElectric 2.2.9.116051 (Minecraft 1.16.5) - Bring baseElectric to Minecraft 1.16.5 and use the shared basePower creative tab. - Map legacy Electric Advantage blocks, items and saved machine state to baseElectric when upgrading. +- Fix Eclipse refreshes when ForgeGradle reuses an existing client or server launch. Electric Advantage 2.2.8.116051 (local port candidate) diff --git a/README.md b/README.md index 2a6bdac..74fe72f 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,11 @@ # baseElectric -**Minecraft 1.16.5 local test candidate, version 2.2.9.116051.** -The follow-up checks measure finite machine jobs, energy and fluid conservation, -blocked routes, real turret hits and full-process restarts. Rendered GUI checks -require the correct labels as well as correctly placed controls. The shared -record below identifies the current jars and each completed run; earlier -results are retained separately rather than counted again. Broader player/entity -checks retain a separately controlled vanilla wolf-health difference. -Manual acceptance is pending. This is not a published release. -See [the native port checklist](docs/NATIVE116.md). -The [shared test record](https://github.com/MinecraftModDevelopmentMods/PowerAdvantage/blob/master-1.16.5/docs/1.16/CURRENT-QUALIFICATION.md) -records the exact jars, completed checks and remaining limits. -The [accepted 1.15 record](https://github.com/MinecraftModDevelopmentMods/PowerAdvantage/blob/master-1.15.2/docs/1.15/CURRENT-QUALIFICATION.md) -is a behavior reference, not evidence that this target passes. +**Minecraft 1.16.5, version 2.2.9.116051.** + +Use [basePower 2.4.8.116051](https://www.curseforge.com/minecraft/mc-mods/basepower/files/9501921) +and [Base Metals 3.1.1.116051](https://www.curseforge.com/minecraft/mc-mods/base-metals/files/9501458). The +[shared test record](https://github.com/MinecraftModDevelopmentMods/basePower/blob/master-1.16.5/docs/1.16/BASE-RELEASE-CANDIDATE.md) +covers machine operation, world upgrades and full restarts. baseElectric continues DrCyano's Electric Advantage. It adds electric generation, storage, machinery and defence to basePower. Back up your world @@ -29,7 +22,7 @@ inference and downloads. Build inputs are separate, non-embedded deobfuscated jars: -- Power Advantage `2.4.7.116051`: source `a21d0653129912e8d45bc443080b211eb09ae88c`. +- basePower `2.4.8.116051`. - Base Metals `3.1.1.116051`: source `995f6cc4dd2d5eecc628a42e5c43fa5390c24bca`. - OreSpawn `4.1.0.116051`: source `a113e5d767169189f0e35ade1e173a12d550b00e`. @@ -83,10 +76,9 @@ launching. Do not add raw source metadata to the production classpath. ## Compatibility -The implementation namespace remains `zone.moddev.mc.electricadvantage`. -Runtime registries, legacy aliases, tile/entity IDs, NBT keys, recipe IDs, -ratios, tags, OreSpawn provider IDs and assets are retained. Electric uses -Power Advantage's shared migration hook, dimension-key network registry, +New saves use `baseelectric:*`. The shared upgrade code maps older +`electricadvantage:*` IDs to their baseElectric equivalents and retains saved +machine data. Electric uses basePower's shared migration hook, dimension-key network registry, capability adapters and native lifecycle contracts. It does not create synthetic numeric dimension IDs or a second capability implementation. @@ -103,13 +95,12 @@ The RF- and Tech Reborn-labelled converters belong to Power Advantage and use Forge Energy. Check live rendering, GUI interaction, sound, weapons, hydroturbine orientation and animation, multiplayer and real player login in game. Automated tag, machine and upgrade checks do not replace that walkthrough. -No 1.16 publication is included before manual acceptance. Always back up a whole world before upgrading and test only disposable copies. Keep migration backups and failed evidence. Bounded Advantage results never qualify unrelated mods or an arbitrary existing modpack. -The shared [machine operating checks](https://github.com/MinecraftModDevelopmentMods/PowerAdvantage/blob/master-1.16.5/docs/1.16/OPERATING-TESTS.md) +The shared [machine operating checks](https://github.com/MinecraftModDevelopmentMods/basePower/blob/master-1.16.5/docs/1.16/OPERATING-TESTS.md) exercise finite processing, fabrication, growth, pumping, lighting, generation, battery and turret jobs. They check real output, damage and resource use, with blocked and starved controls and complete server restarts. diff --git a/build.gradle b/build.gradle index ef75a14..0b20282 100644 --- a/build.gradle +++ b/build.gradle @@ -377,7 +377,9 @@ tasks.register('verifyReleaseConfiguration') { } if (project.poweradvantage_version != '2.4.8.116051' || project.poweradvantage_source_repository != 'MinecraftModDevelopmentMods/basePower' - || project.poweradvantage_source_ref != 'a21d0653129912e8d45bc443080b211eb09ae88c' + || project.poweradvantage_source_ref != '04a90df489180c69dd57f7cda9ff5ff7e3c456ba' + || project.poweradvantage_curse_file_id != '9501921' + || project.poweradvantage_release_sha256 != '408C6B9D5BF065E37B76B59AB3E6DD649DFE045638F197C63532281939D701C7' || project.poweradvantage_deobf_sha256 != '156674F6DF6007D351AD419416344356F6586452077FCAE2E9BC9404EE14A14B') { throw new GradleException('Unexpected PowerAdvantage compile dependency identity') } @@ -807,10 +809,10 @@ tasks.register('isolateEclipseProductionRuns') { "key=\"MC_VERSION\" value=\"${project.minecraft_version}\"") if (launch.name in ['runClient.launch', 'runServer.launch', 'runData.launch']) { // Eclipse compiles into bin/main, not Gradle's merged run output. - def launchXml = new groovy.xml.XmlSlurper().parseText(contents) + def launchXml = new groovy.xml.XmlParser().parseText(contents) def modClasses = launchXml.mapAttribute.find { - it.@key.text() == 'org.eclipse.debug.core.environmentVariables' - }.mapEntry.findAll { it.@key.text() == 'MOD_CLASSES' } + it.@key == 'org.eclipse.debug.core.environmentVariables' + }.mapEntry.findAll { it.@key == 'MOD_CLASSES' } if (modClasses.size() != 1) { throw new GradleException("${launch.name} must define one MOD_CLASSES entry") } @@ -846,26 +848,32 @@ tasks.register('isolateEclipseProductionRuns') { }.findAll { File runtimeFile -> !mainOutputs.contains(runtimeFile) } - List launchLines = contents.readLines() - int buildshipContainerLine = launchLines.findIndexOf { - it.contains('org.eclipse.buildship.core.gradleclasspathcontainer') + def parser = new groovy.xml.XmlParser() + def launchXml = parser.parseText(contents) + def classpath = launchXml.listAttribute.find { it.@key == 'org.eclipse.jdt.launching.CLASSPATH' } + if (classpath == null) { + throw new GradleException("${name} is missing its explicit classpath") } - if (buildshipContainerLine < 0) { - throw new GradleException("${name} is missing the Buildship classpath container") + // A refresh can reuse an already isolated launch. Replace its old runtime + // archives too, but keep ForgeGradle's separate Slime Launcher entry. + def previousRuntime = classpath.listEntry.findAll { entry -> + def runtime = parser.parseText(entry.@value) + String archive = runtime.@externalArchive + runtime.@containerPath == 'org.eclipse.buildship.core.gradleclasspathcontainer' + || (archive && !file(archive).name.startsWith('slime-launcher-')) } - List runtimeEntries = productionRuntime.collect { File runtimeFile -> - String escapedPath = runtimeFile.canonicalPath - .replace('&', '&amp;') - .replace('<', '&lt;') - .replace('>', '&gt;') - (' ') + if (previousRuntime.isEmpty()) { + throw new GradleException("${name} is missing its production runtime entries") } - launchLines.remove(buildshipContainerLine) - launchLines.addAll(buildshipContainerLine, runtimeEntries) - contents = launchLines.join('\n') + '\n' + int runtimeIndex = classpath.children().indexOf(previousRuntime.first()) + previousRuntime.each { classpath.remove(it) } + def runtimeEntries = productionRuntime.collect { File runtimeFile -> + def archive = new Node(null, 'runtimeClasspathEntry', + [externalArchive: runtimeFile.path, type: '2', path: '5']) + new Node(null, 'listEntry', [value: groovy.xml.XmlUtil.serialize(archive)]) + } + classpath.children().addAll(runtimeIndex, runtimeEntries) + contents = groovy.xml.XmlUtil.serialize(launchXml) ['--cache', '--metadata', '--to-srg', '--to-obf'].each { option -> String prefix = option + ' ' diff --git a/gradle.properties b/gradle.properties index 4f8e26b..313353a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,8 +37,10 @@ cf_versions=1.16.5 poweradvantage_version=2.4.8.116051 poweradvantage_source_repository=MinecraftModDevelopmentMods/basePower -# Exact local-only Power source and immutable development artifact; publish source before hosted builds. -poweradvantage_source_ref=a21d0653129912e8d45bc443080b211eb09ae88c +# Released basePower and the matching source and development JAR. +poweradvantage_source_ref=04a90df489180c69dd57f7cda9ff5ff7e3c456ba +poweradvantage_curse_file_id=9501921 +poweradvantage_release_sha256=408C6B9D5BF065E37B76B59AB3E6DD649DFE045638F197C63532281939D701C7 poweradvantage_deobf_sha256=156674F6DF6007D351AD419416344356F6586452077FCAE2E9BC9404EE14A14B basemetals_version=3.1.1.116051 From 0f39c02e3ddea611965a94e5f6fa921fcc44025a Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Sun, 8 Nov 2026 00:06:31 +0000 Subject: [PATCH 3/3] Check the published basePower pin in Electric CI --- build.gradle | 5 +++++ .../resources/BuildWorkflowContractTest.java | 12 +++++++++--- tools/verification/Verify-ElectricEcj.ps1 | 2 +- tools/verify-native-port.js | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 0b20282..441da32 100644 --- a/build.gradle +++ b/build.gradle @@ -170,6 +170,11 @@ def defaultPowerAdvantageDeobfJar = file("../../PowerAdvantage/build/libs-dev/" def powerAdvantageDeobfJar = providers.gradleProperty('powerAdvantageDeobfJar') .map { file(it) } .getOrElse(defaultPowerAdvantageDeobfJar) + +tasks.named('test', Test) { + inputs.files('gradle.properties', 'build.gradle', '.github/workflows/ci.yml', '.github/workflows/codeql-analysis.yml', + 'tools/verify-native-port.js', 'tools/verification/Verify-ElectricEcj.ps1') +} if (!powerAdvantageDeobfJar.isFile()) { throw new GradleException("Missing PowerAdvantage deobf jar at ${powerAdvantageDeobfJar}. " + "Run gradlew.bat deobfJar in ../../PowerAdvantage first, or pass " diff --git a/src/test/java/zone/moddev/mc/baseelectric/resources/BuildWorkflowContractTest.java b/src/test/java/zone/moddev/mc/baseelectric/resources/BuildWorkflowContractTest.java index 7e32414..780484b 100644 --- a/src/test/java/zone/moddev/mc/baseelectric/resources/BuildWorkflowContractTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/resources/BuildWorkflowContractTest.java @@ -30,9 +30,13 @@ public class BuildWorkflowContractTest { } @Test public void dependencyPolicyPrecedesEveryPinnedCheckout() throws Exception { + String powerSource = "04a90df489180c69dd57f7cda9ff5ff7e3c456ba"; + String properties = new String(Files.readAllBytes(Paths.get("gradle.properties")), StandardCharsets.UTF_8); + assertTrue(properties.contains("poweradvantage_source_ref=" + powerSource)); + assertTrue(properties.contains("poweradvantage_curse_file_id=9501921")); for (String helper : new String[] {"tools/verify-native-port.js", "tools/verification/Verify-ElectricEcj.ps1"}) { String source = new String(Files.readAllBytes(Paths.get(helper)), StandardCharsets.UTF_8); - assertTrue(helper, source.contains("a21d0653129912e8d45bc443080b211eb09ae88c")); + assertTrue(helper, source.contains(powerSource)); assertTrue(helper, source.contains("156674F6DF6007D351AD419416344356F6586452077FCAE2E9BC9404EE14A14B")); assertFalse(helper, source.contains("2116a35a40dd150d79e7dfdcdc891637793178b7")); assertFalse(helper, source.contains("F58B93DAF03CF303F32B18CCCA140E55E886A2BA82732A3F286ADF3E31194B6A")); @@ -47,8 +51,10 @@ public class BuildWorkflowContractTest { assertTrue(source.contains("ref: a113e5d767169189f0e35ade1e173a12d550b00e")); assertTrue(source.contains("ref: 995f6cc4dd2d5eecc628a42e5c43fa5390c24bca")); assertTrue(source.contains("BaseMetals-3.1.1.116051-deobf.jar")); - assertTrue(source.contains("ref: a21d0653129912e8d45bc443080b211eb09ae88c")); - assertTrue(source.contains("156674F6DF6007D351AD419416344356F6586452077FCAE2E9BC9404EE14A14B")); + assertTrue(source.contains("ref: ${{ steps.pins.outputs.power_ref }}")); + assertTrue(source.contains("s/^poweradvantage_source_ref=//p")); + assertTrue(source.contains("s/^poweradvantage_deobf_sha256=//p")); + assertTrue(source.contains("power_ref=$power_ref")); assertFalse(source.contains("098d4625abc8a849bd1a11dcf697b3fee0cade7b")); assertFalse(source.contains("78E58DD2AB04E2B9F3267E5735C64AAE7E93EAC97571CB04485038862C853ED3")); assertFalse(source.contains("ce90c24c302d0ff3565db2db0c6c94a3b5f21f83")); diff --git a/tools/verification/Verify-ElectricEcj.ps1 b/tools/verification/Verify-ElectricEcj.ps1 index b1924c2..3736fa0 100644 --- a/tools/verification/Verify-ElectricEcj.ps1 +++ b/tools/verification/Verify-ElectricEcj.ps1 @@ -71,7 +71,7 @@ $report = [ordered]@{ status = 'RUNNING'; project = $ProjectRoot; evidence = $Ev try { $properties = ConvertFrom-StringData -StringData (Get-Content -LiteralPath (Join-Path $ProjectRoot 'gradle.properties') -Raw) if ($properties.mod_id -ne 'electricadvantage' -or $properties.mod_version -ne '2.2.8.116051' -or - $properties.poweradvantage_source_ref -ne 'a21d0653129912e8d45bc443080b211eb09ae88c' -or + $properties.poweradvantage_source_ref -ne '04a90df489180c69dd57f7cda9ff5ff7e3c456ba' -or $properties.poweradvantage_deobf_sha256 -ne '156674F6DF6007D351AD419416344356F6586452077FCAE2E9BC9404EE14A14B') { throw 'This verifier requires the pinned Electric 1.16.5 candidate' } diff --git a/tools/verify-native-port.js b/tools/verify-native-port.js index ec060b3..aeb57dd 100644 --- a/tools/verify-native-port.js +++ b/tools/verify-native-port.js @@ -29,7 +29,7 @@ check('Exact native target metadata', () => { for (const pair of ['minecraft_version=1.16.5', 'forge_version=36.2.34', 'mapping_channel=official', 'mapping_version=1.16.5', 'mcp_version=20210115.111550', 'mod_version=2.2.9.116051', 'poweradvantage_version=2.4.8.116051', - 'poweradvantage_source_ref=a21d0653129912e8d45bc443080b211eb09ae88c', + 'poweradvantage_source_ref=04a90df489180c69dd57f7cda9ff5ff7e3c456ba', 'poweradvantage_deobf_sha256=156674F6DF6007D351AD419416344356F6586452077FCAE2E9BC9404EE14A14B', 'basemetals_version=3.1.1.116051', 'orespawn_version=4.1.0.116051', 'java_version=8', 'gradle_java_version=17']) {