From 2ff9bfb6376e2463fb4f6fc42ced1a67b23cdab3 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Wed, 4 Nov 2026 23:21:14 +0000 Subject: [PATCH 1/4] Bring baseElectric to Minecraft 1.12.2 Keep existing 1.10 worlds readable under the base mod IDs, and build against the audited basePower dependency. --- .github/workflows/ci.yml | 47 ++++-- .github/workflows/codeql-analysis.yml | 35 ++++- .github/workflows/release-on-tag.yml | 4 +- CHANGELOG.txt | 8 +- README.md | 18 +-- build.gradle | 82 ++++++----- gradle.properties | 22 +-- .../moddev/mc/baseelectric}/Data.java | 6 +- .../mc/baseelectric}/ElectricAdvantage.java | 37 ++--- .../blocks/ElectricConduitBlock.java | 4 +- .../blocks/ElectricScaffoldBlock.java | 4 +- .../moddev/mc/baseelectric}/blocks/Ore.java | 2 +- .../baseelectric}/blocks/PumpPipeBlock.java | 2 +- .../common/IRechargeableItem.java | 2 +- .../compat/BaseMetalsCompat.java | 4 +- .../entities/HydroturbineEntity.java | 6 +- .../graphics/HydroturbineRenderer.java | 6 +- .../graphics/LaserDrillRenderer.java | 6 +- .../graphics/LaserTurretRenderer.java | 6 +- .../mc/baseelectric}/gui/ArcFurnaceGUI.java | 8 +- .../mc/baseelectric}/gui/BatteryArrayGUI.java | 8 +- .../baseelectric}/gui/ElectricDrillGUI.java | 8 +- .../mc/baseelectric}/gui/ElectricPumpGUI.java | 8 +- .../baseelectric}/gui/ElectricStillGUI.java | 8 +- .../mc/baseelectric}/gui/FabricatorGUI.java | 8 +- .../mc/baseelectric}/gui/GUIHelper.java | 4 +- .../baseelectric}/gui/GenericMachineGUI.java | 8 +- .../gui/GrowthChamberControllerGUI.java | 8 +- .../baseelectric}/gui/GrowthChamberGUI.java | 8 +- .../moddev/mc/baseelectric}/gui/OvenGUI.java | 8 +- .../baseelectric}/gui/PlasticRefineryGUI.java | 8 +- .../baseelectric}/gui/PowerGeneratorGUI.java | 8 +- .../mc/baseelectric}/gui/RockCrusherGUI.java | 8 +- .../moddev/mc/baseelectric}/init/Blocks.java | 18 +-- .../mc/baseelectric}/init/Enchantments.java | 4 +- .../mc/baseelectric}/init/Entities.java | 64 +++------ .../moddev/mc/baseelectric}/init/GUI.java | 8 +- .../moddev/mc/baseelectric}/init/Items.java | 8 +- .../baseelectric/init/OreSpawnWorldGen.java | 108 ++++++++++++++ .../moddev/mc/baseelectric}/init/Power.java | 2 +- .../moddev/mc/baseelectric}/init/Recipes.java | 8 +- .../mc/baseelectric}/init/TreasureChests.java | 22 +-- .../mc/baseelectric}/init/Villages.java | 2 +- .../mc/baseelectric}/items/BatteryItem.java | 6 +- .../machines/ElectricBatteryArrayBlock.java | 2 +- .../ElectricBatteryArrayTileEntity.java | 8 +- .../machines/ElectricCrusherBlock.java | 2 +- .../machines/ElectricCrusherTileEntity.java | 8 +- .../machines/ElectricDrillBlock.java | 6 +- .../machines/ElectricDrillTileEntity.java | 14 +- .../machines/ElectricFabricatorBlock.java | 2 +- .../ElectricFabricatorTileEntity.java | 8 +- .../machines/ElectricFurnaceBlock.java | 2 +- .../machines/ElectricFurnaceTileEntity.java | 6 +- .../machines/ElectricGeneratorBlock.java | 4 +- .../machines/ElectricGeneratorTileEntity.java | 4 +- .../machines/ElectricMachineBlock.java | 4 +- .../machines/ElectricMachineTileEntity.java | 4 +- .../machines/ElectricOvenBlock.java | 2 +- .../machines/ElectricOvenTileEntity.java | 6 +- .../machines/ElectricPumpBlock.java | 14 +- .../machines/ElectricPumpTileEntity.java | 20 +-- .../machines/ElectricStillBlock.java | 6 +- .../machines/ElectricStillTileEntity.java | 20 +-- .../machines/GrowthChamberBlock.java | 4 +- .../GrowthChamberControllerBlock.java | 12 +- .../GrowthChamberControllerTileEntity.java | 10 +- .../machines/GrowthChamberTileEntity.java | 8 +- .../machines/HydroelectricGeneratorBlock.java | 2 +- .../HydroelectricGeneratorTileEntity.java | 6 +- .../mc/baseelectric}/machines/LEDBlock.java | 4 +- .../baseelectric}/machines/LEDTileEntity.java | 6 +- .../machines/LaserTurretBlock.java | 2 +- .../machines/LaserTurretTileEntity.java | 8 +- .../machines/PhotovoltaicGeneratorBlock.java | 2 +- .../PhotovoltaicGeneratorTileEntity.java | 6 +- .../machines/PlasticRefineryBlock.java | 12 +- .../machines/PlasticRefineryTileEntity.java | 16 +-- .../SteamPoweredElectricGeneratorBlock.java | 6 +- ...eamPoweredElectricGeneratorTileEntity.java | 8 +- .../NotRecipeModeConditionFactory.java | 6 +- .../condition/RecipeModeConditionFactory.java | 6 +- .../util/LegacyFluidHandler.java | 2 +- .../util/crafting/ItemMatcher.java | 2 +- .../util/crafting/ItemRecord.java | 2 +- .../util/crafting/RecipeDeconstructor.java | 2 +- .../util/crafting/SerializedInventory.java | 2 +- .../util/farming/VirtualCrop.java | 4 +- .../blockstates/electric_battery_array.json | 12 ++ .../blockstates/electric_conduit.json | 70 +++++++++ .../blockstates/electric_crusher.json | 20 +++ .../blockstates/electric_drill.json | 16 +++ .../blockstates/electric_fabricator.json | 20 +++ .../blockstates/electric_furnace.json | 20 +++ .../blockstates/electric_oven.json | 20 +++ .../blockstates/electric_pcb_printer.json | 20 +++ .../blockstates/electric_pump.json | 20 +++ .../blockstates/electric_still.json | 20 +++ .../blockstates/electric_switch.json | 6 + .../blockstates/electric_track.json | 70 +++++++++ .../blockstates/geothermal_generator.json | 12 ++ .../blockstates/growth_chamber.json | 20 +++ .../growth_chamber_controller.json | 8 ++ .../blockstates/hydroelectric_generator.json | 12 ++ .../blockstates/laser_turret.json | 20 +++ .../blockstates/laser_turret_evil.json | 20 +++ .../baseelectric/blockstates/led_bar.json | 134 ++++++++++++++++++ .../baseelectric/blockstates/li_ore.json | 5 + .../blockstates/photovoltaic_generator.json | 12 ++ .../blockstates/plastic_refinery.json | 20 +++ .../blockstates/pump_pipe_electric.json | 5 + .../blockstates/steam_powered_generator.json | 12 ++ .../baseelectric/blockstates/sulfur_ore.json | 5 + .../assets/baseelectric/lang/de_de.lang | 54 +++++++ .../assets/baseelectric/lang/en_au.lang | 54 +++++++ .../assets/baseelectric/lang/en_ca.lang | 54 +++++++ .../assets/baseelectric/lang/en_en.lang | 54 +++++++ .../assets/baseelectric/lang/en_gb.lang | 54 +++++++ .../assets/baseelectric/lang/en_pt.lang | 54 +++++++ .../assets/baseelectric/lang/en_us.lang | 54 +++++++ .../assets/baseelectric/lang/es_es.lang | 55 +++++++ .../assets/baseelectric/lang/es_mx.lang | 53 +++++++ .../assets/baseelectric/lang/it_it.lang | 53 +++++++ .../assets/baseelectric/lang/ja_jp.lang | 54 +++++++ .../assets/baseelectric/lang/ko_ko.lang | 52 +++++++ .../assets/baseelectric/lang/pt_br.lang | 54 +++++++ .../assets/baseelectric/lang/zh_cn.lang | 55 +++++++ .../models/block/electric_battery_array.json | 10 ++ .../models/block/electric_conduit_0.json | 7 + .../models/block/electric_conduit_densuw.json | 7 + .../models/block/electric_conduit_desuw.json | 7 + .../models/block/electric_conduit_dnu.json | 7 + .../models/block/electric_conduit_ensw.json | 7 + .../models/block/electric_conduit_n.json | 7 + .../models/block/electric_conduit_ns.json | 7 + .../models/block/electric_conduit_nsuw.json | 7 + .../models/block/electric_conduit_nsw.json | 7 + .../models/block/electric_conduit_nuw.json | 7 + .../models/block/electric_conduit_nw.json | 7 + .../models/block/electric_crusher_off.json | 10 ++ .../models/block/electric_crusher_on.json | 10 ++ .../block/electric_crusher_powered.json | 10 ++ .../models/block/electric_drill_base.json | 6 +- .../models/block/electric_drill_off.json | 7 + .../models/block/electric_drill_on.json | 7 + .../models/block/electric_fabricator_off.json | 10 ++ .../models/block/electric_fabricator_on.json | 10 ++ .../block/electric_fabricator_powered.json | 10 ++ .../models/block/electric_furnace_off.json | 10 ++ .../models/block/electric_furnace_on.json | 10 ++ .../block/electric_furnace_powered.json | 10 ++ .../models/block/electric_machine_base.json | 2 +- .../models/block/electric_oven_off.json | 10 ++ .../models/block/electric_oven_on.json | 10 ++ .../models/block/electric_oven_powered.json | 10 ++ .../block/electric_pcb_printer_off.json | 10 ++ .../models/block/electric_pcb_printer_on.json | 10 ++ .../block/electric_pcb_printer_powered.json | 10 ++ .../models/block/electric_pump_off.json | 10 ++ .../models/block/electric_pump_on.json | 10 ++ .../models/block/electric_pump_powered.json | 10 ++ .../models/block/electric_still_off.json | 10 ++ .../models/block/electric_still_on.json | 10 ++ .../models/block/electric_still_powered.json | 10 ++ .../models/block/electric_switch_off.json | 7 + .../models/block/electric_switch_on.json | 7 + .../models/block/electric_track_0.json | 8 +- .../models/block/electric_track_densuw.json | 8 +- .../models/block/electric_track_desuw.json | 8 +- .../models/block/electric_track_dnu.json | 8 +- .../models/block/electric_track_ensw.json | 8 +- .../models/block/electric_track_n.json | 8 +- .../models/block/electric_track_ns.json | 8 +- .../models/block/electric_track_nsuw.json | 8 +- .../models/block/electric_track_nsw.json | 8 +- .../models/block/electric_track_nuw.json | 8 +- .../models/block/electric_track_nw.json | 8 +- .../models/block/geothermal_generator.json | 10 ++ .../block/growth_chamber_controller.json | 10 ++ .../models/block/growth_chamber_off.json | 10 ++ .../models/block/growth_chamber_on.json | 10 ++ .../models/block/growth_chamber_powered.json | 10 ++ .../block/hydroelectric_generator_off.json | 10 ++ .../block/hydroelectric_generator_on.json | 10 ++ .../models/block/laser_turret.json | 10 +- .../models/block/led_bar_off_densuw.json | 7 + .../models/block/led_bar_off_desuw.json | 7 + .../models/block/led_bar_off_dnu.json | 7 + .../models/block/led_bar_off_ensw.json | 7 + .../models/block/led_bar_off_n.json | 7 + .../models/block/led_bar_off_ns.json | 7 + .../models/block/led_bar_off_nsuw.json | 7 + .../models/block/led_bar_off_nsw.json | 7 + .../models/block/led_bar_off_nuw.json | 7 + .../models/block/led_bar_off_nw.json | 7 + .../models/block/led_bar_on_densuw.json | 7 + .../models/block/led_bar_on_desuw.json | 7 + .../models/block/led_bar_on_dnu.json | 7 + .../models/block/led_bar_on_ensw.json | 7 + .../models/block/led_bar_on_n.json | 7 + .../models/block/led_bar_on_ns.json | 7 + .../models/block/led_bar_on_nsuw.json | 7 + .../models/block/led_bar_on_nsw.json | 7 + .../models/block/led_bar_on_nuw.json | 7 + .../models/block/led_bar_on_nw.json | 7 + .../models/block/li_ore.json | 12 +- .../models/block/photovoltaic_generator.json | 2 +- .../models/block/plastic_refinery_off.json | 10 ++ .../models/block/plastic_refinery_on.json | 10 ++ .../block/plastic_refinery_powered.json | 10 ++ .../block/steam_powered_generator_off.json | 10 ++ .../block/steam_powered_generator_on.json | 10 ++ .../models/block/sulfur_ore.json | 2 +- .../models/item/alkaline_battery.json | 6 + .../models/item/battery_base.json | 2 +- .../models/item/blank_circuit_board.json | 6 + .../models/item/control_circuit.json | 6 + .../models/item/electric_battery_array.json | 4 + .../models/item/electric_conduit.json | 4 + .../models/item/electric_crusher.json | 4 + .../models/item/electric_drill.json | 4 + .../models/item/electric_fabricator.json | 4 + .../models/item/electric_furnace.json | 4 + .../models/item/electric_oven.json | 4 + .../models/item/electric_pcb_printer.json | 4 + .../models/item/electric_pump.json | 4 + .../models/item/electric_still.json | 4 + .../models/item/electric_switch.json | 3 + .../models/item/electric_track.json | 4 + .../models/item/generic_item.json | 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 + .../baseelectric/recipes/_factories.json | 6 + .../recipes/alkaline_battery.json | 2 +- .../blank_circuit_board_ingot_normal.json | 4 +- .../recipes/blank_circuit_board_plate.json | 2 +- .../recipes/control_circuit.json | 4 +- .../recipes/electric_battery_array.json | 2 +- .../electric_conduit_plastic_ingot.json | 2 +- .../recipes/electric_conduit_plastic_rod.json | 2 +- .../electric_conduit_rubber_ingot.json | 2 +- .../recipes/electric_conduit_rubber_rod.json | 2 +- .../recipes/electric_crusher.json | 2 +- .../recipes/electric_drill.json | 2 +- .../recipes/electric_fabricator.json | 2 +- .../recipes/electric_furnace.json | 2 +- .../recipes/electric_oven.json | 2 +- .../recipes/electric_pump.json | 2 +- .../recipes/electric_still.json | 2 +- .../recipes/electric_switch.json | 2 +- .../baseelectric/recipes/electric_track.json | 15 ++ .../recipes/growth_chamber.json | 2 +- .../recipes/growth_chamber_controller.json | 2 +- .../recipes/hydroelectric_generator.json | 2 +- .../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 | 2 +- .../recipes/laser_turret_emerald_diamond.json | 2 +- .../lead_acid_battery_dust_sulfur.json | 2 +- .../recipes/lead_acid_battery_sulfur.json | 2 +- .../recipes/led_bar.json | 2 +- .../recipes/lithium_battery.json | 2 +- .../recipes/nickel_hydride_battery.json | 2 +- .../recipes/photovoltaic_generator.json | 4 +- .../recipes/plastic_refinery.json | 2 +- .../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 +- .../recipes/silicon_blend.json | 2 +- .../recipes/solder_blend_tin_lead.json | 2 +- .../recipes/solder_blend_tin_silver.json | 2 +- .../recipes/steam_powered_generator.json | 2 +- .../blocks/electric_battery_array.png | Bin .../textures/blocks/electric_conduit.png | Bin .../textures/blocks/electric_crusher_off.png | Bin .../textures/blocks/electric_crusher_on.png | Bin .../blocks/electric_crusher_on.png.mcmeta | 6 +- .../blocks/electric_crusher_powered.png | Bin .../textures/blocks/electric_drill_off.png | Bin .../textures/blocks/electric_drill_on.png | Bin .../blocks/electric_drill_powered.png | Bin .../blocks/electric_fabricator_off.png | Bin .../blocks/electric_fabricator_on.png | Bin .../blocks/electric_fabricator_on.png.mcmeta | 32 ++--- .../blocks/electric_fabricator_powered.png | Bin .../textures/blocks/electric_furnace_off.png | Bin .../textures/blocks/electric_furnace_on.png | Bin .../blocks/electric_furnace_powered.png | Bin .../textures/blocks/electric_oven_off.png | Bin .../textures/blocks/electric_oven_on.png | Bin .../textures/blocks/electric_oven_powered.png | Bin .../blocks/electric_pcb_printer_off.png | Bin .../blocks/electric_pcb_printer_on.png | Bin .../blocks/electric_pcb_printer_powered.png | Bin .../textures/blocks/electric_pump_off.png | Bin .../textures/blocks/electric_pump_on.png | Bin .../textures/blocks/electric_still_off.png | Bin .../textures/blocks/electric_still_on.png | Bin .../blocks/electric_still_on.png.mcmeta | 6 +- .../blocks/electric_still_powered.png | Bin .../textures/blocks/electric_switch_off.png | Bin .../textures/blocks/electric_switch_on.png | Bin .../blocks/growth_chamber_controller.png | Bin .../textures/blocks/growth_chamber_off.png | Bin .../textures/blocks/growth_chamber_on.png | Bin .../blocks/growth_chamber_powered.png | Bin .../blocks/hydroelectric_generator_off.png | Bin .../blocks/hydroelectric_generator_on.png | Bin .../hydroelectric_generator_on.png.mcmeta | 6 +- .../textures/blocks/laser_drill_optic.png | Bin .../textures/blocks/laser_drill_optic_on.png | Bin .../textures/blocks/laser_turret_base.png | Bin .../textures/blocks/led_bar_off.png | Bin .../textures/blocks/led_bar_on.png | Bin .../textures/blocks/lithium_ore.png | Bin .../textures/blocks/machine_back.png | Bin .../textures/blocks/machine_side.png | Bin .../textures/blocks/machine_top.png | Bin .../textures/blocks/photovoltaic_cell.png | Bin .../textures/blocks/plastic_refinery_off.png | Bin .../textures/blocks/plastic_refinery_on.png | Bin .../blocks/steam_powered_generator_off.png | Bin .../blocks/steam_powered_generator_on.png | Bin .../steam_powered_generator_on.png.mcmeta | 6 +- .../textures/blocks/sulfur_ore.png | Bin .../textures/entity/hydroturbine.png | Bin .../textures/entity/laser_turret.png | Bin .../textures/entity/windturbine.png | Bin .../container/electric_battery_array_gui.png | Bin .../gui/container/electric_crusher_gui.png | Bin .../gui/container/electric_drill_gui.png | Bin .../gui/container/electric_fabricator_gui.png | Bin .../gui/container/electric_furnace_gui.png | Bin .../gui/container/electric_generator_gui.png | Bin .../gui/container/electric_machine_gui.png | Bin .../gui/container/electric_oven_gui.png | Bin .../gui/container/electric_pump_gui.png | Bin .../gui/container/electric_still_gui.png | Bin .../container/geothermal_generator_gui.png | Bin .../growth_chamber_controller_gui.png | Bin .../gui/container/growth_chamber_gui.png | Bin .../gui/container/pcb_printer_gui.png | Bin .../gui/container/plastic_refinery_gui.png | Bin .../textures/items/alkaline_battery.png | Bin .../textures/items/blank_circuit_board.png | Bin .../textures/items/control_circuit.png | Bin .../textures/items/integrated_circuit.png | Bin .../textures/items/lead_acid_battery.png | Bin .../textures/items/li_ingot.png | Bin .../textures/items/li_nugget.png | Bin .../textures/items/li_powder.png | Bin .../textures/items/lithium_battery.png | Bin .../textures/items/nickel_hydride_battery.png | Bin .../textures/items/petrolplastic_ingot.png | Bin .../textures/items/psu.png | Bin .../textures/items/silicon_ingot.png | Bin .../textures/items/silicon_mix.png | Bin .../textures/items/solder.png | Bin .../textures/items/solder_mix.png | Bin .../textures/items/sulfur_powder.png | Bin .../textures/materials/laser_beam.png | Bin .../textures/materials/machine_case.png | Bin .../blockstates/electric_battery_array.json | 12 -- .../blockstates/electric_conduit.json | 70 --------- .../blockstates/electric_crusher.json | 20 --- .../blockstates/electric_drill.json | 16 --- .../blockstates/electric_fabricator.json | 20 --- .../blockstates/electric_furnace.json | 20 --- .../blockstates/electric_oven.json | 20 --- .../blockstates/electric_pcb_printer.json | 20 --- .../blockstates/electric_pump.json | 20 --- .../blockstates/electric_still.json | 20 --- .../blockstates/electric_switch.json | 6 - .../blockstates/electric_track.json | 70 --------- .../blockstates/geothermal_generator.json | 12 -- .../blockstates/growth_chamber.json | 20 --- .../growth_chamber_controller.json | 8 -- .../blockstates/hydroelectric_generator.json | 12 -- .../blockstates/laser_turret.json | 20 --- .../blockstates/laser_turret_evil.json | 20 --- .../blockstates/led_bar.json | 134 ------------------ .../electricadvantage/blockstates/li_ore.json | 5 - .../blockstates/photovoltaic_generator.json | 12 -- .../blockstates/plastic_refinery.json | 20 --- .../blockstates/pump_pipe_electric.json | 5 - .../blockstates/steam_powered_generator.json | 12 -- .../blockstates/sulfur_ore.json | 5 - .../assets/electricadvantage/lang/de_de.lang | 54 ------- .../assets/electricadvantage/lang/en_au.lang | 54 ------- .../assets/electricadvantage/lang/en_ca.lang | 54 ------- .../assets/electricadvantage/lang/en_en.lang | 54 ------- .../assets/electricadvantage/lang/en_gb.lang | 54 ------- .../assets/electricadvantage/lang/en_pt.lang | 54 ------- .../assets/electricadvantage/lang/en_us.lang | 54 ------- .../assets/electricadvantage/lang/es_es.lang | 55 ------- .../assets/electricadvantage/lang/es_mx.lang | 53 ------- .../assets/electricadvantage/lang/it_it.lang | 53 ------- .../assets/electricadvantage/lang/ja_jp.lang | 54 ------- .../assets/electricadvantage/lang/ko_ko.lang | 52 ------- .../assets/electricadvantage/lang/pt_br.lang | 54 ------- .../assets/electricadvantage/lang/zh_cn.lang | 55 ------- .../models/block/electric_battery_array.json | 10 -- .../models/block/electric_conduit_0.json | 7 - .../models/block/electric_conduit_densuw.json | 7 - .../models/block/electric_conduit_desuw.json | 7 - .../models/block/electric_conduit_dnu.json | 7 - .../models/block/electric_conduit_ensw.json | 7 - .../models/block/electric_conduit_n.json | 7 - .../models/block/electric_conduit_ns.json | 7 - .../models/block/electric_conduit_nsuw.json | 7 - .../models/block/electric_conduit_nsw.json | 7 - .../models/block/electric_conduit_nuw.json | 7 - .../models/block/electric_conduit_nw.json | 7 - .../models/block/electric_crusher_off.json | 10 -- .../models/block/electric_crusher_on.json | 10 -- .../block/electric_crusher_powered.json | 10 -- .../models/block/electric_drill_off.json | 7 - .../models/block/electric_drill_on.json | 7 - .../models/block/electric_fabricator_off.json | 10 -- .../models/block/electric_fabricator_on.json | 10 -- .../block/electric_fabricator_powered.json | 10 -- .../models/block/electric_furnace_off.json | 10 -- .../models/block/electric_furnace_on.json | 10 -- .../block/electric_furnace_powered.json | 10 -- .../models/block/electric_oven_off.json | 10 -- .../models/block/electric_oven_on.json | 10 -- .../models/block/electric_oven_powered.json | 10 -- .../block/electric_pcb_printer_off.json | 10 -- .../models/block/electric_pcb_printer_on.json | 10 -- .../block/electric_pcb_printer_powered.json | 10 -- .../models/block/electric_pump_off.json | 10 -- .../models/block/electric_pump_on.json | 10 -- .../models/block/electric_pump_powered.json | 10 -- .../models/block/electric_still_off.json | 10 -- .../models/block/electric_still_on.json | 10 -- .../models/block/electric_still_powered.json | 10 -- .../models/block/electric_switch_off.json | 7 - .../models/block/electric_switch_on.json | 7 - .../models/block/geothermal_generator.json | 10 -- .../block/growth_chamber_controller.json | 10 -- .../models/block/growth_chamber_off.json | 10 -- .../models/block/growth_chamber_on.json | 10 -- .../models/block/growth_chamber_powered.json | 10 -- .../block/hydroelectric_generator_off.json | 10 -- .../block/hydroelectric_generator_on.json | 10 -- .../models/block/led_bar_off_densuw.json | 7 - .../models/block/led_bar_off_desuw.json | 7 - .../models/block/led_bar_off_dnu.json | 7 - .../models/block/led_bar_off_ensw.json | 7 - .../models/block/led_bar_off_n.json | 7 - .../models/block/led_bar_off_ns.json | 7 - .../models/block/led_bar_off_nsuw.json | 7 - .../models/block/led_bar_off_nsw.json | 7 - .../models/block/led_bar_off_nuw.json | 7 - .../models/block/led_bar_off_nw.json | 7 - .../models/block/led_bar_on_densuw.json | 7 - .../models/block/led_bar_on_desuw.json | 7 - .../models/block/led_bar_on_dnu.json | 7 - .../models/block/led_bar_on_ensw.json | 7 - .../models/block/led_bar_on_n.json | 7 - .../models/block/led_bar_on_ns.json | 7 - .../models/block/led_bar_on_nsuw.json | 7 - .../models/block/led_bar_on_nsw.json | 7 - .../models/block/led_bar_on_nuw.json | 7 - .../models/block/led_bar_on_nw.json | 7 - .../models/block/plastic_refinery_off.json | 10 -- .../models/block/plastic_refinery_on.json | 10 -- .../block/plastic_refinery_powered.json | 10 -- .../block/steam_powered_generator_off.json | 10 -- .../block/steam_powered_generator_on.json | 10 -- .../models/item/alkaline_battery.json | 6 - .../models/item/blank_circuit_board.json | 6 - .../models/item/control_circuit.json | 6 - .../models/item/electric_battery_array.json | 4 - .../models/item/electric_conduit.json | 4 - .../models/item/electric_crusher.json | 4 - .../models/item/electric_drill.json | 4 - .../models/item/electric_fabricator.json | 4 - .../models/item/electric_furnace.json | 4 - .../models/item/electric_oven.json | 4 - .../models/item/electric_pcb_printer.json | 4 - .../models/item/electric_pump.json | 4 - .../models/item/electric_still.json | 4 - .../models/item/electric_switch.json | 3 - .../models/item/electric_track.json | 4 - .../models/item/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 - .../electricadvantage/recipes/_factories.json | 6 - .../recipes/electric_track.json | 15 -- src/main/resources/mcmod.info | 6 +- ...tricOperationalHydroturbineAnchorTest.java | 2 +- .../entities/HydroturbinePersistenceTest.java | 2 +- .../mc/baseelectric}/gui/GUIHelperTest.java | 2 +- .../ElectricDrillMovementContractTest.java | 2 +- .../ElectricDrillPersistenceTest.java | 2 +- .../ElectricOperationalNativeDefectsTest.java | 4 +- .../ElectricOperationalPumpPickupTest.java | 4 +- .../ElectricOperationalRedstoneCacheTest.java | 10 +- ...ElectricOperationalSoundBroadcastTest.java | 2 +- .../ElectricOperationalStillCapacityTest.java | 10 +- .../GrowthChamberPersistenceTest.java | 2 +- 555 files changed, 2881 insertions(+), 2734 deletions(-) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/Data.java (79%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/ElectricAdvantage.java (77%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/blocks/ElectricConduitBlock.java (72%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/blocks/ElectricScaffoldBlock.java (93%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/blocks/Ore.java (97%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/blocks/PumpPipeBlock.java (98%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/common/IRechargeableItem.java (92%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/compat/BaseMetalsCompat.java (98%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/entities/HydroturbineEntity.java (95%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/graphics/HydroturbineRenderer.java (98%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/graphics/LaserDrillRenderer.java (96%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/graphics/LaserTurretRenderer.java (97%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/gui/ArcFurnaceGUI.java (91%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/gui/BatteryArrayGUI.java (89%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/gui/ElectricDrillGUI.java (88%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/gui/ElectricPumpGUI.java (89%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/gui/ElectricStillGUI.java (90%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/gui/FabricatorGUI.java (91%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/gui/GUIHelper.java (94%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/gui/GenericMachineGUI.java (88%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/gui/GrowthChamberControllerGUI.java (88%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/gui/GrowthChamberGUI.java (89%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/gui/OvenGUI.java (90%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/gui/PlasticRefineryGUI.java (90%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/gui/PowerGeneratorGUI.java (88%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/gui/RockCrusherGUI.java (89%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/init/Blocks.java (90%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/init/Enchantments.java (62%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/init/Entities.java (73%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/init/GUI.java (90%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/init/Items.java (94%) create mode 100644 src/main/java/zone/moddev/mc/baseelectric/init/OreSpawnWorldGen.java rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/init/Power.java (95%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/init/Recipes.java (90%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/init/TreasureChests.java (89%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/init/Villages.java (98%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/items/BatteryItem.java (95%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricBatteryArrayBlock.java (89%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricBatteryArrayTileEntity.java (95%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricCrusherBlock.java (88%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricCrusherTileEntity.java (94%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricDrillBlock.java (97%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricDrillTileEntity.java (97%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricFabricatorBlock.java (82%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricFabricatorTileEntity.java (96%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricFurnaceBlock.java (85%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricFurnaceTileEntity.java (95%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricGeneratorBlock.java (96%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricGeneratorTileEntity.java (98%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricMachineBlock.java (97%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricMachineTileEntity.java (99%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricOvenBlock.java (84%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricOvenTileEntity.java (94%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricPumpBlock.java (85%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricPumpTileEntity.java (94%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricStillBlock.java (89%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricStillTileEntity.java (94%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/GrowthChamberBlock.java (78%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/GrowthChamberControllerBlock.java (89%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/GrowthChamberControllerTileEntity.java (97%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/GrowthChamberTileEntity.java (96%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/HydroelectricGeneratorBlock.java (91%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/HydroelectricGeneratorTileEntity.java (92%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/LEDBlock.java (97%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/LEDTileEntity.java (92%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/LaserTurretBlock.java (97%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/LaserTurretTileEntity.java (98%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/PhotovoltaicGeneratorBlock.java (93%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/PhotovoltaicGeneratorTileEntity.java (94%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/PlasticRefineryBlock.java (82%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/PlasticRefineryTileEntity.java (95%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/SteamPoweredElectricGeneratorBlock.java (92%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/SteamPoweredElectricGeneratorTileEntity.java (93%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/recipe/condition/NotRecipeModeConditionFactory.java (78%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/recipe/condition/RecipeModeConditionFactory.java (78%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/util/LegacyFluidHandler.java (97%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/util/crafting/ItemMatcher.java (98%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/util/crafting/ItemRecord.java (95%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/util/crafting/RecipeDeconstructor.java (99%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/util/crafting/SerializedInventory.java (98%) rename src/main/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/util/farming/VirtualCrop.java (98%) create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_battery_array.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_conduit.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_crusher.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_drill.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_fabricator.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_furnace.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_oven.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_pcb_printer.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_pump.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_still.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_switch.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/electric_track.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/geothermal_generator.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/growth_chamber.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/growth_chamber_controller.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/hydroelectric_generator.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/laser_turret.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/laser_turret_evil.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/led_bar.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/li_ore.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/photovoltaic_generator.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/plastic_refinery.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/pump_pipe_electric.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/steam_powered_generator.json create mode 100644 src/main/resources/assets/baseelectric/blockstates/sulfur_ore.json create mode 100644 src/main/resources/assets/baseelectric/lang/de_de.lang create mode 100644 src/main/resources/assets/baseelectric/lang/en_au.lang create mode 100644 src/main/resources/assets/baseelectric/lang/en_ca.lang create mode 100644 src/main/resources/assets/baseelectric/lang/en_en.lang create mode 100644 src/main/resources/assets/baseelectric/lang/en_gb.lang create mode 100644 src/main/resources/assets/baseelectric/lang/en_pt.lang create mode 100644 src/main/resources/assets/baseelectric/lang/en_us.lang create mode 100644 src/main/resources/assets/baseelectric/lang/es_es.lang create mode 100644 src/main/resources/assets/baseelectric/lang/es_mx.lang create mode 100644 src/main/resources/assets/baseelectric/lang/it_it.lang create mode 100644 src/main/resources/assets/baseelectric/lang/ja_jp.lang create mode 100644 src/main/resources/assets/baseelectric/lang/ko_ko.lang create mode 100644 src/main/resources/assets/baseelectric/lang/pt_br.lang create mode 100644 src/main/resources/assets/baseelectric/lang/zh_cn.lang create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_battery_array.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_0.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_densuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_desuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_dnu.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_ensw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_n.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_ns.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_nsuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_nsw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_nuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_conduit_nw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_crusher_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_crusher_on.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_crusher_powered.json rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_drill_base.json (93%) create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_drill_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_drill_on.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_fabricator_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_fabricator_on.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_fabricator_powered.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_furnace_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_furnace_on.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_furnace_powered.json rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_machine_base.json (90%) create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_oven_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_oven_on.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_oven_powered.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_on.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_powered.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_pump_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_pump_on.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_pump_powered.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_still_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_still_on.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_still_powered.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_switch_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/electric_switch_on.json rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_0.json (90%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_densuw.json (95%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_desuw.json (95%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_dnu.json (94%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_ensw.json (94%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_n.json (93%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_ns.json (94%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_nsuw.json (94%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_nsw.json (93%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_nuw.json (93%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/electric_track_nw.json (92%) create mode 100644 src/main/resources/assets/baseelectric/models/block/geothermal_generator.json create mode 100644 src/main/resources/assets/baseelectric/models/block/growth_chamber_controller.json create mode 100644 src/main/resources/assets/baseelectric/models/block/growth_chamber_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/growth_chamber_on.json create mode 100644 src/main/resources/assets/baseelectric/models/block/growth_chamber_powered.json create mode 100644 src/main/resources/assets/baseelectric/models/block/hydroelectric_generator_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/hydroelectric_generator_on.json rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/laser_turret.json (77%) create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_off_densuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_off_desuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_off_dnu.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_off_ensw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_off_n.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_off_ns.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_off_nsuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_off_nsw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_off_nuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_off_nw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_on_densuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_on_desuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_on_dnu.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_on_ensw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_on_n.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_on_ns.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_on_nsuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_on_nsw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_on_nuw.json create mode 100644 src/main/resources/assets/baseelectric/models/block/led_bar_on_nw.json rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/li_ore.json (50%) rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/photovoltaic_generator.json (50%) create mode 100644 src/main/resources/assets/baseelectric/models/block/plastic_refinery_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/plastic_refinery_on.json create mode 100644 src/main/resources/assets/baseelectric/models/block/plastic_refinery_powered.json create mode 100644 src/main/resources/assets/baseelectric/models/block/steam_powered_generator_off.json create mode 100644 src/main/resources/assets/baseelectric/models/block/steam_powered_generator_on.json rename src/main/resources/assets/{electricadvantage => baseelectric}/models/block/sulfur_ore.json (52%) create mode 100644 src/main/resources/assets/baseelectric/models/item/alkaline_battery.json rename src/main/resources/assets/{electricadvantage => baseelectric}/models/item/battery_base.json (91%) create mode 100644 src/main/resources/assets/baseelectric/models/item/blank_circuit_board.json create mode 100644 src/main/resources/assets/baseelectric/models/item/control_circuit.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_battery_array.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_conduit.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_crusher.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_drill.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_fabricator.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_furnace.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_oven.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_pcb_printer.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_pump.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_still.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_switch.json create mode 100644 src/main/resources/assets/baseelectric/models/item/electric_track.json 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 create mode 100644 src/main/resources/assets/baseelectric/recipes/_factories.json rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/alkaline_battery.json (88%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/blank_circuit_board_ingot_normal.json (74%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/blank_circuit_board_plate.json (81%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/control_circuit.json (69%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/electric_battery_array.json (87%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/electric_conduit_plastic_ingot.json (84%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/electric_conduit_plastic_rod.json (83%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/electric_conduit_rubber_ingot.json (84%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/electric_conduit_rubber_rod.json (83%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/electric_crusher.json (90%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/electric_drill.json (89%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/electric_fabricator.json (88%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/electric_furnace.json (83%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/electric_oven.json (90%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/electric_pump.json (90%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/electric_still.json (90%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/electric_switch.json (86%) create mode 100644 src/main/resources/assets/baseelectric/recipes/electric_track.json rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/growth_chamber.json (90%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/growth_chamber_controller.json (88%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/hydroelectric_generator.json (89%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/integrated_circuit_copper_normal.json (77%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/integrated_circuit_copper_tech.json (83%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/integrated_circuit_gold_normal.json (77%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/integrated_circuit_gold_tech.json (83%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/integrated_circuit_tin_normal.json (76%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/integrated_circuit_tin_tech.json (83%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/laser_turret_diamond_emerald.json (91%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/laser_turret_emerald_diamond.json (91%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/lead_acid_battery_dust_sulfur.json (88%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/lead_acid_battery_sulfur.json (88%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/led_bar.json (89%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/lithium_battery.json (89%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/nickel_hydride_battery.json (87%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/photovoltaic_generator.json (81%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/plastic_refinery.json (90%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/power_supply_unit_iron_normal.json (82%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/power_supply_unit_plate_steel_apocalyptic.json (82%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/power_supply_unit_plate_steel_tech.json (82%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/power_supply_unit_steel_normal.json (82%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/silicon_blend.json (83%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/solder_blend_tin_lead.json (87%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/solder_blend_tin_silver.json (87%) rename src/main/resources/assets/{electricadvantage => baseelectric}/recipes/steam_powered_generator.json (89%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_battery_array.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_conduit.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_crusher_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_crusher_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_crusher_on.png.mcmeta (88%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_crusher_powered.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_drill_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_drill_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_drill_powered.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_fabricator_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_fabricator_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_fabricator_on.png.mcmeta (91%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_fabricator_powered.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_furnace_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_furnace_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_furnace_powered.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_oven_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_oven_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_oven_powered.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_pcb_printer_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_pcb_printer_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_pcb_printer_powered.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_pump_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_pump_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_still_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_still_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_still_on.png.mcmeta (88%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_still_powered.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_switch_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/electric_switch_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/growth_chamber_controller.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/growth_chamber_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/growth_chamber_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/growth_chamber_powered.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/hydroelectric_generator_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/hydroelectric_generator_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/hydroelectric_generator_on.png.mcmeta (88%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/laser_drill_optic.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/laser_drill_optic_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/laser_turret_base.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/led_bar_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/led_bar_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/lithium_ore.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/machine_back.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/machine_side.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/machine_top.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/photovoltaic_cell.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/plastic_refinery_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/plastic_refinery_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/steam_powered_generator_off.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/steam_powered_generator_on.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/steam_powered_generator_on.png.mcmeta (88%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/blocks/sulfur_ore.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/entity/hydroturbine.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/entity/laser_turret.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/entity/windturbine.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/electric_battery_array_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/electric_crusher_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/electric_drill_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/electric_fabricator_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/electric_furnace_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/electric_generator_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/electric_machine_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/electric_oven_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/electric_pump_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/electric_still_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/geothermal_generator_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/growth_chamber_controller_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/growth_chamber_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/pcb_printer_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/gui/container/plastic_refinery_gui.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/alkaline_battery.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/blank_circuit_board.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/control_circuit.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/integrated_circuit.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/lead_acid_battery.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/li_ingot.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/li_nugget.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/li_powder.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/lithium_battery.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/nickel_hydride_battery.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/petrolplastic_ingot.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/psu.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/silicon_ingot.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/silicon_mix.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/solder.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/solder_mix.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/items/sulfur_powder.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/materials/laser_beam.png (100%) rename src/main/resources/assets/{electricadvantage => baseelectric}/textures/materials/machine_case.png (100%) delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_battery_array.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_conduit.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_crusher.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_drill.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_fabricator.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_furnace.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_oven.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_pcb_printer.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_pump.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_still.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_switch.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/electric_track.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/geothermal_generator.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/growth_chamber.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/growth_chamber_controller.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/hydroelectric_generator.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/laser_turret.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/laser_turret_evil.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/led_bar.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/li_ore.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/photovoltaic_generator.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/plastic_refinery.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/pump_pipe_electric.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/steam_powered_generator.json delete mode 100644 src/main/resources/assets/electricadvantage/blockstates/sulfur_ore.json delete mode 100644 src/main/resources/assets/electricadvantage/lang/de_de.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/en_au.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/en_ca.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/en_en.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/en_gb.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/en_pt.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/en_us.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/es_es.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/es_mx.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/it_it.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/ja_jp.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/ko_ko.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/pt_br.lang delete mode 100644 src/main/resources/assets/electricadvantage/lang/zh_cn.lang delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_battery_array.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_0.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_densuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_desuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_dnu.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_ensw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_n.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_ns.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_nsuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_nsw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_nuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_conduit_nw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_crusher_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_crusher_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_crusher_powered.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_drill_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_drill_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_fabricator_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_fabricator_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_fabricator_powered.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_furnace_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_furnace_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_furnace_powered.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_oven_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_oven_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_oven_powered.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_powered.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_pump_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_pump_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_pump_powered.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_still_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_still_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_still_powered.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_switch_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/electric_switch_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/geothermal_generator.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/growth_chamber_controller.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/growth_chamber_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/growth_chamber_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/growth_chamber_powered.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/hydroelectric_generator_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/hydroelectric_generator_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_off_densuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_off_desuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_off_dnu.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_off_ensw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_off_n.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_off_ns.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_off_nsuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_off_nsw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_off_nuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_off_nw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_on_densuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_on_desuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_on_dnu.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_on_ensw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_on_n.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_on_ns.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_on_nsuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_on_nsw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_on_nuw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/led_bar_on_nw.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/plastic_refinery_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/plastic_refinery_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/plastic_refinery_powered.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/steam_powered_generator_off.json delete mode 100644 src/main/resources/assets/electricadvantage/models/block/steam_powered_generator_on.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/alkaline_battery.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/blank_circuit_board.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/control_circuit.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_battery_array.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_conduit.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_crusher.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_drill.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_fabricator.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_furnace.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_oven.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_pcb_printer.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_pump.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_still.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_switch.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/electric_track.json delete mode 100644 src/main/resources/assets/electricadvantage/models/item/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 delete mode 100644 src/main/resources/assets/electricadvantage/recipes/_factories.json delete mode 100644 src/main/resources/assets/electricadvantage/recipes/electric_track.json rename src/test/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/entities/ElectricOperationalHydroturbineAnchorTest.java (98%) rename src/test/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/entities/HydroturbinePersistenceTest.java (98%) rename src/test/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/gui/GUIHelperTest.java (97%) rename src/test/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricDrillMovementContractTest.java (97%) rename src/test/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricDrillPersistenceTest.java (97%) rename src/test/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricOperationalNativeDefectsTest.java (99%) rename src/test/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricOperationalPumpPickupTest.java (99%) rename src/test/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricOperationalRedstoneCacheTest.java (95%) rename src/test/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricOperationalSoundBroadcastTest.java (99%) rename src/test/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/ElectricOperationalStillCapacityTest.java (92%) rename src/test/java/{com/mcmoddev/electricadvantage => zone/moddev/mc/baseelectric}/machines/GrowthChamberPersistenceTest.java (98%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 188e9fb..463aa12 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ permissions: contents: read concurrency: - group: electricadvantage-1.12-${{ github.workflow }}-${{ github.ref }} + group: baseelectric-1.12-${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: @@ -29,10 +29,18 @@ jobs: - name: Check out pinned PowerAdvantage uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: - repository: MinecraftModDevelopmentMods/PowerAdvantage - ref: 40811a0be37174a0633998eb3d820d95755d35e8 + repository: MinecraftModDevelopmentMods/basePower + ref: 7b375587dd9e6ca57ea51473fa9892531ac73c75 path: .ci-dependencies/PowerAdvantage + - name: Check out pinned OreSpawn + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 + with: + repository: MinecraftModDevelopmentMods/OreSpawn + ref: 72205b9bb6bfff17cf69715c0d5bd4d2efd3b148 + path: .ci-dependencies/OreSpawn + persist-credentials: false + - name: Install Java 8 toolchain uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 with: @@ -48,8 +56,23 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6 + - name: Build pinned OreSpawn development jar + id: orespawn + shell: bash + run: | + set -euo pipefail + dependency="$GITHUB_WORKSPACE/.ci-dependencies/OreSpawn" + chmod +x "$dependency/gradlew" + ( + cd "$dependency" + ./gradlew deobfJar --no-daemon --stacktrace + ) + jar="$dependency/build/libs-dev/OreSpawn-4.1.3.112021-deobf.jar" + test -f "$jar" + echo "jar=$jar" >> "$GITHUB_OUTPUT" + - name: Build pinned PowerAdvantage development jar - id: poweradvantage + id: basepower shell: bash run: | set -euo pipefail @@ -60,9 +83,10 @@ jobs: cd "$dependency" bash gradle/stage-reborncore-release.sh "$mirror" ./gradlew deobfJar verifyReleaseDependencies \ + -PoreSpawnDeobfJar="${{ steps.orespawn.outputs.jar }}" \ -PrebornCoreVerificationRepository="$mirror" --no-daemon --stacktrace ) - jar="$dependency/build/libs-dev/PowerAdvantage-2.4.1.112021-deobf.jar" + jar="$dependency/build/libs-dev/basePower-2.4.4.112021-deobf.jar" test -f "$jar" echo "jar=$jar" >> "$GITHUB_OUTPUT" @@ -70,19 +94,20 @@ jobs: run: >- ./gradlew clean check build javadoc verifyReleaseDependencies verifyReleaseArtifacts writeReleaseChecksums verifyEclipseProductionClasspath - -PpowerAdvantageDeobfJar=${{ steps.poweradvantage.outputs.jar }} + -PoreSpawnDeobfJar="${{ steps.orespawn.outputs.jar }}" + -PpowerAdvantageDeobfJar=${{ steps.basepower.outputs.jar }} --no-daemon --stacktrace - name: Upload audited release candidate uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: ElectricAdvantage-1.12.2-${{ github.sha }} + name: baseElectric-1.12.2-${{ github.sha }} if-no-files-found: error retention-days: 30 path: | - build/libs/ElectricAdvantage-2.2.3.112021.jar - build/libs/ElectricAdvantage-2.2.3.112021-sources.jar - build/libs/ElectricAdvantage-2.2.3.112021-javadoc.jar + build/libs/baseElectric-2.2.6.112021.jar + build/libs/baseElectric-2.2.6.112021-sources.jar + build/libs/baseElectric-2.2.6.112021-javadoc.jar build/release/SHA256SUMS CHANGELOG.txt @@ -90,7 +115,7 @@ jobs: if: failure() uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: - name: ElectricAdvantage-1.12.2-diagnostics-${{ github.sha }} + name: baseElectric-1.12.2-diagnostics-${{ github.sha }} if-no-files-found: ignore retention-days: 14 path: | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 945ebb1..acfc6ea 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -29,10 +29,18 @@ jobs: - name: Check out pinned PowerAdvantage uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: - repository: MinecraftModDevelopmentMods/PowerAdvantage - ref: 40811a0be37174a0633998eb3d820d95755d35e8 + repository: MinecraftModDevelopmentMods/basePower + ref: 7b375587dd9e6ca57ea51473fa9892531ac73c75 path: .ci-dependencies/PowerAdvantage + - name: Check out pinned OreSpawn + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 + with: + repository: MinecraftModDevelopmentMods/OreSpawn + ref: 72205b9bb6bfff17cf69715c0d5bd4d2efd3b148 + path: .ci-dependencies/OreSpawn + persist-credentials: false + - name: Install Java 8 toolchain uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 with: @@ -48,8 +56,23 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6 + - name: Build pinned OreSpawn development jar + id: orespawn + shell: bash + run: | + set -euo pipefail + dependency="$GITHUB_WORKSPACE/.ci-dependencies/OreSpawn" + chmod +x "$dependency/gradlew" + ( + cd "$dependency" + ./gradlew deobfJar --no-daemon --stacktrace + ) + jar="$dependency/build/libs-dev/OreSpawn-4.1.3.112021-deobf.jar" + test -f "$jar" + echo "jar=$jar" >> "$GITHUB_OUTPUT" + - name: Build pinned PowerAdvantage development jar - id: poweradvantage + id: basepower shell: bash run: | set -euo pipefail @@ -60,9 +83,10 @@ jobs: cd "$dependency" bash gradle/stage-reborncore-release.sh "$mirror" ./gradlew deobfJar verifyReleaseDependencies \ + -PoreSpawnDeobfJar="${{ steps.orespawn.outputs.jar }}" \ -PrebornCoreVerificationRepository="$mirror" --no-daemon --stacktrace ) - jar="$dependency/build/libs-dev/PowerAdvantage-2.4.1.112021-deobf.jar" + jar="$dependency/build/libs-dev/basePower-2.4.4.112021-deobf.jar" test -f "$jar" echo "jar=$jar" >> "$GITHUB_OUTPUT" @@ -75,7 +99,8 @@ jobs: run: | chmod +x ./gradlew ./gradlew clean classes --rerun-tasks --no-build-cache --no-daemon --stacktrace \ - -PpowerAdvantageDeobfJar=${{ steps.poweradvantage.outputs.jar }} + -PoreSpawnDeobfJar="${{ steps.orespawn.outputs.jar }}" \ + -PpowerAdvantageDeobfJar=${{ steps.basepower.outputs.jar }} - name: Analyze uses: github/codeql-action/analyze@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4 diff --git a/.github/workflows/release-on-tag.yml b/.github/workflows/release-on-tag.yml index 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 189c1b8..a4ab30e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,10 @@ -Unreleased +2.2.6.112021 - baseElectric for Minecraft 1.12.2 + +- Continue Electric Advantage as baseElectric. Read 1.10.2 original and baseElectric tile IDs, including the older hydroelectric turbine names. +- Use OreSpawn 4 provider rules for sulfur and lithium while keeping existing player choices. +- Use matching basePower 1.12.2 and keep the earlier drill, battery, greenhouse and fluid-machine fixes. + +Earlier 1.12.2 test-coverage repairs - Check generator redstone before the first power pulse so a disabled solar panel cannot produce a startup burst. - Charge the moved electric drill its existing 250-unit track cost before saving its replacement, instead of charging the removed drill. diff --git a/README.md b/README.md index 932a3d7..d706ca1 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,25 @@ -# ElectricAdvantage +# baseElectric for Minecraft 1.12.2 -Electric Advantage adds electric machines, generators, automation, and infrastructure to Power Advantage for Minecraft 1.12.2. +baseElectric continues DrCyano's Electric Advantage, adding generators, batteries, wiring, greenhouses and electric machines to basePower. -## Drill Reload Fix +## Upgrading a world -Version `2.2.3.112021` keeps unfinished drill work when a chunk or world reloads. -Existing inventories, energy, orientation and saved-world names are unchanged. -The regression tests cover resumed progress and full server restarts. +Replace the installed Advantage family together. baseElectric `2.2.6.112021` reads the original Electric Advantage and released baseElectric 1.10.2 tile and turbine identities. Back up the complete save and its configuration, then test a copy and check charge, fluid and machine state again after a full restart. + +[World upgrade guide](https://github.com/MinecraftModDevelopmentMods/basePower/blob/master-1.12.2/docs/1.12-upgrade.md) | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/baseelectric) ## Building Minecraft 1.12.2 The `master-1.12.2` build uses ForgeGradle 7.0.34 and Gradle 9.6.1. Run Gradle with Java 17; Gradle resolves the Java 8 toolchain used for compilation. -First build the pinned sibling PowerAdvantage development jar: +First build the pinned OreSpawn and sibling basePower development jars: ```text cd ..\..\PowerAdvantage gradlew.bat deobfJar ``` -Then build and audit ElectricAdvantage: +Back in the baseElectric checkout, build and audit the release: ```text gradlew.bat clean check build javadoc verifyReleaseDependencies verifyReleaseArtifacts writeReleaseChecksums verifyEclipseProductionClasspath @@ -33,7 +33,7 @@ For Eclipse, import this repository as an existing Gradle project and run: gradlew.bat cleanEclipse verifyEclipseProductionClasspath ``` -Power Advantage is required at compile time and runtime but is never bundled. Base Metals remains a required distribution dependency while its integrations stay reflection-based and absent from the compile classpath. +basePower is required at compile time and runtime but is never bundled. For a different checkout layout, supply `-PpowerAdvantageDeobfJar=` and `-PoreSpawnDeobfJar=`. The expected commits and hashes are in `gradle.properties`. Base Metals remains a distribution dependency, but its integrations do not require it at compile time. ## Hydroturbine Persistence diff --git a/build.gradle b/build.gradle index 104c438..e947061 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+/ }) { @@ -150,10 +150,12 @@ repositories { // Local builds use the sibling FG7 output; CI supplies the same pinned jar via // -PpowerAdvantageDeobfJar after building the audited upstream commit. def defaultPowerAdvantageDeobfJar = file("../../PowerAdvantage/build/libs-dev/" \ - + "PowerAdvantage-${project.poweradvantage_version}-deobf.jar") + + "basePower-${project.poweradvantage_version}-deobf.jar") def powerAdvantageDeobfJar = providers.gradleProperty('powerAdvantageDeobfJar') .map { file(it) } .getOrElse(defaultPowerAdvantageDeobfJar) +def oreSpawnJar = file(providers.gradleProperty('oreSpawnDeobfJar').getOrElse( + "../../../../MinecraftMineralogy/OS112/OreSpawn/build/libs-dev/OreSpawn-${project.orespawn_version}-deobf.jar")) if (!powerAdvantageDeobfJar.isFile()) { throw new GradleException("Missing PowerAdvantage deobf jar at ${powerAdvantageDeobfJar}. " + "Run gradlew.bat deobfJar in ../../PowerAdvantage first, or pass " @@ -169,6 +171,7 @@ dependencies { // PowerAdvantage is required at runtime but remains a separate mod jar. compileOnly files(powerAdvantageDeobfJar) runtimeOnly files(powerAdvantageDeobfJar) + implementation files(oreSpawnJar) testImplementation 'junit:junit:4.13.2' testImplementation files(powerAdvantageDeobfJar) } @@ -300,7 +303,7 @@ tasks.register('verifyReleaseConfiguration') { group = 'verification' description = 'Validates release identity, target metadata, and dependency policy.' doLast { - if (project.mod_version != '2.2.3.112021') { + if (project.mod_version != '2.2.6.112021') { throw new GradleException("Unexpected ElectricAdvantage release version: ${project.mod_version}") } if (project.minecraft_version != '1.12.2' @@ -315,22 +318,22 @@ tasks.register('verifyReleaseConfiguration') { || project.gradle_java_version != '17') { throw new GradleException('Unexpected release dispatcher target metadata') } - if (project.mod_id != 'electricadvantage' - || project.group.toString() != 'com.mcmoddev.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.12.2') { throw new GradleException('Unexpected CurseForge dependency or game-version metadata') } - if (project.poweradvantage_version != '2.4.1.112021' - || project.poweradvantage_source_repository != 'MinecraftModDevelopmentMods/PowerAdvantage' - || project.poweradvantage_source_ref != '40811a0be37174a0633998eb3d820d95755d35e8' - || project.poweradvantage_deobf_sha256 != 'DE7759033A094718E1341CC82B9912425A24A035DBD7F91D590D8B921F08DEB2') { + if (project.poweradvantage_version != '2.4.4.112021' + || project.poweradvantage_source_repository != 'MinecraftModDevelopmentMods/basePower' + || project.poweradvantage_source_ref != '7b375587dd9e6ca57ea51473fa9892531ac73c75' + || project.poweradvantage_deobf_sha256 != '66FBC92F8A14B54ED9A33482A99AF21B1FDA23CCFC9E817AF4D2BD8DE0EB0A78') { throw new GradleException('Unexpected PowerAdvantage compile dependency identity') } ['.github/workflows/ci.yml', '.github/workflows/codeql-analysis.yml'].each { workflowPath -> @@ -341,16 +344,16 @@ tasks.register('verifyReleaseConfiguration') { } } String mainSource = file( - 'src/main/java/com/mcmoddev/electricadvantage/ElectricAdvantage.java').getText('UTF-8') - if (!mainSource.contains('MODID = "electricadvantage"') - || !mainSource.contains('VERSION = "2.2.3.112021"') - || !mainSource.contains('dependencies = "required-after:poweradvantage;after:basemetals"')) { + 'src/main/java/zone/moddev/mc/baseelectric/ElectricAdvantage.java').getText('UTF-8') + if (!mainSource.contains('MODID = "baseelectric"') + || !mainSource.contains('VERSION = "2.2.6.112021"') + || !mainSource.contains('required-after:basepower@[2.4.4.112021,);required-after:orespawn@[4.1.3,5.0.0);after:basemetals')) { throw new GradleException('ElectricAdvantage source identity or dependency policy changed') } def metadata = new JsonSlurper().parse(file('src/main/resources/mcmod.info')) def mod = metadata instanceof List ? metadata.first() : metadata - if (mod.modid != 'electricadvantage' - || mod.url != 'https://github.com/MinecraftModDevelopmentMods/ElectricAdvantage') { + if (mod.modid != 'baseelectric' + || mod.url != 'https://github.com/MinecraftModDevelopmentMods/baseElectric') { throw new GradleException('Source mcmod.info does not use the stable ElectricAdvantage identity') } } @@ -370,8 +373,8 @@ tasks.register('verifyReleaseDependencies') { new ZipFile(powerAdvantageDeobfJar).withCloseable { zip -> ['cyano/poweradvantage/api/PoweredEntity.class', 'cyano/poweradvantage/api/GUIBlock.class', - 'com/mcmoddev/poweradvantage/conduitnetwork/ConduitRegistry.class', - 'com/mcmoddev/poweradvantage/init/Fluids.class'].each { required -> + 'zone/moddev/mc/basepower/conduitnetwork/ConduitRegistry.class', + 'zone/moddev/mc/basepower/init/Fluids.class'].each { required -> if (zip.getEntry(required) == null) { throw new GradleException("PowerAdvantage dependency is missing ${required}") } @@ -390,7 +393,12 @@ tasks.register('verifyReleaseDependencies') { if (!runtimeFiles.contains(powerAdvantageDeobfJar.canonicalFile)) { throw new GradleException('PowerAdvantage is missing from runtimeClasspath') } - List forbiddenRuntimeMods = runtimeFiles.collect { it.name.toLowerCase(Locale.ROOT) } + if (!runtimeFiles.contains(oreSpawnJar.canonicalFile) || !compileFiles.contains(oreSpawnJar.canonicalFile) + || MessageDigest.getInstance('SHA-256').digest(oreSpawnJar.bytes).encodeHex() + .toString().toUpperCase(Locale.ROOT) != project.orespawn_deobf_sha256) { + throw new GradleException('Missing or unexpected OreSpawn development artifact') + } + List forbiddenRuntimeMods = (runtimeFiles - oreSpawnJar.canonicalFile).collect { it.name.toLowerCase(Locale.ROOT) } .findAll { name -> name.contains('basemetals') || name.contains('orespawn') || name.contains('rf-api') || name.contains('reborncore') @@ -441,19 +449,19 @@ tasks.register('verifyReleaseArtifacts') { new ZipFile(mainJar).withCloseable { zip -> List names = zip.entries().collect { it.name } ['mcmod.info', 'pack.mcmeta', - 'com/mcmoddev/electricadvantage/ElectricAdvantage.class', - 'com/mcmoddev/electricadvantage/machines/ElectricDrillTileEntity.class', - 'com/mcmoddev/electricadvantage/machines/ElectricPumpTileEntity.class', - 'com/mcmoddev/electricadvantage/machines/LaserTurretTileEntity.class', - 'assets/electricadvantage/lang/en_us.lang'].each { required -> + '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/LaserTurretTileEntity.class', + 'assets/baseelectric/lang/en_us.lang'].each { required -> if (!names.contains(required)) { throw new GradleException("Release jar is missing ${required}") } } ['agent-notes/', '.codex/', 'src/test/', 'fernflower_abstract_parameter_names.txt', - 'cyano/poweradvantage/', - 'com/mcmoddev/poweradvantage/', 'cyano/basemetals/', 'com/mcmoddev/lib/', - 'cyano/orespawn/', 'com/mcmoddev/orespawn/', 'cofh/api/', 'reborncore/', + 'cyano/basepower/', + 'zone/moddev/mc/basepower/', 'cyano/basemetals/', 'com/mcmoddev/lib/', + 'cyano/orespawn/', 'com/mcmoddev/orespawn/', 'zone/moddev/mc/orespawn/', 'cofh/api/', 'reborncore/', 'net/minecraft/', 'net/minecraftforge/'].each { forbidden -> if (names.any { it.contains(forbidden) }) { throw new GradleException("Release jar contains forbidden entry matching ${forbidden}") @@ -488,8 +496,8 @@ tasks.register('verifyReleaseArtifacts') { } new ZipFile(new File(libs, expectedReleaseFiles.get()[1])).withCloseable { sourceZip -> - if (sourceZip.getEntry('com/mcmoddev/electricadvantage/ElectricAdvantage.java') == null - || sourceZip.getEntry('com/mcmoddev/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') } } @@ -587,7 +595,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' @@ -595,9 +603,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' } } } @@ -817,7 +825,7 @@ tasks.register('verifyEclipseProductionClasspath') { if (contents.contains('org.eclipse.buildship.core.gradleclasspathcontainer')) { throw new GradleException("${name} exposes compileOnly dependencies at runtime") } - ['BaseMetals', 'OreSpawn', 'RF-API.jar', 'RebornCore-1.12.2'].each { forbiddenDependency -> + ['BaseMetals', 'RF-API.jar', 'RebornCore-1.12.2'].each { forbiddenDependency -> if (contents.toLowerCase(Locale.ROOT).contains(forbiddenDependency.toLowerCase(Locale.ROOT))) { throw new GradleException( "${name} includes forbidden runtime dependency ${forbiddenDependency}") @@ -875,7 +883,7 @@ tasks.register('verifyModelAssets') { int separator = reference.indexOf(':') String namespace = separator >= 0 ? reference.substring(0, separator) : 'minecraft' String path = separator >= 0 ? reference.substring(separator + 1) : reference - if (namespace != project.mod_id && namespace != 'poweradvantage') return + if (namespace != project.mod_id && namespace != 'basepower') return String suffix = assetType == 'textures' ? '.png' : '.json' String targetPath = "assets/${namespace}/${assetType}/${path}${suffix}" diff --git a/gradle.properties b/gradle.properties index 5cc73ad..9a0a19d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,21 +19,23 @@ java_version=8 java_toolchain_version=8.0.502+7 java_setup_version=8.0.502+7 gradle_java_version=17 -curseforge_project_id=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.3.112021 -mod_group=com.mcmoddev.electricadvantage +mod_version=2.2.6.112021 +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.12.2 -poweradvantage_version=2.4.1.112021 -poweradvantage_source_repository=MinecraftModDevelopmentMods/PowerAdvantage -poweradvantage_source_ref=40811a0be37174a0633998eb3d820d95755d35e8 -poweradvantage_deobf_sha256=DE7759033A094718E1341CC82B9912425A24A035DBD7F91D590D8B921F08DEB2 +poweradvantage_version=2.4.4.112021 +poweradvantage_source_repository=MinecraftModDevelopmentMods/basePower +poweradvantage_source_ref=7b375587dd9e6ca57ea51473fa9892531ac73c75 +poweradvantage_deobf_sha256=66FBC92F8A14B54ED9A33482A99AF21B1FDA23CCFC9E817AF4D2BD8DE0EB0A78 +orespawn_version=4.1.3.112021 +orespawn_deobf_sha256=E10D9D0409784F3D4260889186A2483E72D1EC838F2BEAD78BE69149B6975198 diff --git a/src/main/java/com/mcmoddev/electricadvantage/Data.java b/src/main/java/zone/moddev/mc/baseelectric/Data.java similarity index 79% rename from src/main/java/com/mcmoddev/electricadvantage/Data.java rename to src/main/java/zone/moddev/mc/baseelectric/Data.java index 640ca0c..8fcdb9f 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/Data.java +++ b/src/main/java/zone/moddev/mc/baseelectric/Data.java @@ -1,4 +1,4 @@ -package com.mcmoddev.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/com/mcmoddev/electricadvantage/ElectricAdvantage.java b/src/main/java/zone/moddev/mc/baseelectric/ElectricAdvantage.java similarity index 77% rename from src/main/java/com/mcmoddev/electricadvantage/ElectricAdvantage.java rename to src/main/java/zone/moddev/mc/baseelectric/ElectricAdvantage.java index 63b6bb6..7b739b1 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/ElectricAdvantage.java +++ b/src/main/java/zone/moddev/mc/baseelectric/ElectricAdvantage.java @@ -1,7 +1,8 @@ -package com.mcmoddev.electricadvantage; +package zone.moddev.mc.baseelectric; -import com.mcmoddev.electricadvantage.init.*; -import com.mcmoddev.electricadvantage.util.crafting.RecipeDeconstructor; +import zone.moddev.mc.baseelectric.init.*; +import zone.moddev.mc.baseelectric.util.crafting.RecipeDeconstructor; +import zone.moddev.mc.basepower.compat.LegacyIdentity; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.Mod; @@ -12,25 +13,21 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.io.IOException; -import java.nio.charset.Charset; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; import java.util.Arrays; import java.util.HashSet; import java.util.Set; @Mod(modid = ElectricAdvantage.MODID, version = ElectricAdvantage.VERSION, name=ElectricAdvantage.NAME, - dependencies = "required-after:poweradvantage;after:basemetals", + dependencies = "required-after:basepower@[2.4.4.112021,);required-after:orespawn@[4.1.3,5.0.0);after:basemetals", acceptedMinecraftVersions = "[1.12.2]") public class ElectricAdvantage {/** The identifier for this mod */ - public static final String MODID = "electricadvantage"; + public static final String MODID = "baseelectric"; + public static final String LEGACY_MODID = "electricadvantage"; /** The display name for this mod */ - public static final String NAME = "Electric Advantage"; + public static final String NAME = "baseElectric"; /** The version of this mod, in the format major.minor.update */ - public static final String VERSION = "2.2.3.112021"; + public static final String VERSION = "2.2.6.112021"; public static ElectricAdvantage INSTANCE = null; @@ -50,7 +47,8 @@ public void preInit(FMLPreInitializationEvent event) INSTANCE = this; Entities.registerDataFixers(); - Configuration config = new Configuration(event.getSuggestedConfigurationFile()); + Configuration config = new Configuration(LegacyIdentity.migrateConfiguration( + event.getSuggestedConfigurationFile(), LEGACY_MODID)); config.load(); RecipeDeconstructor.RECURSION_LIMIT = config.getInt("recursion_limit", "fabricator", RecipeDeconstructor.RECURSION_LIMIT, @@ -59,17 +57,6 @@ public void preInit(FMLPreInitializationEvent event) + "number to fabricate especially complex recipes. If fabricators are causing too much server lag, " + "try reducing this number."); - Path orespawnFolder = Paths.get(event.getSuggestedConfigurationFile().toPath().getParent().toString(),"orespawn"); - Path orespawnFile = Paths.get(orespawnFolder.toString(),MODID+".json"); - if(!Files.exists(orespawnFile)){ - try{ - Files.createDirectories(orespawnFile.getParent()); - Files.write(orespawnFile, Arrays.asList(Data.ORESPAWN_FILE_CONTENTS.split("\n")), Charset.forName("UTF-8")); - } catch (IOException e) { - FMLLog.severe(MODID+": Error: Failed to write file "+orespawnFile); - } - } - LASER_SOUND = config.getString("laser_sound", "options", LASER_SOUND, "Set the sound to use when the laser fires"); PLASTIC_FLUID_MATERIALS.addAll(Arrays.asList(config.getString("petrolplastic_fluids", "options", @@ -81,6 +68,8 @@ public void preInit(FMLPreInitializationEvent event) Blocks.init(); Items.init(); + OreSpawnWorldGen.register(config.getConfigFile().toPath().getParent()); + LegacyIdentity.migrateAdditionalLootTables(config.getConfigFile().toPath().getParent(), LEGACY_MODID, MODID); TreasureChests.init(config.getConfigFile().toPath().getParent()); diff --git a/src/main/java/com/mcmoddev/electricadvantage/blocks/ElectricConduitBlock.java b/src/main/java/zone/moddev/mc/baseelectric/blocks/ElectricConduitBlock.java similarity index 72% rename from src/main/java/com/mcmoddev/electricadvantage/blocks/ElectricConduitBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/blocks/ElectricConduitBlock.java index 25cb7e7..681ac0e 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/blocks/ElectricConduitBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/blocks/ElectricConduitBlock.java @@ -1,6 +1,6 @@ -package com.mcmoddev.electricadvantage.blocks; +package zone.moddev.mc.baseelectric.blocks; -import com.mcmoddev.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/com/mcmoddev/electricadvantage/blocks/ElectricScaffoldBlock.java b/src/main/java/zone/moddev/mc/baseelectric/blocks/ElectricScaffoldBlock.java similarity index 93% rename from src/main/java/com/mcmoddev/electricadvantage/blocks/ElectricScaffoldBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/blocks/ElectricScaffoldBlock.java index 18e7d64..eac6a58 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/blocks/ElectricScaffoldBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/blocks/ElectricScaffoldBlock.java @@ -1,6 +1,6 @@ -package com.mcmoddev.electricadvantage.blocks; +package zone.moddev.mc.baseelectric.blocks; -import com.mcmoddev.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/mcmoddev/electricadvantage/blocks/Ore.java b/src/main/java/zone/moddev/mc/baseelectric/blocks/Ore.java similarity index 97% rename from src/main/java/com/mcmoddev/electricadvantage/blocks/Ore.java rename to src/main/java/zone/moddev/mc/baseelectric/blocks/Ore.java index 401d755..e6970f6 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/blocks/Ore.java +++ b/src/main/java/zone/moddev/mc/baseelectric/blocks/Ore.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.blocks; +package zone.moddev.mc.baseelectric.blocks; import net.minecraft.block.Block; import net.minecraft.block.SoundType; diff --git a/src/main/java/com/mcmoddev/electricadvantage/blocks/PumpPipeBlock.java b/src/main/java/zone/moddev/mc/baseelectric/blocks/PumpPipeBlock.java similarity index 98% rename from src/main/java/com/mcmoddev/electricadvantage/blocks/PumpPipeBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/blocks/PumpPipeBlock.java index c695d13..c977d7c 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/blocks/PumpPipeBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/blocks/PumpPipeBlock.java @@ -1,4 +1,4 @@ -package com.mcmoddev.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/com/mcmoddev/electricadvantage/common/IRechargeableItem.java b/src/main/java/zone/moddev/mc/baseelectric/common/IRechargeableItem.java similarity index 92% rename from src/main/java/com/mcmoddev/electricadvantage/common/IRechargeableItem.java rename to src/main/java/zone/moddev/mc/baseelectric/common/IRechargeableItem.java index 7c6cb44..27285ee 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/common/IRechargeableItem.java +++ b/src/main/java/zone/moddev/mc/baseelectric/common/IRechargeableItem.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.common; +package zone.moddev.mc.baseelectric.common; import cyano.poweradvantage.api.ConduitType; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/mcmoddev/electricadvantage/compat/BaseMetalsCompat.java b/src/main/java/zone/moddev/mc/baseelectric/compat/BaseMetalsCompat.java similarity index 98% rename from src/main/java/com/mcmoddev/electricadvantage/compat/BaseMetalsCompat.java rename to src/main/java/zone/moddev/mc/baseelectric/compat/BaseMetalsCompat.java index 47541c4..1ad2f00 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/compat/BaseMetalsCompat.java +++ b/src/main/java/zone/moddev/mc/baseelectric/compat/BaseMetalsCompat.java @@ -1,6 +1,6 @@ -package com.mcmoddev.electricadvantage.compat; +package zone.moddev.mc.baseelectric.compat; -import com.mcmoddev.electricadvantage.ElectricAdvantage; +import zone.moddev.mc.baseelectric.ElectricAdvantage; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/mcmoddev/electricadvantage/entities/HydroturbineEntity.java b/src/main/java/zone/moddev/mc/baseelectric/entities/HydroturbineEntity.java similarity index 95% rename from src/main/java/com/mcmoddev/electricadvantage/entities/HydroturbineEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/entities/HydroturbineEntity.java index 95e5bd4..7d2f67f 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/entities/HydroturbineEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/entities/HydroturbineEntity.java @@ -1,7 +1,7 @@ -package com.mcmoddev.electricadvantage.entities; +package zone.moddev.mc.baseelectric.entities; -import com.mcmoddev.electricadvantage.init.Power; -import com.mcmoddev.electricadvantage.machines.HydroelectricGeneratorTileEntity; +import zone.moddev.mc.baseelectric.init.Power; +import zone.moddev.mc.baseelectric.machines.HydroelectricGeneratorTileEntity; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/com/mcmoddev/electricadvantage/graphics/HydroturbineRenderer.java b/src/main/java/zone/moddev/mc/baseelectric/graphics/HydroturbineRenderer.java similarity index 98% rename from src/main/java/com/mcmoddev/electricadvantage/graphics/HydroturbineRenderer.java rename to src/main/java/zone/moddev/mc/baseelectric/graphics/HydroturbineRenderer.java index 5e0d56d..4996d02 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/graphics/HydroturbineRenderer.java +++ b/src/main/java/zone/moddev/mc/baseelectric/graphics/HydroturbineRenderer.java @@ -1,7 +1,7 @@ -package com.mcmoddev.electricadvantage.graphics; +package zone.moddev.mc.baseelectric.graphics; -import com.mcmoddev.electricadvantage.ElectricAdvantage; -import com.mcmoddev.electricadvantage.entities.HydroturbineEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.entities.HydroturbineEntity; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/com/mcmoddev/electricadvantage/graphics/LaserDrillRenderer.java b/src/main/java/zone/moddev/mc/baseelectric/graphics/LaserDrillRenderer.java similarity index 96% rename from src/main/java/com/mcmoddev/electricadvantage/graphics/LaserDrillRenderer.java rename to src/main/java/zone/moddev/mc/baseelectric/graphics/LaserDrillRenderer.java index 356b7e2..86b3278 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/graphics/LaserDrillRenderer.java +++ b/src/main/java/zone/moddev/mc/baseelectric/graphics/LaserDrillRenderer.java @@ -1,7 +1,7 @@ -package com.mcmoddev.electricadvantage.graphics; +package zone.moddev.mc.baseelectric.graphics; -import com.mcmoddev.electricadvantage.ElectricAdvantage; -import com.mcmoddev.electricadvantage.machines.ElectricDrillTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricDrillTileEntity; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/com/mcmoddev/electricadvantage/graphics/LaserTurretRenderer.java b/src/main/java/zone/moddev/mc/baseelectric/graphics/LaserTurretRenderer.java similarity index 97% rename from src/main/java/com/mcmoddev/electricadvantage/graphics/LaserTurretRenderer.java rename to src/main/java/zone/moddev/mc/baseelectric/graphics/LaserTurretRenderer.java index 403ba0f..b97da2b 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/graphics/LaserTurretRenderer.java +++ b/src/main/java/zone/moddev/mc/baseelectric/graphics/LaserTurretRenderer.java @@ -1,7 +1,7 @@ -package com.mcmoddev.electricadvantage.graphics; +package zone.moddev.mc.baseelectric.graphics; -import com.mcmoddev.electricadvantage.ElectricAdvantage; -import com.mcmoddev.electricadvantage.machines.LaserTurretTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.LaserTurretTileEntity; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; diff --git a/src/main/java/com/mcmoddev/electricadvantage/gui/ArcFurnaceGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/ArcFurnaceGUI.java similarity index 91% rename from src/main/java/com/mcmoddev/electricadvantage/gui/ArcFurnaceGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/ArcFurnaceGUI.java index 6c636ed..72ee3db 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/gui/ArcFurnaceGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/ArcFurnaceGUI.java @@ -1,9 +1,9 @@ -package com.mcmoddev.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import com.mcmoddev.electricadvantage.ElectricAdvantage; -import com.mcmoddev.electricadvantage.machines.ElectricMachineTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricMachineTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.poweradvantage.math.Integer2D; +import zone.moddev.mc.basepower.math.Integer2D; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/mcmoddev/electricadvantage/gui/BatteryArrayGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/BatteryArrayGUI.java similarity index 89% rename from src/main/java/com/mcmoddev/electricadvantage/gui/BatteryArrayGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/BatteryArrayGUI.java index d43e136..da24046 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/gui/BatteryArrayGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/BatteryArrayGUI.java @@ -1,9 +1,9 @@ -package com.mcmoddev.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import com.mcmoddev.electricadvantage.ElectricAdvantage; -import com.mcmoddev.electricadvantage.machines.ElectricBatteryArrayTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricBatteryArrayTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.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/com/mcmoddev/electricadvantage/gui/ElectricDrillGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/ElectricDrillGUI.java similarity index 88% rename from src/main/java/com/mcmoddev/electricadvantage/gui/ElectricDrillGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/ElectricDrillGUI.java index 01455c6..306282e 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/gui/ElectricDrillGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/ElectricDrillGUI.java @@ -1,9 +1,9 @@ -package com.mcmoddev.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import com.mcmoddev.electricadvantage.ElectricAdvantage; -import com.mcmoddev.electricadvantage.machines.ElectricMachineTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricMachineTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.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/com/mcmoddev/electricadvantage/gui/ElectricPumpGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/ElectricPumpGUI.java similarity index 89% rename from src/main/java/com/mcmoddev/electricadvantage/gui/ElectricPumpGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/ElectricPumpGUI.java index f9cbe2e..3ae164d 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/gui/ElectricPumpGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/ElectricPumpGUI.java @@ -1,9 +1,9 @@ -package com.mcmoddev.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import com.mcmoddev.electricadvantage.ElectricAdvantage; -import com.mcmoddev.electricadvantage.machines.ElectricPumpTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricPumpTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.poweradvantage.math.Integer2D; +import zone.moddev.mc.basepower.math.Integer2D; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/mcmoddev/electricadvantage/gui/ElectricStillGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/ElectricStillGUI.java similarity index 90% rename from src/main/java/com/mcmoddev/electricadvantage/gui/ElectricStillGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/ElectricStillGUI.java index f59ab13..c7e4c4b 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/gui/ElectricStillGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/ElectricStillGUI.java @@ -1,9 +1,9 @@ -package com.mcmoddev.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import com.mcmoddev.electricadvantage.ElectricAdvantage; -import com.mcmoddev.electricadvantage.machines.ElectricStillTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricStillTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.poweradvantage.math.Integer2D; +import zone.moddev.mc.basepower.math.Integer2D; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/mcmoddev/electricadvantage/gui/FabricatorGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/FabricatorGUI.java similarity index 91% rename from src/main/java/com/mcmoddev/electricadvantage/gui/FabricatorGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/FabricatorGUI.java index 537e50e..577f74f 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/gui/FabricatorGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/FabricatorGUI.java @@ -1,9 +1,9 @@ -package com.mcmoddev.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import com.mcmoddev.electricadvantage.ElectricAdvantage; -import com.mcmoddev.electricadvantage.machines.ElectricMachineTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricMachineTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.poweradvantage.math.Integer2D; +import zone.moddev.mc.basepower.math.Integer2D; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/mcmoddev/electricadvantage/gui/GUIHelper.java b/src/main/java/zone/moddev/mc/baseelectric/gui/GUIHelper.java similarity index 94% rename from src/main/java/com/mcmoddev/electricadvantage/gui/GUIHelper.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/GUIHelper.java index d8c9e2a..1d075c9 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/gui/GUIHelper.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/GUIHelper.java @@ -1,7 +1,7 @@ -package com.mcmoddev.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; import cyano.poweradvantage.api.simple.SimpleMachineGUI.GUIContainer; -import com.mcmoddev.poweradvantage.gui.FluidTankGUI; +import zone.moddev.mc.basepower.gui.FluidTankGUI; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/mcmoddev/electricadvantage/gui/GenericMachineGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/GenericMachineGUI.java similarity index 88% rename from src/main/java/com/mcmoddev/electricadvantage/gui/GenericMachineGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/GenericMachineGUI.java index 822fedc..173d4a2 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/gui/GenericMachineGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/GenericMachineGUI.java @@ -1,9 +1,9 @@ -package com.mcmoddev.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import com.mcmoddev.electricadvantage.ElectricAdvantage; -import com.mcmoddev.electricadvantage.machines.ElectricMachineTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricMachineTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.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/com/mcmoddev/electricadvantage/gui/GrowthChamberControllerGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/GrowthChamberControllerGUI.java similarity index 88% rename from src/main/java/com/mcmoddev/electricadvantage/gui/GrowthChamberControllerGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/GrowthChamberControllerGUI.java index d6f2bb4..e7a9549 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/gui/GrowthChamberControllerGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/GrowthChamberControllerGUI.java @@ -1,9 +1,9 @@ -package com.mcmoddev.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import com.mcmoddev.electricadvantage.ElectricAdvantage; -import com.mcmoddev.electricadvantage.machines.GrowthChamberControllerTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.GrowthChamberControllerTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.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/com/mcmoddev/electricadvantage/gui/GrowthChamberGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/GrowthChamberGUI.java similarity index 89% rename from src/main/java/com/mcmoddev/electricadvantage/gui/GrowthChamberGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/GrowthChamberGUI.java index cfa6f75..2d66521 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/gui/GrowthChamberGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/GrowthChamberGUI.java @@ -1,9 +1,9 @@ -package com.mcmoddev.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import com.mcmoddev.electricadvantage.ElectricAdvantage; -import com.mcmoddev.electricadvantage.machines.ElectricMachineTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricMachineTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.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/com/mcmoddev/electricadvantage/gui/OvenGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/OvenGUI.java similarity index 90% rename from src/main/java/com/mcmoddev/electricadvantage/gui/OvenGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/OvenGUI.java index 0455c13..1d2e932 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/gui/OvenGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/OvenGUI.java @@ -1,9 +1,9 @@ -package com.mcmoddev.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import com.mcmoddev.electricadvantage.ElectricAdvantage; -import com.mcmoddev.electricadvantage.machines.ElectricMachineTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricMachineTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.poweradvantage.math.Integer2D; +import zone.moddev.mc.basepower.math.Integer2D; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/mcmoddev/electricadvantage/gui/PlasticRefineryGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/PlasticRefineryGUI.java similarity index 90% rename from src/main/java/com/mcmoddev/electricadvantage/gui/PlasticRefineryGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/PlasticRefineryGUI.java index 6df3617..4c4630b 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/gui/PlasticRefineryGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/PlasticRefineryGUI.java @@ -1,9 +1,9 @@ -package com.mcmoddev.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import com.mcmoddev.electricadvantage.ElectricAdvantage; -import com.mcmoddev.electricadvantage.machines.PlasticRefineryTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.PlasticRefineryTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.poweradvantage.math.Integer2D; +import zone.moddev.mc.basepower.math.Integer2D; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/mcmoddev/electricadvantage/gui/PowerGeneratorGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/PowerGeneratorGUI.java similarity index 88% rename from src/main/java/com/mcmoddev/electricadvantage/gui/PowerGeneratorGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/PowerGeneratorGUI.java index ad2e0f0..cdc516b 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/gui/PowerGeneratorGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/PowerGeneratorGUI.java @@ -1,9 +1,9 @@ -package com.mcmoddev.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import com.mcmoddev.electricadvantage.ElectricAdvantage; -import com.mcmoddev.electricadvantage.machines.ElectricGeneratorTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricGeneratorTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.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/com/mcmoddev/electricadvantage/gui/RockCrusherGUI.java b/src/main/java/zone/moddev/mc/baseelectric/gui/RockCrusherGUI.java similarity index 89% rename from src/main/java/com/mcmoddev/electricadvantage/gui/RockCrusherGUI.java rename to src/main/java/zone/moddev/mc/baseelectric/gui/RockCrusherGUI.java index b0d4ef2..df67c51 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/gui/RockCrusherGUI.java +++ b/src/main/java/zone/moddev/mc/baseelectric/gui/RockCrusherGUI.java @@ -1,9 +1,9 @@ -package com.mcmoddev.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; -import com.mcmoddev.electricadvantage.ElectricAdvantage; -import com.mcmoddev.electricadvantage.machines.ElectricMachineTileEntity; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.machines.ElectricMachineTileEntity; import cyano.poweradvantage.api.simple.SimpleMachineGUI; -import com.mcmoddev.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/com/mcmoddev/electricadvantage/init/Blocks.java b/src/main/java/zone/moddev/mc/baseelectric/init/Blocks.java similarity index 90% rename from src/main/java/com/mcmoddev/electricadvantage/init/Blocks.java rename to src/main/java/zone/moddev/mc/baseelectric/init/Blocks.java index 1f5ad74..652ea72 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/init/Blocks.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/Blocks.java @@ -1,13 +1,13 @@ -package com.mcmoddev.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; -import com.mcmoddev.electricadvantage.ElectricAdvantage; -import com.mcmoddev.electricadvantage.blocks.ElectricConduitBlock; -import com.mcmoddev.electricadvantage.blocks.ElectricScaffoldBlock; -import com.mcmoddev.electricadvantage.blocks.Ore; -import com.mcmoddev.electricadvantage.blocks.PumpPipeBlock; -import com.mcmoddev.electricadvantage.machines.*; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.blocks.ElectricConduitBlock; +import zone.moddev.mc.baseelectric.blocks.ElectricScaffoldBlock; +import zone.moddev.mc.baseelectric.blocks.Ore; +import zone.moddev.mc.baseelectric.blocks.PumpPipeBlock; +import zone.moddev.mc.baseelectric.machines.*; import cyano.poweradvantage.api.GUIBlock; -import com.mcmoddev.poweradvantage.blocks.BlockPowerSwitch; +import zone.moddev.mc.basepower.blocks.BlockPowerSwitch; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -111,7 +111,7 @@ private static Block addBlock(Block block, String name, String... oreDictNames){ ItemBlock itemBlock = new ItemBlock(block); itemBlock.setRegistryName(registryName); ForgeRegistries.ITEMS.register(itemBlock); - block.setCreativeTab(com.mcmoddev.poweradvantage.init.ItemGroups.tab_powerAdvantage); + block.setCreativeTab(zone.moddev.mc.basepower.init.ItemGroups.tab_powerAdvantage); allBlocks.put(name, block); for(String oreName : oreDictNames){ OreDictionary.registerOre(oreName, block); diff --git a/src/main/java/com/mcmoddev/electricadvantage/init/Enchantments.java b/src/main/java/zone/moddev/mc/baseelectric/init/Enchantments.java similarity index 62% rename from src/main/java/com/mcmoddev/electricadvantage/init/Enchantments.java rename to src/main/java/zone/moddev/mc/baseelectric/init/Enchantments.java index ce17f04..b5e4d35 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/init/Enchantments.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/Enchantments.java @@ -1,6 +1,6 @@ -package com.mcmoddev.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; -//import com.mcmoddev.electricadvantage.enchanments.*; +//import zone.moddev.mc.baseelectric.enchanments.*; public abstract class Enchantments { diff --git a/src/main/java/com/mcmoddev/electricadvantage/init/Entities.java b/src/main/java/zone/moddev/mc/baseelectric/init/Entities.java similarity index 73% rename from src/main/java/com/mcmoddev/electricadvantage/init/Entities.java rename to src/main/java/zone/moddev/mc/baseelectric/init/Entities.java index cc64dba..61a3814 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/init/Entities.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/Entities.java @@ -1,9 +1,10 @@ -package com.mcmoddev.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; -import com.mcmoddev.electricadvantage.ElectricAdvantage; -import com.mcmoddev.electricadvantage.entities.*; -import com.mcmoddev.electricadvantage.graphics.*; -import com.mcmoddev.electricadvantage.machines.*; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.entities.*; +import zone.moddev.mc.baseelectric.graphics.*; +import zone.moddev.mc.baseelectric.machines.*; +import zone.moddev.mc.basepower.compat.LegacyIdentity; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; @@ -31,9 +32,6 @@ public abstract class Entities { private static final int DATA_FIXER_VERSION = 2; private static final String HYDROTURBINE_ENTITY_ID = ElectricAdvantage.MODID + ":hydroturbine"; - private static final String LEGACY_HYDROTURBINE_ENTITY_ID = "minecraft:electricadvantage.Hydroturbine"; - private static final String LEGACY_DOUBLE_MODID_HYDROTURBINE_ENTITY_ID = "electricadvantage.electricadvantage.Hydroturbine"; - private static final String LEGACY_AUTO_DOMAIN_HYDROTURBINE_ENTITY_ID = "minecraft:electricadvantage.electricadvantage.hydroturbine"; private static boolean initDone = false; private static boolean dataFixersRegistered = false; @@ -42,7 +40,10 @@ public static void registerDataFixers(){ if(dataFixersRegistered) return; ModFixs fixes = FMLCommonHandler.instance().getDataFixer().init(ElectricAdvantage.MODID, DATA_FIXER_VERSION); fixes.registerFix(FixTypes.ENTITY, new LegacyHydroturbineEntityFix()); - fixes.registerFix(FixTypes.BLOCK_ENTITY, new LegacyTileEntityIdFix(ElectricAdvantage.MODID, DATA_FIXER_VERSION)); + fixes.registerFix(FixTypes.BLOCK_ENTITY, LegacyIdentity.tileIds( + ElectricAdvantage.LEGACY_MODID, ElectricAdvantage.MODID, DATA_FIXER_VERSION)); + fixes.registerFix(FixTypes.ITEM_INSTANCE, LegacyIdentity.itemIds( + ElectricAdvantage.LEGACY_MODID, ElectricAdvantage.MODID, DATA_FIXER_VERSION)); dataFixersRegistered = true; } @@ -111,9 +112,14 @@ public static void remapMissingEntities(RegistryEvent.MissingMappings ore + .enabled(electricLithiumEnabled) + .retrogen(false) + .dimension(OVERWORLD, dimension -> addHosts(dimension + .enabled(true) + .yRange(1, 31) + .attempts(0.125D) + .quantityRange(6, 9) + .pattern(OrePattern.DEFAULT)))) + .ore(SULFUR_ORE, new ResourceLocation(ElectricAdvantage.MODID, "sulfur_ore"), ore -> ore + .enabled(electricSulfurEnabled) + .retrogen(false) + .dimension(OVERWORLD, dimension -> addHosts(dimension + .enabled(true) + .yRange(1, 31) + .attempts(1.0D) + .quantityRange(8, 23) + .pattern(OrePattern.DEFAULT)))) + .build(); + } + + private static WorldgenProvider.OreDimensionDefinition.Builder addHosts( + WorldgenProvider.OreDimensionDefinition.Builder dimension) { + return dimension + .hostBlock(STONE) + .hostTag(STONE_TAG) + .hostFamily(GeologyFamily.SEDIMENTARY) + .hostFamily(GeologyFamily.METAMORPHIC) + .hostFamily(GeologyFamily.IGNEOUS_INTRUSIVE) + .hostFamily(GeologyFamily.IGNEOUS_VOLCANIC); + } + + static String describeOverride(Path configDirectory) { + if (Files.isRegularFile(configDirectory.resolve(ElectricAdvantage.MODID + "-orespawn.json"))) { + return "config/" + ElectricAdvantage.MODID + "-orespawn.json (authoritative)"; + } + if (Files.isRegularFile(configDirectory.resolve("orespawn") + .resolve(ElectricAdvantage.MODID + ".json"))) { + return "config/orespawn/" + ElectricAdvantage.MODID + ".json (legacy importer authority)"; + } + if (Files.isRegularFile(configDirectory.resolve("orespawn3") + .resolve(ElectricAdvantage.MODID + ".json"))) { + return "config/orespawn3/" + ElectricAdvantage.MODID + ".json (legacy importer authority)"; + } + return "none"; + } +} diff --git a/src/main/java/com/mcmoddev/electricadvantage/init/Power.java b/src/main/java/zone/moddev/mc/baseelectric/init/Power.java similarity index 95% rename from src/main/java/com/mcmoddev/electricadvantage/init/Power.java rename to src/main/java/zone/moddev/mc/baseelectric/init/Power.java index 179a538..74721f5 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/init/Power.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/Power.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; import net.minecraft.util.DamageSource; import cyano.poweradvantage.api.ConduitType; diff --git a/src/main/java/com/mcmoddev/electricadvantage/init/Recipes.java b/src/main/java/zone/moddev/mc/baseelectric/init/Recipes.java similarity index 90% rename from src/main/java/com/mcmoddev/electricadvantage/init/Recipes.java rename to src/main/java/zone/moddev/mc/baseelectric/init/Recipes.java index 18e4558..0250eb4 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/init/Recipes.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/Recipes.java @@ -1,8 +1,8 @@ -package com.mcmoddev.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; -import com.mcmoddev.electricadvantage.compat.BaseMetalsCompat; -import com.mcmoddev.poweradvantage.PowerAdvantage; -import com.mcmoddev.poweradvantage.RecipeMode; +import zone.moddev.mc.baseelectric.compat.BaseMetalsCompat; +import zone.moddev.mc.basepower.PowerAdvantage; +import zone.moddev.mc.basepower.RecipeMode; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/com/mcmoddev/electricadvantage/init/TreasureChests.java b/src/main/java/zone/moddev/mc/baseelectric/init/TreasureChests.java similarity index 89% rename from src/main/java/com/mcmoddev/electricadvantage/init/TreasureChests.java rename to src/main/java/zone/moddev/mc/baseelectric/init/TreasureChests.java index 420ad43..add8869 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/init/TreasureChests.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/TreasureChests.java @@ -1,6 +1,6 @@ -package com.mcmoddev.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; -import com.mcmoddev.electricadvantage.ElectricAdvantage; +import zone.moddev.mc.baseelectric.ElectricAdvantage; import net.minecraftforge.fml.common.FMLLog; import org.apache.logging.log4j.Level; @@ -50,7 +50,7 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"electricadvantage:psu\",\n" + + " \"name\": \"baseelectric:psu\",\n" + " \"weight\": 6,\n" + " \"functions\": [\n" + " {\n" + @@ -64,7 +64,7 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"electricadvantage:electric_conduit\",\n" + + " \"name\": \"baseelectric:electric_conduit\",\n" + " \"weight\": 12,\n" + " \"functions\": [\n" + " {\n" + @@ -78,7 +78,7 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"electricadvantage:led_bar\",\n" + + " \"name\": \"baseelectric:led_bar\",\n" + " \"weight\": 6,\n" + " \"functions\": [\n" + " {\n" + @@ -92,7 +92,7 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"electricadvantage:solder\",\n" + + " \"name\": \"baseelectric:solder\",\n" + " \"weight\": 6,\n" + " \"functions\": [\n" + " {\n" + @@ -106,7 +106,7 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"electricadvantage:integrated_circuit\",\n" + + " \"name\": \"baseelectric:integrated_circuit\",\n" + " \"weight\": 3,\n" + " \"functions\": [\n" + " {\n" + @@ -120,7 +120,7 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"electricadvantage:lead_acid_battery\",\n" + + " \"name\": \"baseelectric:lead_acid_battery\",\n" + " \"weight\": 8,\n" + " \"functions\": [\n" + " {\n" + @@ -134,7 +134,7 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"electricadvantage:nickel_hydride_battery\",\n" + + " \"name\": \"baseelectric:nickel_hydride_battery\",\n" + " \"weight\": 4,\n" + " \"functions\": [\n" + " {\n" + @@ -148,7 +148,7 @@ private static void writeLootFile(Path file, String content){ " },\n" + " {\n" + " \"type\": \"item\",\n" + - " \"name\": \"electricadvantage:alkaline_battery\",\n" + + " \"name\": \"baseelectric:alkaline_battery\",\n" + " \"weight\": 2,\n" + " \"functions\": [\n" + " {\n" + @@ -162,7 +162,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/com/mcmoddev/electricadvantage/init/Villages.java b/src/main/java/zone/moddev/mc/baseelectric/init/Villages.java similarity index 98% rename from src/main/java/com/mcmoddev/electricadvantage/init/Villages.java rename to src/main/java/zone/moddev/mc/baseelectric/init/Villages.java index ef7bc00..a5c338f 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/init/Villages.java +++ b/src/main/java/zone/moddev/mc/baseelectric/init/Villages.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.init; +package zone.moddev.mc.baseelectric.init; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.item.Item; diff --git a/src/main/java/com/mcmoddev/electricadvantage/items/BatteryItem.java b/src/main/java/zone/moddev/mc/baseelectric/items/BatteryItem.java similarity index 95% rename from src/main/java/com/mcmoddev/electricadvantage/items/BatteryItem.java rename to src/main/java/zone/moddev/mc/baseelectric/items/BatteryItem.java index f5f74aa..820ac33 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/items/BatteryItem.java +++ b/src/main/java/zone/moddev/mc/baseelectric/items/BatteryItem.java @@ -1,7 +1,7 @@ -package com.mcmoddev.electricadvantage.items; +package zone.moddev.mc.baseelectric.items; -import com.mcmoddev.electricadvantage.common.IRechargeableItem; -import com.mcmoddev.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/com/mcmoddev/electricadvantage/machines/ElectricBatteryArrayBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricBatteryArrayBlock.java similarity index 89% rename from src/main/java/com/mcmoddev/electricadvantage/machines/ElectricBatteryArrayBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricBatteryArrayBlock.java index 08739bd..3e2c41d 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricBatteryArrayBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricBatteryArrayBlock.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import cyano.poweradvantage.api.ConduitType; import net.minecraft.world.World; diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricBatteryArrayTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricBatteryArrayTileEntity.java similarity index 95% rename from src/main/java/com/mcmoddev/electricadvantage/machines/ElectricBatteryArrayTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricBatteryArrayTileEntity.java index cb4c050..6ec6c5e 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricBatteryArrayTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricBatteryArrayTileEntity.java @@ -1,7 +1,7 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.common.IRechargeableItem; -import com.mcmoddev.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.common.IRechargeableItem; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerRequest; import net.minecraft.item.Item; @@ -11,7 +11,7 @@ public class ElectricBatteryArrayTileEntity extends ElectricGeneratorTileEntity{ public ElectricBatteryArrayTileEntity(){ - super("tile.electricadvantage.electric_battery_array.name",8); + super("tile.baseelectric.electric_battery_array.name",8); } diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricCrusherBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricCrusherBlock.java similarity index 88% rename from src/main/java/com/mcmoddev/electricadvantage/machines/ElectricCrusherBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricCrusherBlock.java index 5c811f5..24c4d94 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricCrusherBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricCrusherBlock.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraft.world.World; diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricCrusherTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricCrusherTileEntity.java similarity index 94% rename from src/main/java/com/mcmoddev/electricadvantage/machines/ElectricCrusherTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricCrusherTileEntity.java index 960c7be..ae8a12c 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricCrusherTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricCrusherTileEntity.java @@ -1,7 +1,7 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.compat.BaseMetalsCompat; -import com.mcmoddev.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.compat.BaseMetalsCompat; +import zone.moddev.mc.baseelectric.init.Power; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -22,7 +22,7 @@ public class ElectricCrusherTileEntity extends ElectricMachineTileEntity{ public ElectricCrusherTileEntity() { - super("tile.electricadvantage.electric_crusher.name", + super("tile.baseelectric.electric_crusher.name", 3, 6, 0); Arrays.fill(smashTime, (short)0); } diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricDrillBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricDrillBlock.java similarity index 97% rename from src/main/java/com/mcmoddev/electricadvantage/machines/ElectricDrillBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricDrillBlock.java index bb29900..0c50b9f 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricDrillBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricDrillBlock.java @@ -1,8 +1,8 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.*; -import com.mcmoddev.poweradvantage.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricDrillTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricDrillTileEntity.java similarity index 97% rename from src/main/java/com/mcmoddev/electricadvantage/machines/ElectricDrillTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricDrillTileEntity.java index 4ae78d1..1b15f0d 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricDrillTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricDrillTileEntity.java @@ -1,8 +1,8 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.init.Blocks; -import com.mcmoddev.electricadvantage.init.Power; -import com.mcmoddev.poweradvantage.util.InventoryWrapper; +import zone.moddev.mc.baseelectric.init.Blocks; +import zone.moddev.mc.baseelectric.init.Power; +import zone.moddev.mc.basepower.util.InventoryWrapper; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -46,7 +46,7 @@ public class ElectricDrillTileEntity extends ElectricMachineTileEntity{ private boolean deferred = false; public ElectricDrillTileEntity() { - super("tile.electricadvantage.electric_drill.name", + super("tile.baseelectric.electric_drill.name", 0, 6, 0); } @@ -158,7 +158,7 @@ private boolean followTrack(){ Arrays.fill(this.getInventory(), null); // replace this block with steam pipe - w.setBlockState(getPos().offset(getFacing()), com.mcmoddev.poweradvantage.init.Blocks.steel_frame.getDefaultState()); + w.setBlockState(getPos().offset(getFacing()), zone.moddev.mc.basepower.init.Blocks.steel_frame.getDefaultState()); w.setBlockState(getPos(), Blocks.electric_conduit.getDefaultState(), 2); @@ -243,7 +243,7 @@ public void onDataFieldUpdate() { if(hitEnd){ boolean moved = followTrack(); if(moved){ - com.mcmoddev.poweradvantage.conduitnetwork.ConduitRegistry.getInstance() + zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry.getInstance() .conduitBlockRemovedEvent(getWorld(), getWorld().provider.getDimension(), getPos(), getType()); return; } diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricFabricatorBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFabricatorBlock.java similarity index 82% rename from src/main/java/com/mcmoddev/electricadvantage/machines/ElectricFabricatorBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFabricatorBlock.java index 7318d09..1bf7e97 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricFabricatorBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFabricatorBlock.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraft.world.World; diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricFabricatorTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFabricatorTileEntity.java similarity index 96% rename from src/main/java/com/mcmoddev/electricadvantage/machines/ElectricFabricatorTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFabricatorTileEntity.java index b925ef6..ac4d647 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricFabricatorTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFabricatorTileEntity.java @@ -1,7 +1,7 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.util.crafting.RecipeDeconstructor; -import com.mcmoddev.electricadvantage.util.crafting.SerializedInventory; +import zone.moddev.mc.baseelectric.util.crafting.RecipeDeconstructor; +import zone.moddev.mc.baseelectric.util.crafting.SerializedInventory; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -19,7 +19,7 @@ public class ElectricFabricatorTileEntity extends ElectricMachineTileEntity { private final int progressGoal = 200; public ElectricFabricatorTileEntity() { - super("tile.electricadvantage.electric_fabricator.name", 12, 2, 1); + super("tile.baseelectric.electric_fabricator.name", 12, 2, 1); } diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricFurnaceBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFurnaceBlock.java similarity index 85% rename from src/main/java/com/mcmoddev/electricadvantage/machines/ElectricFurnaceBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFurnaceBlock.java index 9443c6d..f25790a 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricFurnaceBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFurnaceBlock.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraft.world.World; diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricFurnaceTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFurnaceTileEntity.java similarity index 95% rename from src/main/java/com/mcmoddev/electricadvantage/machines/ElectricFurnaceTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFurnaceTileEntity.java index ca42a60..a2c36db 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricFurnaceTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricFurnaceTileEntity.java @@ -1,8 +1,8 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import java.util.Arrays; -import com.mcmoddev.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; @@ -21,7 +21,7 @@ public class ElectricFurnaceTileEntity extends ElectricMachineTileEntity{ public ElectricFurnaceTileEntity() { - super("tile.electricadvantage.electric_furnace.name", + super("tile.baseelectric.electric_furnace.name", 4, 6, 0); Arrays.fill(burnTime, (short)0); } diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricGeneratorBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricGeneratorBlock.java similarity index 96% rename from src/main/java/com/mcmoddev/electricadvantage/machines/ElectricGeneratorBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricGeneratorBlock.java index bc475b6..3e5c031 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricGeneratorBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricGeneratorBlock.java @@ -1,6 +1,6 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricGeneratorTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricGeneratorTileEntity.java similarity index 98% rename from src/main/java/com/mcmoddev/electricadvantage/machines/ElectricGeneratorTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricGeneratorTileEntity.java index b8bc129..d0c153d 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricGeneratorTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricGeneratorTileEntity.java @@ -1,6 +1,6 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricMachineBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricMachineBlock.java similarity index 97% rename from src/main/java/com/mcmoddev/electricadvantage/machines/ElectricMachineBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricMachineBlock.java index 5212ad1..bab56f5 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricMachineBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricMachineBlock.java @@ -1,6 +1,6 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricMachineTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricMachineTileEntity.java similarity index 99% rename from src/main/java/com/mcmoddev/electricadvantage/machines/ElectricMachineTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricMachineTileEntity.java index 20233cd..17849e2 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricMachineTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricMachineTileEntity.java @@ -1,6 +1,6 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricOvenBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricOvenBlock.java similarity index 84% rename from src/main/java/com/mcmoddev/electricadvantage/machines/ElectricOvenBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricOvenBlock.java index ac740b5..aeacb7b 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricOvenBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricOvenBlock.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraft.world.World; diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricOvenTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricOvenTileEntity.java similarity index 94% rename from src/main/java/com/mcmoddev/electricadvantage/machines/ElectricOvenTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricOvenTileEntity.java index 17bacbe..deb9b9b 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricOvenTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricOvenTileEntity.java @@ -1,6 +1,6 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -15,7 +15,7 @@ public class ElectricOvenTileEntity extends ElectricMachineTileEntity{ private short progress = 0; public ElectricOvenTileEntity() { - super("tile.electricadvantage.electric_oven.name", 1, 1, 0); + super("tile.baseelectric.electric_oven.name", 1, 1, 0); } @Override diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricPumpBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricPumpBlock.java similarity index 85% rename from src/main/java/com/mcmoddev/electricadvantage/machines/ElectricPumpBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricPumpBlock.java index 59bb8d3..8c95a21 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricPumpBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricPumpBlock.java @@ -1,11 +1,11 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.init.Blocks; -import com.mcmoddev.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 com.mcmoddev.poweradvantage.conduitnetwork.ConduitRegistry; -import com.mcmoddev.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; @@ -26,7 +26,7 @@ public ElectricMachineTileEntity createNewTileEntity(World w, int m) { @Override public void onBlockAdded(World w, BlockPos coord, IBlockState state){ super.onBlockAdded(w, coord, state); - ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, com.mcmoddev.poweradvantage.init.Fluids.fluidConduit_general); + ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, zone.moddev.mc.basepower.init.Fluids.fluidConduit_general); } /** @@ -35,7 +35,7 @@ public void onBlockAdded(World w, BlockPos coord, IBlockState state){ @Override public void onPlayerDestroy(World w, BlockPos coord, IBlockState state){ super.onPlayerDestroy(w, coord, state); - ConduitRegistry.getInstance().conduitBlockRemovedEvent(w, w.provider.getDimension(), coord, com.mcmoddev.poweradvantage.init.Fluids.fluidConduit_general); + ConduitRegistry.getInstance().conduitBlockRemovedEvent(w, w.provider.getDimension(), coord, zone.moddev.mc.basepower.init.Fluids.fluidConduit_general); destroyPipe(w,coord); } /** diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricPumpTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricPumpTileEntity.java similarity index 94% rename from src/main/java/com/mcmoddev/electricadvantage/machines/ElectricPumpTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricPumpTileEntity.java index 3a72c9d..3f14fba 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricPumpTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricPumpTileEntity.java @@ -1,13 +1,13 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.util.LegacyFluidHandler; -import com.mcmoddev.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 com.mcmoddev.poweradvantage.conduitnetwork.ConduitRegistry; -import com.mcmoddev.poweradvantage.init.Fluids; -import com.mcmoddev.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.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; @@ -42,7 +42,7 @@ public class ElectricPumpTileEntity extends ElectricMachineTileEntity implements public ElectricPumpTileEntity() { - super("tile.electricadvantage.electric_pump.name", 0, 0, 0, new ConduitType[]{Power.ELECTRIC_POWER, Fluids.fluidConduit_general},new float[]{ENERGY_COST_PUMP + 256 * ENERGY_COST_VERTICAL,1000f}); + super("tile.baseelectric.electric_pump.name", 0, 0, 0, new ConduitType[]{Power.ELECTRIC_POWER, Fluids.fluidConduit_general},new float[]{ENERGY_COST_PUMP + 256 * ENERGY_COST_VERTICAL,1000f}); tank = new FluidTank(Fluid.BUCKET_VOLUME); } @@ -60,12 +60,12 @@ public void tickUpdate(boolean isServerWorld) { World w = getWorld(); boolean success = false; BlockPos target = this.getPos().down(); - while(target.getY() > 0 && w.getBlockState(target).getBlock() == com.mcmoddev.electricadvantage.init.Blocks.pump_pipe_electric){ + while(target.getY() > 0 && w.getBlockState(target).getBlock() == zone.moddev.mc.baseelectric.init.Blocks.pump_pipe_electric){ target = target.down(); } if(target.getY() > 0 && w.isAirBlock(target) && getEnergy() >= ENERGY_COST_PIPE){ // place pipe - w.setBlockState(target, com.mcmoddev.electricadvantage.init.Blocks.pump_pipe_electric.getDefaultState()); + w.setBlockState(target, zone.moddev.mc.baseelectric.init.Blocks.pump_pipe_electric.getDefaultState()); this.subtractEnergy(ENERGY_COST_PIPE, Power.ELECTRIC_POWER); timeUntilNextPump = PIPE_INTERVAL; playSoundEffect(target.getX()+0.5, target.getY()+0.5, target.getZ()+0.5, SoundEvents.BLOCK_STONE_STEP, 0.3f, 1f); @@ -210,7 +210,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, com.mcmoddev.poweradvantage.init.Fluids.fluidConduit_general, type, + float delta = ConduitRegistry.transmitPowerToConsumers(availableAmount, zone.moddev.mc.basepower.init.Fluids.fluidConduit_general, type, PowerRequest.LAST_PRIORITY, getWorld(), getPos(), this); if(delta > 0){ getTank().drain(Math.max((int)delta,1),true); // no free energy! diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricStillBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricStillBlock.java similarity index 89% rename from src/main/java/com/mcmoddev/electricadvantage/machines/ElectricStillBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricStillBlock.java index 0a75c73..a7c57e1 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricStillBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricStillBlock.java @@ -1,9 +1,9 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerConnectorContext; -import com.mcmoddev.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/com/mcmoddev/electricadvantage/machines/ElectricStillTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricStillTileEntity.java similarity index 94% rename from src/main/java/com/mcmoddev/electricadvantage/machines/ElectricStillTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/ElectricStillTileEntity.java index 791d2e7..e4eb134 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/ElectricStillTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/ElectricStillTileEntity.java @@ -1,15 +1,15 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.util.LegacyFluidHandler; -import com.mcmoddev.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 com.mcmoddev.poweradvantage.conduitnetwork.ConduitRegistry; -import com.mcmoddev.poweradvantage.init.Fluids; -import com.mcmoddev.poweradvantage.registry.still.recipe.DistillationRecipe; -import com.mcmoddev.poweradvantage.registry.still.recipe.DistillationRecipeRegistry; -import com.mcmoddev.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.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -30,7 +30,7 @@ public class ElectricStillTileEntity extends ElectricMachineTileEntity implement private final int[] dataSyncArray = new int[5]; public ElectricStillTileEntity() { - super("tile.electricadvantage.electric_still.name", 0, 0, 0, new ConduitType[]{Power.ELECTRIC_POWER, Fluids.fluidConduit_general},new float[]{500f,1000f}); + super("tile.baseelectric.electric_still.name", 0, 0, 0, new ConduitType[]{Power.ELECTRIC_POWER, Fluids.fluidConduit_general},new float[]{500f,1000f}); outputTank = new FluidTank(Fluid.BUCKET_VOLUME ); inputTank = new FluidTank(Fluid.BUCKET_VOLUME); } @@ -225,7 +225,7 @@ public void powerUpdate(){ if(this.getOutputTank().getFluidAmount() > 0){ ConduitType type = Fluids.fluidToConduitType(getOutputTank().getFluid().getFluid()); float availableAmount = getOutputTank().getFluidAmount(); - float delta = ConduitRegistry.transmitPowerToConsumers(availableAmount, com.mcmoddev.poweradvantage.init.Fluids.fluidConduit_general, type, + float delta = ConduitRegistry.transmitPowerToConsumers(availableAmount, zone.moddev.mc.basepower.init.Fluids.fluidConduit_general, type, PowerRequest.LAST_PRIORITY, getWorld(), getPos(), this); if(delta > 0){ getOutputTank().drain(Math.max((int)delta,1),true); // no free energy! diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/GrowthChamberBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberBlock.java similarity index 78% rename from src/main/java/com/mcmoddev/electricadvantage/machines/GrowthChamberBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberBlock.java index 8b4fcdd..6c237be 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/GrowthChamberBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberBlock.java @@ -1,6 +1,6 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.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/com/mcmoddev/electricadvantage/machines/GrowthChamberControllerBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberControllerBlock.java similarity index 89% rename from src/main/java/com/mcmoddev/electricadvantage/machines/GrowthChamberControllerBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberControllerBlock.java index 5c32800..50d8184 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/GrowthChamberControllerBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberControllerBlock.java @@ -1,11 +1,11 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.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 com.mcmoddev.poweradvantage.conduitnetwork.ConduitRegistry; -import com.mcmoddev.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; @@ -54,7 +54,7 @@ public int getComparatorInputOverride(IBlockState bs, World world, BlockPos coor @Override public void onBlockAdded(World w, BlockPos coord, IBlockState state){ super.onBlockAdded(w, coord, state); - ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, com.mcmoddev.poweradvantage.init.Fluids.fluidConduit_general); + ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, zone.moddev.mc.basepower.init.Fluids.fluidConduit_general); ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, Power.GROWTHCHAMBER_POWER); ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, Power.ELECTRIC_POWER); } @@ -65,7 +65,7 @@ public void onBlockAdded(World w, BlockPos coord, IBlockState state){ @Override public void onPlayerDestroy(World w, BlockPos coord, IBlockState state){ super.onPlayerDestroy(w, coord, state); - ConduitRegistry.getInstance().conduitBlockRemovedEvent(w, w.provider.getDimension(), coord, com.mcmoddev.poweradvantage.init.Fluids.fluidConduit_general); + ConduitRegistry.getInstance().conduitBlockRemovedEvent(w, w.provider.getDimension(), coord, zone.moddev.mc.basepower.init.Fluids.fluidConduit_general); ConduitRegistry.getInstance().conduitBlockRemovedEvent(w, w.provider.getDimension(), coord, Power.GROWTHCHAMBER_POWER); ConduitRegistry.getInstance().conduitBlockRemovedEvent(w, w.provider.getDimension(), coord, Power.ELECTRIC_POWER); } diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/GrowthChamberControllerTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberControllerTileEntity.java similarity index 97% rename from src/main/java/com/mcmoddev/electricadvantage/machines/GrowthChamberControllerTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberControllerTileEntity.java index 3597e23..00c1bbc 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/GrowthChamberControllerTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberControllerTileEntity.java @@ -1,12 +1,12 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.util.LegacyFluidHandler; -import com.mcmoddev.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 com.mcmoddev.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.init.Fluids; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; @@ -35,7 +35,7 @@ public class GrowthChamberControllerTileEntity extends cyano.poweradvantage.api. private final int[] dataSyncArray = new int[4]; public GrowthChamberControllerTileEntity() { - super(types, capacities, "tile.electricadvantage.growth_chamber_controller.name"); + super(types, capacities, "tile.baseelectric.growth_chamber_controller.name"); tank = new FluidTank((int)capacities[2]); inventory = new ItemStack[1]; } diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/GrowthChamberTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberTileEntity.java similarity index 96% rename from src/main/java/com/mcmoddev/electricadvantage/machines/GrowthChamberTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberTileEntity.java index b870072..8339991 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/GrowthChamberTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/GrowthChamberTileEntity.java @@ -1,7 +1,7 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.init.Power; -import com.mcmoddev.electricadvantage.util.farming.VirtualCrop; +import zone.moddev.mc.baseelectric.init.Power; +import zone.moddev.mc.baseelectric.util.farming.VirtualCrop; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerRequest; import net.minecraft.entity.item.EntityItem; @@ -24,7 +24,7 @@ public class GrowthChamberTileEntity extends ElectricMachineTileEntity { private byte[] pendingGrowth; public GrowthChamberTileEntity() { - super("tile.electricadvantage.growth_chamber.name",Power.GROWTHCHAMBER_POWER, ENERGY_PER_TICK*64, GROWTH_AREA, 6, 0); + super("tile.baseelectric.growth_chamber.name",Power.GROWTHCHAMBER_POWER, ENERGY_PER_TICK*64, GROWTH_AREA, 6, 0); } diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/HydroelectricGeneratorBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/HydroelectricGeneratorBlock.java similarity index 91% rename from src/main/java/com/mcmoddev/electricadvantage/machines/HydroelectricGeneratorBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/HydroelectricGeneratorBlock.java index e7fde28..329c3c9 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/HydroelectricGeneratorBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/HydroelectricGeneratorBlock.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/HydroelectricGeneratorTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/HydroelectricGeneratorTileEntity.java similarity index 92% rename from src/main/java/com/mcmoddev/electricadvantage/machines/HydroelectricGeneratorTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/HydroelectricGeneratorTileEntity.java index 3255927..a017da3 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/HydroelectricGeneratorTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/HydroelectricGeneratorTileEntity.java @@ -1,6 +1,6 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.entities.HydroturbineEntity; +import zone.moddev.mc.baseelectric.entities.HydroturbineEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.AxisAlignedBB; @@ -20,7 +20,7 @@ public class HydroelectricGeneratorTileEntity extends ElectricGeneratorTileEntit private boolean isInitialized; public HydroelectricGeneratorTileEntity() { - super("tile.electricadvantage.hydroelectric_generator.name", 0); + super("tile.baseelectric.hydroelectric_generator.name", 0); isInitialized = false; } diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/LEDBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/LEDBlock.java similarity index 97% rename from src/main/java/com/mcmoddev/electricadvantage/machines/LEDBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/LEDBlock.java index b0042e5..5b204f4 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/LEDBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/LEDBlock.java @@ -1,6 +1,6 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.blocks.ElectricConduitBlock; +import zone.moddev.mc.baseelectric.blocks.ElectricConduitBlock; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/LEDTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/LEDTileEntity.java similarity index 92% rename from src/main/java/com/mcmoddev/electricadvantage/machines/LEDTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/LEDTileEntity.java index afebd69..f2a13be 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/LEDTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/LEDTileEntity.java @@ -1,6 +1,6 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerRequest; import cyano.poweradvantage.api.simple.TileEntitySimplePowerMachine; @@ -14,7 +14,7 @@ public class LEDTileEntity extends TileEntitySimplePowerMachine { private static final float ENERGY_COST = 0.125f; public LEDTileEntity() { - super(Power.ELECTRIC_POWER, ENERGY_COST * 4, "tile.electricadvantage.led_bar.name"); + super(Power.ELECTRIC_POWER, ENERGY_COST * 4, "tile.baseelectric.led_bar.name"); } private final ItemStack[] none = new ItemStack[0]; diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/LaserTurretBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/LaserTurretBlock.java similarity index 97% rename from src/main/java/com/mcmoddev/electricadvantage/machines/LaserTurretBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/LaserTurretBlock.java index 6f9bd2f..eecdc5a 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/LaserTurretBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/LaserTurretBlock.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/LaserTurretTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/LaserTurretTileEntity.java similarity index 98% rename from src/main/java/com/mcmoddev/electricadvantage/machines/LaserTurretTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/LaserTurretTileEntity.java index bcb1ae4..21141a0 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/LaserTurretTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/LaserTurretTileEntity.java @@ -1,7 +1,7 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.ElectricAdvantage; -import com.mcmoddev.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.ElectricAdvantage; +import zone.moddev.mc.baseelectric.init.Power; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -77,7 +77,7 @@ public class LaserTurretTileEntity extends ElectricMachineTileEntity implements public LaserTurretTileEntity(){ - super("tile.electricadvantage.laser_turret.name",MAX_BUFFER,0,0,0); + super("tile.baseelectric.laser_turret.name",MAX_BUFFER,0,0,0); SoundEvent soundEvent = SoundEvent.REGISTRY.getObject(new ResourceLocation(ElectricAdvantage.INSTANCE.LASER_SOUND)); if(soundEvent == null){ LASER_SOUND = SoundEvents.ENTITY_ENDERMEN_TELEPORT; diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/PhotovoltaicGeneratorBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/PhotovoltaicGeneratorBlock.java similarity index 93% rename from src/main/java/com/mcmoddev/electricadvantage/machines/PhotovoltaicGeneratorBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/PhotovoltaicGeneratorBlock.java index 5cbc2bd..837ee20 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/PhotovoltaicGeneratorBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/PhotovoltaicGeneratorBlock.java @@ -1,4 +1,4 @@ -package com.mcmoddev.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/com/mcmoddev/electricadvantage/machines/PhotovoltaicGeneratorTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/PhotovoltaicGeneratorTileEntity.java similarity index 94% rename from src/main/java/com/mcmoddev/electricadvantage/machines/PhotovoltaicGeneratorTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/PhotovoltaicGeneratorTileEntity.java index 0f88304..c753b5a 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/PhotovoltaicGeneratorTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/PhotovoltaicGeneratorTileEntity.java @@ -1,6 +1,6 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; @@ -17,7 +17,7 @@ public class PhotovoltaicGeneratorTileEntity extends ElectricGeneratorTileEntity private float powerOutput = 0; public PhotovoltaicGeneratorTileEntity() { - super("tile.electricadvantage.photovoltaic_generator.name", 0); + super("tile.baseelectric.photovoltaic_generator.name", 0); } @Override diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/PlasticRefineryBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/PlasticRefineryBlock.java similarity index 82% rename from src/main/java/com/mcmoddev/electricadvantage/machines/PlasticRefineryBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/PlasticRefineryBlock.java index 970fc21..6a2e0ea 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/PlasticRefineryBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/PlasticRefineryBlock.java @@ -1,10 +1,10 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerConnectorContext; -import com.mcmoddev.poweradvantage.conduitnetwork.ConduitRegistry; -import com.mcmoddev.poweradvantage.init.Fluids; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.init.Fluids; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; @@ -25,7 +25,7 @@ public ElectricMachineTileEntity createNewTileEntity(World w, int m) { @Override public void onBlockAdded(World w, BlockPos coord, IBlockState state){ super.onBlockAdded(w, coord, state); - ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, com.mcmoddev.poweradvantage.init.Fluids.fluidConduit_general); + ConduitRegistry.getInstance().conduitBlockPlacedEvent(w, w.provider.getDimension(), coord, zone.moddev.mc.basepower.init.Fluids.fluidConduit_general); } /** @@ -34,7 +34,7 @@ public void onBlockAdded(World w, BlockPos coord, IBlockState state){ @Override public void onPlayerDestroy(World w, BlockPos coord, IBlockState state){ super.onPlayerDestroy(w, coord, state); - ConduitRegistry.getInstance().conduitBlockRemovedEvent(w, w.provider.getDimension(), coord, com.mcmoddev.poweradvantage.init.Fluids.fluidConduit_general); + ConduitRegistry.getInstance().conduitBlockRemovedEvent(w, w.provider.getDimension(), coord, zone.moddev.mc.basepower.init.Fluids.fluidConduit_general); } /** * This method is called when the block is destroyed by an explosion. diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/PlasticRefineryTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/PlasticRefineryTileEntity.java similarity index 95% rename from src/main/java/com/mcmoddev/electricadvantage/machines/PlasticRefineryTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/PlasticRefineryTileEntity.java index ccf56af..a62499e 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/PlasticRefineryTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/PlasticRefineryTileEntity.java @@ -1,15 +1,15 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.ElectricAdvantage; -import com.mcmoddev.electricadvantage.util.LegacyFluidHandler; -import com.mcmoddev.electricadvantage.init.Items; -import com.mcmoddev.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 com.mcmoddev.poweradvantage.init.Fluids; -import com.mcmoddev.poweradvantage.util.FluidIdHelper; +import zone.moddev.mc.basepower.init.Fluids; +import zone.moddev.mc.basepower.util.FluidIdHelper; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -32,7 +32,7 @@ public class PlasticRefineryTileEntity extends ElectricMachineTileEntity impleme private final int[] dataSyncArray = new int[4]; public PlasticRefineryTileEntity() { - super("tile.electricadvantage.plastic_refinery.name", + super("tile.baseelectric.plastic_refinery.name", 0, 1, 0, new ConduitType[]{Power.ELECTRIC_POWER, Fluids.fluidConduit_general},new float[]{500f,2000f}); tank = new FluidTank(Fluid.BUCKET_VOLUME * 2); } diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/SteamPoweredElectricGeneratorBlock.java b/src/main/java/zone/moddev/mc/baseelectric/machines/SteamPoweredElectricGeneratorBlock.java similarity index 92% rename from src/main/java/com/mcmoddev/electricadvantage/machines/SteamPoweredElectricGeneratorBlock.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/SteamPoweredElectricGeneratorBlock.java index 3da574c..03bee0a 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/SteamPoweredElectricGeneratorBlock.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/SteamPoweredElectricGeneratorBlock.java @@ -1,9 +1,9 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerConnectorContext; -import com.mcmoddev.poweradvantage.conduitnetwork.ConduitRegistry; +import zone.moddev.mc.basepower.conduitnetwork.ConduitRegistry; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; diff --git a/src/main/java/com/mcmoddev/electricadvantage/machines/SteamPoweredElectricGeneratorTileEntity.java b/src/main/java/zone/moddev/mc/baseelectric/machines/SteamPoweredElectricGeneratorTileEntity.java similarity index 93% rename from src/main/java/com/mcmoddev/electricadvantage/machines/SteamPoweredElectricGeneratorTileEntity.java rename to src/main/java/zone/moddev/mc/baseelectric/machines/SteamPoweredElectricGeneratorTileEntity.java index fe207d9..3652dde 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/machines/SteamPoweredElectricGeneratorTileEntity.java +++ b/src/main/java/zone/moddev/mc/baseelectric/machines/SteamPoweredElectricGeneratorTileEntity.java @@ -1,6 +1,6 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; -import com.mcmoddev.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import cyano.poweradvantage.api.ConduitType; import cyano.poweradvantage.api.PowerConnectorContext; import cyano.poweradvantage.api.PowerRequest; @@ -9,7 +9,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import static com.mcmoddev.electricadvantage.machines.SteamPoweredElectricGeneratorBlock.STEAM_POWER; +import static zone.moddev.mc.baseelectric.machines.SteamPoweredElectricGeneratorBlock.STEAM_POWER; public class SteamPoweredElectricGeneratorTileEntity extends ElectricGeneratorTileEntity{ @@ -25,7 +25,7 @@ public class SteamPoweredElectricGeneratorTileEntity extends ElectricGeneratorTi private final int[] dataArray = new int[3]; public SteamPoweredElectricGeneratorTileEntity() { - super("tile.electricadvantage.steam_powered_generator.name", 0, new ConduitType[]{Power.ELECTRIC_POWER,STEAM_POWER}, new float[]{1000f,32f}); + super("tile.baseelectric.steam_powered_generator.name", 0, new ConduitType[]{Power.ELECTRIC_POWER,STEAM_POWER}, new float[]{1000f,32f}); } @Override public void powerUpdate(){ diff --git a/src/main/java/com/mcmoddev/electricadvantage/recipe/condition/NotRecipeModeConditionFactory.java b/src/main/java/zone/moddev/mc/baseelectric/recipe/condition/NotRecipeModeConditionFactory.java similarity index 78% rename from src/main/java/com/mcmoddev/electricadvantage/recipe/condition/NotRecipeModeConditionFactory.java rename to src/main/java/zone/moddev/mc/baseelectric/recipe/condition/NotRecipeModeConditionFactory.java index f3b8bde..16d9901 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/recipe/condition/NotRecipeModeConditionFactory.java +++ b/src/main/java/zone/moddev/mc/baseelectric/recipe/condition/NotRecipeModeConditionFactory.java @@ -1,8 +1,8 @@ -package com.mcmoddev.electricadvantage.recipe.condition; +package zone.moddev.mc.baseelectric.recipe.condition; import com.google.gson.JsonObject; -import com.mcmoddev.poweradvantage.PowerAdvantage; -import com.mcmoddev.poweradvantage.RecipeMode; +import zone.moddev.mc.basepower.PowerAdvantage; +import zone.moddev.mc.basepower.RecipeMode; import net.minecraft.util.JsonUtils; import net.minecraftforge.common.crafting.IConditionFactory; import net.minecraftforge.common.crafting.JsonContext; diff --git a/src/main/java/com/mcmoddev/electricadvantage/recipe/condition/RecipeModeConditionFactory.java b/src/main/java/zone/moddev/mc/baseelectric/recipe/condition/RecipeModeConditionFactory.java similarity index 78% rename from src/main/java/com/mcmoddev/electricadvantage/recipe/condition/RecipeModeConditionFactory.java rename to src/main/java/zone/moddev/mc/baseelectric/recipe/condition/RecipeModeConditionFactory.java index 913fd79..bbeef4b 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/recipe/condition/RecipeModeConditionFactory.java +++ b/src/main/java/zone/moddev/mc/baseelectric/recipe/condition/RecipeModeConditionFactory.java @@ -1,8 +1,8 @@ -package com.mcmoddev.electricadvantage.recipe.condition; +package zone.moddev.mc.baseelectric.recipe.condition; import com.google.gson.JsonObject; -import com.mcmoddev.poweradvantage.PowerAdvantage; -import com.mcmoddev.poweradvantage.RecipeMode; +import zone.moddev.mc.basepower.PowerAdvantage; +import zone.moddev.mc.basepower.RecipeMode; import net.minecraft.util.JsonUtils; import net.minecraftforge.common.crafting.IConditionFactory; import net.minecraftforge.common.crafting.JsonContext; diff --git a/src/main/java/com/mcmoddev/electricadvantage/util/LegacyFluidHandler.java b/src/main/java/zone/moddev/mc/baseelectric/util/LegacyFluidHandler.java similarity index 97% rename from src/main/java/com/mcmoddev/electricadvantage/util/LegacyFluidHandler.java rename to src/main/java/zone/moddev/mc/baseelectric/util/LegacyFluidHandler.java index ea8f347..3d99c72 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/util/LegacyFluidHandler.java +++ b/src/main/java/zone/moddev/mc/baseelectric/util/LegacyFluidHandler.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.util; +package zone.moddev.mc.baseelectric.util; import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/com/mcmoddev/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/com/mcmoddev/electricadvantage/util/crafting/ItemMatcher.java rename to src/main/java/zone/moddev/mc/baseelectric/util/crafting/ItemMatcher.java index b02a02d..df6e4ce 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/util/crafting/ItemMatcher.java +++ b/src/main/java/zone/moddev/mc/baseelectric/util/crafting/ItemMatcher.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.util.crafting; +package zone.moddev.mc.baseelectric.util.crafting; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/com/mcmoddev/electricadvantage/util/crafting/ItemRecord.java b/src/main/java/zone/moddev/mc/baseelectric/util/crafting/ItemRecord.java similarity index 95% rename from src/main/java/com/mcmoddev/electricadvantage/util/crafting/ItemRecord.java rename to src/main/java/zone/moddev/mc/baseelectric/util/crafting/ItemRecord.java index f00f970..af79cb6 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/util/crafting/ItemRecord.java +++ b/src/main/java/zone/moddev/mc/baseelectric/util/crafting/ItemRecord.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.util.crafting; +package zone.moddev.mc.baseelectric.util.crafting; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/com/mcmoddev/electricadvantage/util/crafting/RecipeDeconstructor.java b/src/main/java/zone/moddev/mc/baseelectric/util/crafting/RecipeDeconstructor.java similarity index 99% rename from src/main/java/com/mcmoddev/electricadvantage/util/crafting/RecipeDeconstructor.java rename to src/main/java/zone/moddev/mc/baseelectric/util/crafting/RecipeDeconstructor.java index 43c2a94..628e006 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/util/crafting/RecipeDeconstructor.java +++ b/src/main/java/zone/moddev/mc/baseelectric/util/crafting/RecipeDeconstructor.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.util.crafting; +package zone.moddev.mc.baseelectric.util.crafting; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/src/main/java/com/mcmoddev/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/com/mcmoddev/electricadvantage/util/crafting/SerializedInventory.java rename to src/main/java/zone/moddev/mc/baseelectric/util/crafting/SerializedInventory.java index 6a3b0ba..d5d6266 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/util/crafting/SerializedInventory.java +++ b/src/main/java/zone/moddev/mc/baseelectric/util/crafting/SerializedInventory.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.util.crafting; +package zone.moddev.mc.baseelectric.util.crafting; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/com/mcmoddev/electricadvantage/util/farming/VirtualCrop.java b/src/main/java/zone/moddev/mc/baseelectric/util/farming/VirtualCrop.java similarity index 98% rename from src/main/java/com/mcmoddev/electricadvantage/util/farming/VirtualCrop.java rename to src/main/java/zone/moddev/mc/baseelectric/util/farming/VirtualCrop.java index d1826ec..1be68a9 100644 --- a/src/main/java/com/mcmoddev/electricadvantage/util/farming/VirtualCrop.java +++ b/src/main/java/zone/moddev/mc/baseelectric/util/farming/VirtualCrop.java @@ -1,6 +1,6 @@ -package com.mcmoddev.electricadvantage.util.farming; +package zone.moddev.mc.baseelectric.util.farming; -import com.mcmoddev.electricadvantage.util.crafting.ItemRecord; +import zone.moddev.mc.baseelectric.util.crafting.ItemRecord; import net.minecraft.block.Block; import net.minecraft.block.BlockStem; import net.minecraft.block.properties.PropertyInteger; diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_battery_array.json b/src/main/resources/assets/baseelectric/blockstates/electric_battery_array.json new file mode 100644 index 0000000..c8160c0 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_battery_array.json @@ -0,0 +1,12 @@ +{ + "variants": { + "active=true,facing=east": { "model": "baseelectric:electric_battery_array", "y": 90 }, + "active=true,facing=north": { "model": "baseelectric:electric_battery_array" }, + "active=true,facing=south": { "model": "baseelectric:electric_battery_array", "y": 180 }, + "active=true,facing=west": { "model": "baseelectric:electric_battery_array", "y": 270 }, + "active=false,facing=east": { "model": "baseelectric:electric_battery_array", "y": 90 }, + "active=false,facing=north": { "model": "baseelectric:electric_battery_array" }, + "active=false,facing=south": { "model": "baseelectric:electric_battery_array", "y": 180 }, + "active=false,facing=west": { "model": "baseelectric:electric_battery_array", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_conduit.json b/src/main/resources/assets/baseelectric/blockstates/electric_conduit.json new file mode 100644 index 0000000..2da5843 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_conduit.json @@ -0,0 +1,70 @@ +{ + "__comment": "blockstate parameters MUST be in alphabetical order!", + "variants": { + "down=false,east=false,north=false,south=false,up=false,west=false": { "model": "baseelectric:electric_conduit_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=false,west=false": { "model": "baseelectric:electric_conduit_n", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=false,west=false": { "model": "baseelectric:electric_conduit_n", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=false,west=false": { "model": "baseelectric:electric_conduit_n", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=false,west=false": { "model": "baseelectric:electric_conduit_n", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=true,west=false": { "model": "baseelectric:electric_conduit_n", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=false,west=true": { "model": "baseelectric:electric_conduit_n", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=false,west=false": { "model": "baseelectric:electric_conduit_nw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=false,west=false": { "model": "baseelectric:electric_conduit_nw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=false,west=false": { "model": "baseelectric:electric_conduit_nw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=true,west=false": { "model": "baseelectric:electric_conduit_ns", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=false,west=true": { "model": "baseelectric:electric_conduit_nw", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=false,west=false": { "model": "baseelectric:electric_conduit_nw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=false,west=false": { "model": "baseelectric:electric_conduit_nw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=true,west=false": { "model": "baseelectric:electric_conduit_nw", "x": 270, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=false,west=true": { "model": "baseelectric:electric_conduit_ns", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=false,west=false": { "model": "baseelectric:electric_conduit_ns", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=true,west=false": { "model": "baseelectric:electric_conduit_nw", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=false,west=true": { "model": "baseelectric:electric_conduit_nw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=true,west=false": { "model": "baseelectric:electric_conduit_nw", "x": 270, "y": 270, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=false,west=true": { "model": "baseelectric:electric_conduit_nw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=true,west=true": { "model": "baseelectric:electric_conduit_nw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=false,west=false": { "model": "baseelectric:electric_conduit_nuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=false,west=false": { "model": "baseelectric:electric_conduit_nuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=true,west=false": { "model": "baseelectric:electric_conduit_dnu", "x": 0, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=false,west=true": { "model": "baseelectric:electric_conduit_dnu", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=false,west=false": { "model": "baseelectric:electric_conduit_dnu", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=true,west=false": { "model": "baseelectric:electric_conduit_dnu", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=false,west=true": { "model": "baseelectric:electric_conduit_nuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=true,west=false": { "model": "baseelectric:electric_conduit_dnu", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=false,west=true": { "model": "baseelectric:electric_conduit_nuw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=true,west=true": { "model": "baseelectric:electric_conduit_dnu", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=false,west=false": { "model": "baseelectric:electric_conduit_nsw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=true,west=false": { "model": "baseelectric:electric_conduit_nuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=false,west=true": { "model": "baseelectric:electric_conduit_nsw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=true,west=false": { "model": "baseelectric:electric_conduit_nuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=false,west=true": { "model": "baseelectric:electric_conduit_nsw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=true,west=true": { "model": "baseelectric:electric_conduit_dnu", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=true,west=false": { "model": "baseelectric:electric_conduit_dnu", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=false,west=true": { "model": "baseelectric:electric_conduit_nsw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=true,west=true": { "model": "baseelectric:electric_conduit_nuw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=true,west=true": { "model": "baseelectric:electric_conduit_nuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=false,west=false": { "model": "baseelectric:electric_conduit_nsuw", "x": 180, "y": 180, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=true,west=false": { "model": "baseelectric:electric_conduit_nsuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=false,west=true": { "model": "baseelectric:electric_conduit_nsuw", "x": 180, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=true,west=false": { "model": "baseelectric:electric_conduit_nsuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=false,west=true": { "model": "baseelectric:electric_conduit_nsuw", "x": 180, "y": 270, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=true,west=true": { "model": "baseelectric:electric_conduit_ensw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=true,west=false": { "model": "baseelectric:electric_conduit_ensw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=false,west=true": { "model": "baseelectric:electric_conduit_nsuw", "x": 180, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=true,west=true": { "model": "baseelectric:electric_conduit_nsuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=true,west=true": { "model": "baseelectric:electric_conduit_nsuw", "x": 90, "y": 270, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=true,west=false": { "model": "baseelectric:electric_conduit_nsuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=false,west=true": { "model": "baseelectric:electric_conduit_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=true,west=true": { "model": "baseelectric:electric_conduit_nsuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=true,west=true": { "model": "baseelectric:electric_conduit_nsuw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=true,west=true": { "model": "baseelectric:electric_conduit_nsuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=true,west=false": { "model": "baseelectric:electric_conduit_desuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=false,west=true": { "model": "baseelectric:electric_conduit_desuw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=true,west=true": { "model": "baseelectric:electric_conduit_desuw", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=true,west=true": { "model": "baseelectric:electric_conduit_desuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=true,west=true": { "model": "baseelectric:electric_conduit_desuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=true,west=true": { "model": "baseelectric:electric_conduit_desuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=true,west=true": { "model": "baseelectric:electric_conduit_densuw", "x": 0, "y": 0, "uvlock": false } + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_crusher.json b/src/main/resources/assets/baseelectric/blockstates/electric_crusher.json new file mode 100644 index 0000000..ad918cc --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_crusher.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:electric_crusher_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:electric_crusher_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:electric_crusher_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:electric_crusher_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:electric_crusher_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:electric_crusher_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:electric_crusher_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:electric_crusher_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:electric_crusher_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:electric_crusher_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:electric_crusher_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:electric_crusher_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:electric_crusher_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:electric_crusher_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:electric_crusher_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:electric_crusher_on", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_drill.json b/src/main/resources/assets/baseelectric/blockstates/electric_drill.json new file mode 100644 index 0000000..011d5e6 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_drill.json @@ -0,0 +1,16 @@ +{ + "variants": { + "active=true,facing=up": { "model": "baseelectric:electric_drill_on", "x":270 }, + "active=true,facing=down": { "model": "baseelectric:electric_drill_on", "x": 90 }, + "active=true,facing=east": { "model": "baseelectric:electric_drill_on", "y": 90 }, + "active=true,facing=north": { "model": "baseelectric:electric_drill_on" }, + "active=true,facing=south": { "model": "baseelectric:electric_drill_on", "y": 180 }, + "active=true,facing=west": { "model": "baseelectric:electric_drill_on", "y": 270 }, + "active=false,facing=up": { "model": "baseelectric:electric_drill_off", "x":270 }, + "active=false,facing=down": { "model": "baseelectric:electric_drill_off", "x": 90 }, + "active=false,facing=east": { "model": "baseelectric:electric_drill_off", "y": 90 }, + "active=false,facing=north": { "model": "baseelectric:electric_drill_off" }, + "active=false,facing=south": { "model": "baseelectric:electric_drill_off", "y": 180 }, + "active=false,facing=west": { "model": "baseelectric:electric_drill_off", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_fabricator.json b/src/main/resources/assets/baseelectric/blockstates/electric_fabricator.json new file mode 100644 index 0000000..4f2d8e6 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_fabricator.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:electric_fabricator_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:electric_fabricator_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:electric_fabricator_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:electric_fabricator_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:electric_fabricator_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:electric_fabricator_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:electric_fabricator_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:electric_fabricator_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:electric_fabricator_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:electric_fabricator_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:electric_fabricator_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:electric_fabricator_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:electric_fabricator_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:electric_fabricator_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:electric_fabricator_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:electric_fabricator_on", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_furnace.json b/src/main/resources/assets/baseelectric/blockstates/electric_furnace.json new file mode 100644 index 0000000..8b4b2d2 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_furnace.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:electric_furnace_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:electric_furnace_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:electric_furnace_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:electric_furnace_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:electric_furnace_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:electric_furnace_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:electric_furnace_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:electric_furnace_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:electric_furnace_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:electric_furnace_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:electric_furnace_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:electric_furnace_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:electric_furnace_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:electric_furnace_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:electric_furnace_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:electric_furnace_on", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_oven.json b/src/main/resources/assets/baseelectric/blockstates/electric_oven.json new file mode 100644 index 0000000..552e36a --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_oven.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:electric_oven_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:electric_oven_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:electric_oven_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:electric_oven_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:electric_oven_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:electric_oven_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:electric_oven_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:electric_oven_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:electric_oven_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:electric_oven_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:electric_oven_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:electric_oven_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:electric_oven_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:electric_oven_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:electric_oven_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:electric_oven_on", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_pcb_printer.json b/src/main/resources/assets/baseelectric/blockstates/electric_pcb_printer.json new file mode 100644 index 0000000..428666f --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_pcb_printer.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:electric_pcb_printer_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:electric_pcb_printer_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:electric_pcb_printer_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:electric_pcb_printer_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:electric_pcb_printer_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:electric_pcb_printer_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:electric_pcb_printer_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:electric_pcb_printer_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:electric_pcb_printer_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:electric_pcb_printer_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:electric_pcb_printer_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:electric_pcb_printer_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:electric_pcb_printer_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:electric_pcb_printer_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:electric_pcb_printer_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:electric_pcb_printer_on", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_pump.json b/src/main/resources/assets/baseelectric/blockstates/electric_pump.json new file mode 100644 index 0000000..1e39411 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_pump.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:electric_pump_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:electric_pump_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:electric_pump_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:electric_pump_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:electric_pump_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:electric_pump_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:electric_pump_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:electric_pump_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:electric_pump_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:electric_pump_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:electric_pump_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:electric_pump_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:electric_pump_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:electric_pump_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:electric_pump_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:electric_pump_on", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_still.json b/src/main/resources/assets/baseelectric/blockstates/electric_still.json new file mode 100644 index 0000000..90f3584 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_still.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:electric_still_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:electric_still_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:electric_still_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:electric_still_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:electric_still_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:electric_still_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:electric_still_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:electric_still_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:electric_still_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:electric_still_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:electric_still_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:electric_still_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:electric_still_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:electric_still_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:electric_still_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:electric_still_on", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_switch.json b/src/main/resources/assets/baseelectric/blockstates/electric_switch.json new file mode 100644 index 0000000..c0a925c --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_switch.json @@ -0,0 +1,6 @@ +{ + "variants": { + "active=false": { "model": "baseelectric:electric_switch_off"}, + "active=true": { "model": "baseelectric:electric_switch_on"} + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/electric_track.json b/src/main/resources/assets/baseelectric/blockstates/electric_track.json new file mode 100644 index 0000000..a8a7c1a --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/electric_track.json @@ -0,0 +1,70 @@ +{ + "__comment": "blockstate parameters MUST be in alphabetical order!", + "variants": { + "down=false,east=false,north=false,south=false,up=false,west=false": { "model": "baseelectric:electric_track_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=false,west=false": { "model": "baseelectric:electric_track_n", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=false,west=false": { "model": "baseelectric:electric_track_n", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=false,west=false": { "model": "baseelectric:electric_track_n", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=false,west=false": { "model": "baseelectric:electric_track_n", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=true,west=false": { "model": "baseelectric:electric_track_n", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=false,west=true": { "model": "baseelectric:electric_track_n", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=false,west=false": { "model": "baseelectric:electric_track_nw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=false,west=false": { "model": "baseelectric:electric_track_nw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=false,west=false": { "model": "baseelectric:electric_track_nw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=true,west=false": { "model": "baseelectric:electric_track_ns", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=false,west=true": { "model": "baseelectric:electric_track_nw", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=false,west=false": { "model": "baseelectric:electric_track_nw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=false,west=false": { "model": "baseelectric:electric_track_nw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=true,west=false": { "model": "baseelectric:electric_track_nw", "x": 270, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=false,west=true": { "model": "baseelectric:electric_track_ns", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=false,west=false": { "model": "baseelectric:electric_track_ns", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=true,west=false": { "model": "baseelectric:electric_track_nw", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=false,west=true": { "model": "baseelectric:electric_track_nw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=true,west=false": { "model": "baseelectric:electric_track_nw", "x": 270, "y": 270, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=false,west=true": { "model": "baseelectric:electric_track_nw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,north=false,south=false,up=true,west=true": { "model": "baseelectric:electric_track_nw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=false,west=false": { "model": "baseelectric:electric_track_nuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=false,west=false": { "model": "baseelectric:electric_track_nuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=true,west=false": { "model": "baseelectric:electric_track_dnu", "x": 0, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=false,west=true": { "model": "baseelectric:electric_track_dnu", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=false,west=false": { "model": "baseelectric:electric_track_dnu", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=true,west=false": { "model": "baseelectric:electric_track_dnu", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=false,west=true": { "model": "baseelectric:electric_track_nuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=true,west=false": { "model": "baseelectric:electric_track_dnu", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=false,west=true": { "model": "baseelectric:electric_track_nuw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,north=false,south=false,up=true,west=true": { "model": "baseelectric:electric_track_dnu", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=false,west=false": { "model": "baseelectric:electric_track_nsw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=true,west=false": { "model": "baseelectric:electric_track_nuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=false,west=true": { "model": "baseelectric:electric_track_nsw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=true,west=false": { "model": "baseelectric:electric_track_nuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=false,west=true": { "model": "baseelectric:electric_track_nsw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,north=false,south=false,up=true,west=true": { "model": "baseelectric:electric_track_dnu", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=true,west=false": { "model": "baseelectric:electric_track_dnu", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=false,west=true": { "model": "baseelectric:electric_track_nsw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=true,south=false,up=true,west=true": { "model": "baseelectric:electric_track_nuw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,north=false,south=true,up=true,west=true": { "model": "baseelectric:electric_track_nuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=false,west=false": { "model": "baseelectric:electric_track_nsuw", "x": 180, "y": 180, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=true,west=false": { "model": "baseelectric:electric_track_nsuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=false,west=true": { "model": "baseelectric:electric_track_nsuw", "x": 180, "y": 90, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=true,west=false": { "model": "baseelectric:electric_track_nsuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=false,west=true": { "model": "baseelectric:electric_track_nsuw", "x": 180, "y": 270, "uvlock": false }, + "down=true,east=true,north=false,south=false,up=true,west=true": { "model": "baseelectric:electric_track_ensw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=true,west=false": { "model": "baseelectric:electric_track_ensw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=false,west=true": { "model": "baseelectric:electric_track_nsuw", "x": 180, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=false,up=true,west=true": { "model": "baseelectric:electric_track_nsuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,north=false,south=true,up=true,west=true": { "model": "baseelectric:electric_track_nsuw", "x": 90, "y": 270, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=true,west=false": { "model": "baseelectric:electric_track_nsuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=false,west=true": { "model": "baseelectric:electric_track_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=true,north=true,south=false,up=true,west=true": { "model": "baseelectric:electric_track_nsuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=false,south=true,up=true,west=true": { "model": "baseelectric:electric_track_nsuw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,north=true,south=true,up=true,west=true": { "model": "baseelectric:electric_track_nsuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=true,west=false": { "model": "baseelectric:electric_track_desuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=false,west=true": { "model": "baseelectric:electric_track_desuw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=false,up=true,west=true": { "model": "baseelectric:electric_track_desuw", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=true,north=false,south=true,up=true,west=true": { "model": "baseelectric:electric_track_desuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,north=true,south=true,up=true,west=true": { "model": "baseelectric:electric_track_desuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,north=true,south=true,up=true,west=true": { "model": "baseelectric:electric_track_desuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=true,north=true,south=true,up=true,west=true": { "model": "baseelectric:electric_track_densuw", "x": 0, "y": 0, "uvlock": false } + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/baseelectric/blockstates/geothermal_generator.json b/src/main/resources/assets/baseelectric/blockstates/geothermal_generator.json new file mode 100644 index 0000000..676b6e0 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/geothermal_generator.json @@ -0,0 +1,12 @@ +{ + "variants": { + "active=true,facing=east": { "model": "baseelectric:geothermal_generator", "y": 90 }, + "active=true,facing=north": { "model": "baseelectric:geothermal_generator" }, + "active=true,facing=south": { "model": "baseelectric:geothermal_generator", "y": 180 }, + "active=true,facing=west": { "model": "baseelectric:geothermal_generator", "y": 270 }, + "active=false,facing=east": { "model": "baseelectric:geothermal_generator", "y": 90 }, + "active=false,facing=north": { "model": "baseelectric:geothermal_generator" }, + "active=false,facing=south": { "model": "baseelectric:geothermal_generator", "y": 180 }, + "active=false,facing=west": { "model": "baseelectric:geothermal_generator", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/growth_chamber.json b/src/main/resources/assets/baseelectric/blockstates/growth_chamber.json new file mode 100644 index 0000000..3f1ef00 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/growth_chamber.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:growth_chamber_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:growth_chamber_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:growth_chamber_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:growth_chamber_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:growth_chamber_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:growth_chamber_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:growth_chamber_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:growth_chamber_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:growth_chamber_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:growth_chamber_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:growth_chamber_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:growth_chamber_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:growth_chamber_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:growth_chamber_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:growth_chamber_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:growth_chamber_on", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/growth_chamber_controller.json b/src/main/resources/assets/baseelectric/blockstates/growth_chamber_controller.json new file mode 100644 index 0000000..3198d5b --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/growth_chamber_controller.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=east": { "model": "baseelectric:growth_chamber_controller", "y": 90 }, + "facing=north": { "model": "baseelectric:growth_chamber_controller" }, + "facing=south": { "model": "baseelectric:growth_chamber_controller", "y": 180 }, + "facing=west": { "model": "baseelectric:growth_chamber_controller", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/hydroelectric_generator.json b/src/main/resources/assets/baseelectric/blockstates/hydroelectric_generator.json new file mode 100644 index 0000000..b91f58d --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/hydroelectric_generator.json @@ -0,0 +1,12 @@ +{ + "variants": { + "active=true,facing=east": { "model": "baseelectric:hydroelectric_generator_on", "y": 90 }, + "active=true,facing=north": { "model": "baseelectric:hydroelectric_generator_on" }, + "active=true,facing=south": { "model": "baseelectric:hydroelectric_generator_on", "y": 180 }, + "active=true,facing=west": { "model": "baseelectric:hydroelectric_generator_on", "y": 270 }, + "active=false,facing=east": { "model": "baseelectric:hydroelectric_generator_off", "y": 90 }, + "active=false,facing=north": { "model": "baseelectric:hydroelectric_generator_off" }, + "active=false,facing=south": { "model": "baseelectric:hydroelectric_generator_off", "y": 180 }, + "active=false,facing=west": { "model": "baseelectric:hydroelectric_generator_off", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/laser_turret.json b/src/main/resources/assets/baseelectric/blockstates/laser_turret.json new file mode 100644 index 0000000..a66b21c --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/laser_turret.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:laser_turret", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:laser_turret" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:laser_turret", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:laser_turret", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:laser_turret", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:laser_turret" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:laser_turret", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:laser_turret", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:laser_turret", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:laser_turret" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:laser_turret", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:laser_turret", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:laser_turret", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:laser_turret" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:laser_turret", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:laser_turret", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/laser_turret_evil.json b/src/main/resources/assets/baseelectric/blockstates/laser_turret_evil.json new file mode 100644 index 0000000..a66b21c --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/laser_turret_evil.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:laser_turret", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:laser_turret" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:laser_turret", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:laser_turret", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:laser_turret", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:laser_turret" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:laser_turret", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:laser_turret", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:laser_turret", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:laser_turret" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:laser_turret", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:laser_turret", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:laser_turret", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:laser_turret" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:laser_turret", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:laser_turret", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/led_bar.json b/src/main/resources/assets/baseelectric/blockstates/led_bar.json new file mode 100644 index 0000000..aee8c61 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/led_bar.json @@ -0,0 +1,134 @@ +{ + "__comment": "blockstate parameters MUST be in alphabetical order!", + "variants": { + "down=false,east=false,lit=false,north=false,south=false,up=false,west=false": { "model": "baseelectric:led_bar_off_n", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=false,north=false,south=false,up=false,west=false": { "model": "baseelectric:led_bar_off_n", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,lit=false,north=false,south=false,up=false,west=false": { "model": "baseelectric:led_bar_off_n", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,lit=false,north=true,south=false,up=false,west=false": { "model": "baseelectric:led_bar_off_n", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,lit=false,north=false,south=true,up=false,west=false": { "model": "baseelectric:led_bar_off_n", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=false,lit=false,north=false,south=false,up=true,west=false": { "model": "baseelectric:led_bar_off_n", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,lit=false,north=false,south=false,up=false,west=true": { "model": "baseelectric:led_bar_off_n", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,lit=false,north=false,south=false,up=false,west=false": { "model": "baseelectric:led_bar_off_nw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=false,lit=false,north=true,south=false,up=false,west=false": { "model": "baseelectric:led_bar_off_nw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,lit=false,north=false,south=true,up=false,west=false": { "model": "baseelectric:led_bar_off_nw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,lit=false,north=false,south=false,up=true,west=false": { "model": "baseelectric:led_bar_off_ns", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=false,north=false,south=false,up=false,west=true": { "model": "baseelectric:led_bar_off_nw", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,lit=false,north=true,south=false,up=false,west=false": { "model": "baseelectric:led_bar_off_nw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,lit=false,north=false,south=true,up=false,west=false": { "model": "baseelectric:led_bar_off_nw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,lit=false,north=false,south=false,up=true,west=false": { "model": "baseelectric:led_bar_off_nw", "x": 270, "y": 180, "uvlock": false }, + "down=false,east=true,lit=false,north=false,south=false,up=false,west=true": { "model": "baseelectric:led_bar_off_ns", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,lit=false,north=true,south=true,up=false,west=false": { "model": "baseelectric:led_bar_off_ns", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,lit=false,north=true,south=false,up=true,west=false": { "model": "baseelectric:led_bar_off_nw", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,lit=false,north=true,south=false,up=false,west=true": { "model": "baseelectric:led_bar_off_nw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,lit=false,north=false,south=true,up=true,west=false": { "model": "baseelectric:led_bar_off_nw", "x": 270, "y": 270, "uvlock": false }, + "down=false,east=false,lit=false,north=false,south=true,up=false,west=true": { "model": "baseelectric:led_bar_off_nw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,lit=false,north=false,south=false,up=true,west=true": { "model": "baseelectric:led_bar_off_nw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,lit=false,north=true,south=false,up=false,west=false": { "model": "baseelectric:led_bar_off_nuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,lit=false,north=false,south=true,up=false,west=false": { "model": "baseelectric:led_bar_off_nuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,lit=false,north=false,south=false,up=true,west=false": { "model": "baseelectric:led_bar_off_dnu", "x": 0, "y": 90, "uvlock": false }, + "down=true,east=true,lit=false,north=false,south=false,up=false,west=true": { "model": "baseelectric:led_bar_off_dnu", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,lit=false,north=true,south=true,up=false,west=false": { "model": "baseelectric:led_bar_off_dnu", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=false,north=true,south=false,up=true,west=false": { "model": "baseelectric:led_bar_off_dnu", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,lit=false,north=true,south=false,up=false,west=true": { "model": "baseelectric:led_bar_off_nuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=false,north=false,south=true,up=true,west=false": { "model": "baseelectric:led_bar_off_dnu", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=false,lit=false,north=false,south=true,up=false,west=true": { "model": "baseelectric:led_bar_off_nuw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,lit=false,north=false,south=false,up=true,west=true": { "model": "baseelectric:led_bar_off_dnu", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,lit=false,north=true,south=true,up=false,west=false": { "model": "baseelectric:led_bar_off_nsw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,lit=false,north=true,south=false,up=true,west=false": { "model": "baseelectric:led_bar_off_nuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,lit=false,north=true,south=false,up=false,west=true": { "model": "baseelectric:led_bar_off_nsw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,lit=false,north=false,south=true,up=true,west=false": { "model": "baseelectric:led_bar_off_nuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,lit=false,north=false,south=true,up=false,west=true": { "model": "baseelectric:led_bar_off_nsw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,lit=false,north=false,south=false,up=true,west=true": { "model": "baseelectric:led_bar_off_dnu", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,lit=false,north=true,south=true,up=true,west=false": { "model": "baseelectric:led_bar_off_dnu", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,lit=false,north=true,south=true,up=false,west=true": { "model": "baseelectric:led_bar_off_nsw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,lit=false,north=true,south=false,up=true,west=true": { "model": "baseelectric:led_bar_off_nuw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,lit=false,north=false,south=true,up=true,west=true": { "model": "baseelectric:led_bar_off_nuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,lit=false,north=true,south=true,up=false,west=false": { "model": "baseelectric:led_bar_off_nsuw", "x": 180, "y": 180, "uvlock": false }, + "down=true,east=true,lit=false,north=true,south=false,up=true,west=false": { "model": "baseelectric:led_bar_off_nsuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,lit=false,north=true,south=false,up=false,west=true": { "model": "baseelectric:led_bar_off_nsuw", "x": 180, "y": 90, "uvlock": false }, + "down=true,east=true,lit=false,north=false,south=true,up=true,west=false": { "model": "baseelectric:led_bar_off_nsuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,lit=false,north=false,south=true,up=false,west=true": { "model": "baseelectric:led_bar_off_nsuw", "x": 180, "y": 270, "uvlock": false }, + "down=true,east=true,lit=false,north=false,south=false,up=true,west=true": { "model": "baseelectric:led_bar_off_ensw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=false,north=true,south=true,up=true,west=false": { "model": "baseelectric:led_bar_off_ensw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,lit=false,north=true,south=true,up=false,west=true": { "model": "baseelectric:led_bar_off_nsuw", "x": 180, "y": 0, "uvlock": false }, + "down=true,east=false,lit=false,north=true,south=false,up=true,west=true": { "model": "baseelectric:led_bar_off_nsuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=false,north=false,south=true,up=true,west=true": { "model": "baseelectric:led_bar_off_nsuw", "x": 90, "y": 270, "uvlock": false }, + "down=false,east=true,lit=false,north=true,south=true,up=true,west=false": { "model": "baseelectric:led_bar_off_nsuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,lit=false,north=true,south=true,up=false,west=true": { "model": "baseelectric:led_bar_off_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=true,lit=false,north=true,south=false,up=true,west=true": { "model": "baseelectric:led_bar_off_nsuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,lit=false,north=false,south=true,up=true,west=true": { "model": "baseelectric:led_bar_off_nsuw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,lit=false,north=true,south=true,up=true,west=true": { "model": "baseelectric:led_bar_off_nsuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=true,lit=false,north=true,south=true,up=true,west=false": { "model": "baseelectric:led_bar_off_desuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,lit=false,north=true,south=true,up=false,west=true": { "model": "baseelectric:led_bar_off_desuw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,lit=false,north=true,south=false,up=true,west=true": { "model": "baseelectric:led_bar_off_desuw", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=true,lit=false,north=false,south=true,up=true,west=true": { "model": "baseelectric:led_bar_off_desuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,lit=false,north=true,south=true,up=true,west=true": { "model": "baseelectric:led_bar_off_desuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,lit=false,north=true,south=true,up=true,west=true": { "model": "baseelectric:led_bar_off_desuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=true,lit=false,north=true,south=true,up=true,west=true": { "model": "baseelectric:led_bar_off_densuw", "x": 0, "y": 0, "uvlock": false }, + + "down=false,east=false,lit=true,north=false,south=false,up=false,west=false": { "model": "baseelectric:led_bar_on_n", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=true,north=false,south=false,up=false,west=false": { "model": "baseelectric:led_bar_on_n", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,lit=true,north=false,south=false,up=false,west=false": { "model": "baseelectric:led_bar_on_n", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,lit=true,north=true,south=false,up=false,west=false": { "model": "baseelectric:led_bar_on_n", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,lit=true,north=false,south=true,up=false,west=false": { "model": "baseelectric:led_bar_on_n", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=false,lit=true,north=false,south=false,up=true,west=false": { "model": "baseelectric:led_bar_on_n", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,lit=true,north=false,south=false,up=false,west=true": { "model": "baseelectric:led_bar_on_n", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,lit=true,north=false,south=false,up=false,west=false": { "model": "baseelectric:led_bar_on_nw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=false,lit=true,north=true,south=false,up=false,west=false": { "model": "baseelectric:led_bar_on_nw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,lit=true,north=false,south=true,up=false,west=false": { "model": "baseelectric:led_bar_on_nw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,lit=true,north=false,south=false,up=true,west=false": { "model": "baseelectric:led_bar_on_ns", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=true,north=false,south=false,up=false,west=true": { "model": "baseelectric:led_bar_on_nw", "x": 90, "y": 0, "uvlock": false }, + "down=false,east=true,lit=true,north=true,south=false,up=false,west=false": { "model": "baseelectric:led_bar_on_nw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,lit=true,north=false,south=true,up=false,west=false": { "model": "baseelectric:led_bar_on_nw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,lit=true,north=false,south=false,up=true,west=false": { "model": "baseelectric:led_bar_on_nw", "x": 270, "y": 180, "uvlock": false }, + "down=false,east=true,lit=true,north=false,south=false,up=false,west=true": { "model": "baseelectric:led_bar_on_ns", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=false,lit=true,north=true,south=true,up=false,west=false": { "model": "baseelectric:led_bar_on_ns", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,lit=true,north=true,south=false,up=true,west=false": { "model": "baseelectric:led_bar_on_nw", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,lit=true,north=true,south=false,up=false,west=true": { "model": "baseelectric:led_bar_on_nw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,lit=true,north=false,south=true,up=true,west=false": { "model": "baseelectric:led_bar_on_nw", "x": 270, "y": 270, "uvlock": false }, + "down=false,east=false,lit=true,north=false,south=true,up=false,west=true": { "model": "baseelectric:led_bar_on_nw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,lit=true,north=false,south=false,up=true,west=true": { "model": "baseelectric:led_bar_on_nw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,lit=true,north=true,south=false,up=false,west=false": { "model": "baseelectric:led_bar_on_nuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,lit=true,north=false,south=true,up=false,west=false": { "model": "baseelectric:led_bar_on_nuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,lit=true,north=false,south=false,up=true,west=false": { "model": "baseelectric:led_bar_on_dnu", "x": 0, "y": 90, "uvlock": false }, + "down=true,east=true,lit=true,north=false,south=false,up=false,west=true": { "model": "baseelectric:led_bar_on_dnu", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,lit=true,north=true,south=true,up=false,west=false": { "model": "baseelectric:led_bar_on_dnu", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=true,north=true,south=false,up=true,west=false": { "model": "baseelectric:led_bar_on_dnu", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,lit=true,north=true,south=false,up=false,west=true": { "model": "baseelectric:led_bar_on_nuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=true,north=false,south=true,up=true,west=false": { "model": "baseelectric:led_bar_on_dnu", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=false,lit=true,north=false,south=true,up=false,west=true": { "model": "baseelectric:led_bar_on_nuw", "x": 90, "y": 270, "uvlock": false }, + "down=true,east=false,lit=true,north=false,south=false,up=true,west=true": { "model": "baseelectric:led_bar_on_dnu", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,lit=true,north=true,south=true,up=false,west=false": { "model": "baseelectric:led_bar_on_nsw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,lit=true,north=true,south=false,up=true,west=false": { "model": "baseelectric:led_bar_on_nuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,lit=true,north=true,south=false,up=false,west=true": { "model": "baseelectric:led_bar_on_nsw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,lit=true,north=false,south=true,up=true,west=false": { "model": "baseelectric:led_bar_on_nuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,lit=true,north=false,south=true,up=false,west=true": { "model": "baseelectric:led_bar_on_nsw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=true,lit=true,north=false,south=false,up=true,west=true": { "model": "baseelectric:led_bar_on_dnu", "x": 270, "y": 90, "uvlock": false }, + "down=false,east=false,lit=true,north=true,south=true,up=true,west=false": { "model": "baseelectric:led_bar_on_dnu", "x": 270, "y": 0, "uvlock": false }, + "down=false,east=false,lit=true,north=true,south=true,up=false,west=true": { "model": "baseelectric:led_bar_on_nsw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,lit=true,north=true,south=false,up=true,west=true": { "model": "baseelectric:led_bar_on_nuw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=false,lit=true,north=false,south=true,up=true,west=true": { "model": "baseelectric:led_bar_on_nuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,lit=true,north=true,south=true,up=false,west=false": { "model": "baseelectric:led_bar_on_nsuw", "x": 180, "y": 180, "uvlock": false }, + "down=true,east=true,lit=true,north=true,south=false,up=true,west=false": { "model": "baseelectric:led_bar_on_nsuw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=true,lit=true,north=true,south=false,up=false,west=true": { "model": "baseelectric:led_bar_on_nsuw", "x": 180, "y": 90, "uvlock": false }, + "down=true,east=true,lit=true,north=false,south=true,up=true,west=false": { "model": "baseelectric:led_bar_on_nsuw", "x": 90, "y": 180, "uvlock": false }, + "down=true,east=true,lit=true,north=false,south=true,up=false,west=true": { "model": "baseelectric:led_bar_on_nsuw", "x": 180, "y": 270, "uvlock": false }, + "down=true,east=true,lit=true,north=false,south=false,up=true,west=true": { "model": "baseelectric:led_bar_on_ensw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=true,north=true,south=true,up=true,west=false": { "model": "baseelectric:led_bar_on_ensw", "x": 90, "y": 90, "uvlock": false }, + "down=true,east=false,lit=true,north=true,south=true,up=false,west=true": { "model": "baseelectric:led_bar_on_nsuw", "x": 180, "y": 0, "uvlock": false }, + "down=true,east=false,lit=true,north=true,south=false,up=true,west=true": { "model": "baseelectric:led_bar_on_nsuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=false,lit=true,north=false,south=true,up=true,west=true": { "model": "baseelectric:led_bar_on_nsuw", "x": 90, "y": 270, "uvlock": false }, + "down=false,east=true,lit=true,north=true,south=true,up=true,west=false": { "model": "baseelectric:led_bar_on_nsuw", "x": 0, "y": 180, "uvlock": false }, + "down=false,east=true,lit=true,north=true,south=true,up=false,west=true": { "model": "baseelectric:led_bar_on_ensw", "x": 0, "y": 0, "uvlock": false }, + "down=false,east=true,lit=true,north=true,south=false,up=true,west=true": { "model": "baseelectric:led_bar_on_nsuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,lit=true,north=false,south=true,up=true,west=true": { "model": "baseelectric:led_bar_on_nsuw", "x": 0, "y": 270, "uvlock": false }, + "down=false,east=false,lit=true,north=true,south=true,up=true,west=true": { "model": "baseelectric:led_bar_on_nsuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=true,lit=true,north=true,south=true,up=true,west=false": { "model": "baseelectric:led_bar_on_desuw", "x": 0, "y": 270, "uvlock": false }, + "down=true,east=true,lit=true,north=true,south=true,up=false,west=true": { "model": "baseelectric:led_bar_on_desuw", "x": 270, "y": 0, "uvlock": false }, + "down=true,east=true,lit=true,north=true,south=false,up=true,west=true": { "model": "baseelectric:led_bar_on_desuw", "x": 0, "y": 180, "uvlock": false }, + "down=true,east=true,lit=true,north=false,south=true,up=true,west=true": { "model": "baseelectric:led_bar_on_desuw", "x": 0, "y": 0, "uvlock": false }, + "down=true,east=false,lit=true,north=true,south=true,up=true,west=true": { "model": "baseelectric:led_bar_on_desuw", "x": 0, "y": 90, "uvlock": false }, + "down=false,east=true,lit=true,north=true,south=true,up=true,west=true": { "model": "baseelectric:led_bar_on_desuw", "x": 90, "y": 0, "uvlock": false }, + "down=true,east=true,lit=true,north=true,south=true,up=true,west=true": { "model": "baseelectric:led_bar_on_densuw", "x": 0, "y": 0, "uvlock": false } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/baseelectric/blockstates/li_ore.json b/src/main/resources/assets/baseelectric/blockstates/li_ore.json new file mode 100644 index 0000000..a26c252 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/li_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "baseelectric:li_ore" } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/photovoltaic_generator.json b/src/main/resources/assets/baseelectric/blockstates/photovoltaic_generator.json new file mode 100644 index 0000000..061c9ec --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/photovoltaic_generator.json @@ -0,0 +1,12 @@ +{ + "variants": { + "active=true,facing=east": { "model": "baseelectric:photovoltaic_generator", "y": 90 }, + "active=true,facing=north": { "model": "baseelectric:photovoltaic_generator" }, + "active=true,facing=south": { "model": "baseelectric:photovoltaic_generator", "y": 180 }, + "active=true,facing=west": { "model": "baseelectric:photovoltaic_generator", "y": 270 }, + "active=false,facing=east": { "model": "baseelectric:photovoltaic_generator", "y": 90 }, + "active=false,facing=north": { "model": "baseelectric:photovoltaic_generator" }, + "active=false,facing=south": { "model": "baseelectric:photovoltaic_generator", "y": 180 }, + "active=false,facing=west": { "model": "baseelectric:photovoltaic_generator", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/plastic_refinery.json b/src/main/resources/assets/baseelectric/blockstates/plastic_refinery.json new file mode 100644 index 0000000..8f77563 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/plastic_refinery.json @@ -0,0 +1,20 @@ +{ + "variants": { + "active=true,facing=east,powered=true": { "model": "baseelectric:plastic_refinery_on", "y": 90 }, + "active=true,facing=north,powered=true": { "model": "baseelectric:plastic_refinery_on" }, + "active=true,facing=south,powered=true": { "model": "baseelectric:plastic_refinery_on", "y": 180 }, + "active=true,facing=west,powered=true": { "model": "baseelectric:plastic_refinery_on", "y": 270 }, + "active=false,facing=east,powered=true": { "model": "baseelectric:plastic_refinery_powered", "y": 90 }, + "active=false,facing=north,powered=true": { "model": "baseelectric:plastic_refinery_powered" }, + "active=false,facing=south,powered=true": { "model": "baseelectric:plastic_refinery_powered", "y": 180 }, + "active=false,facing=west,powered=true": { "model": "baseelectric:plastic_refinery_powered", "y": 270 }, + "active=false,facing=east,powered=false": { "model": "baseelectric:plastic_refinery_off", "y": 90 }, + "active=false,facing=north,powered=false": { "model": "baseelectric:plastic_refinery_off" }, + "active=false,facing=south,powered=false": { "model": "baseelectric:plastic_refinery_off", "y": 180 }, + "active=false,facing=west,powered=false": { "model": "baseelectric:plastic_refinery_off", "y": 270 }, + "active=true,facing=east,powered=false": { "model": "baseelectric:plastic_refinery_on", "y": 90 }, + "active=true,facing=north,powered=false": { "model": "baseelectric:plastic_refinery_on" }, + "active=true,facing=south,powered=false": { "model": "baseelectric:plastic_refinery_on", "y": 180 }, + "active=true,facing=west,powered=false": { "model": "baseelectric:plastic_refinery_on", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/pump_pipe_electric.json b/src/main/resources/assets/baseelectric/blockstates/pump_pipe_electric.json new file mode 100644 index 0000000..4051e54 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/pump_pipe_electric.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": {"model": "basepower:fluid_pipe_ns", "x": 90, "y": 0, "uvlock": false } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/steam_powered_generator.json b/src/main/resources/assets/baseelectric/blockstates/steam_powered_generator.json new file mode 100644 index 0000000..f883c7f --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/steam_powered_generator.json @@ -0,0 +1,12 @@ +{ + "variants": { + "active=true,facing=east": { "model": "baseelectric:steam_powered_generator_on", "y": 90 }, + "active=true,facing=north": { "model": "baseelectric:steam_powered_generator_on" }, + "active=true,facing=south": { "model": "baseelectric:steam_powered_generator_on", "y": 180 }, + "active=true,facing=west": { "model": "baseelectric:steam_powered_generator_on", "y": 270 }, + "active=false,facing=east": { "model": "baseelectric:steam_powered_generator_off", "y": 90 }, + "active=false,facing=north": { "model": "baseelectric:steam_powered_generator_off" }, + "active=false,facing=south": { "model": "baseelectric:steam_powered_generator_off", "y": 180 }, + "active=false,facing=west": { "model": "baseelectric:steam_powered_generator_off", "y": 270 } + } +} diff --git a/src/main/resources/assets/baseelectric/blockstates/sulfur_ore.json b/src/main/resources/assets/baseelectric/blockstates/sulfur_ore.json new file mode 100644 index 0000000..1a97290 --- /dev/null +++ b/src/main/resources/assets/baseelectric/blockstates/sulfur_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "baseelectric:sulfur_ore" } + } +} diff --git a/src/main/resources/assets/baseelectric/lang/de_de.lang b/src/main/resources/assets/baseelectric/lang/de_de.lang new file mode 100644 index 0000000..d3520e7 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/de_de.lang @@ -0,0 +1,54 @@ +language_support_goals=Englisch (en_US, de_DE, en_CA, de_DE, en_AU, en_PT), Spanisch (es_MX, es_ES), Chinesisch (zh_CN), Japanisch (ja_JA), Portugiesisch (pt_BR), Deutsch (de_DE), Italienisch (it_IT), Koreanisch (ko_KR) + +item.baseelectric.blank_circuit_board.name=Leiterplatte (Leer) +item.baseelectric.control_circuit.name=Steuerstromkreis +item.baseelectric.integrated_circuit.name=Mikrochip +item.baseelectric.psu.name=Netzteil +item.baseelectric.silicon_ingot.name=Silizium-Ingots +item.baseelectric.silicon_mix.name=Silizium-Mischung +item.baseelectric.solder_mix.name=Lötmetall Mischung +item.baseelectric.solder.name=Lötmetall +item.baseelectric.li_powder.name=Pulverisierte Lithium +item.baseelectric.li_ingot.name=Lithium-Barren +item.baseelectric.li_nugget.name=Lithium Nugget +item.baseelectric.sulfur_powder.name=Schwefelpulver +item.baseelectric.lead_acid_battery.name=Blei-Säure-Batterie +item.baseelectric.nickel_hydride_battery.name=Nickel-Metallhydrid-Batterie +item.baseelectric.alkaline_battery.name=Alkali-Batterie +item.baseelectric.lithium_battery.name=Lithium-Ionen-Batterie + +tile.baseelectric.electric_conduit.name=Elektrischen Draht +tile.baseelectric.electric_track.name=Elektro-Gerüst +tile.baseelectric.electric_battery_array.name=Batterie Array +tile.baseelectric.electric_crusher.name=Elektrische Felsen-Zerkleinerungsmaschine +tile.baseelectric.laser_turret.name=Laser-Verteidigung Waffe +tile.baseelectric.electric_drill.name=Laser Bohrer +tile.baseelectric.electric_fabricator.name=Automatisierte Fabrik +tile.baseelectric.electric_furnace.name=Lichtbogenofen +tile.baseelectric.electric_oven.name=Elektro-Ofen +tile.baseelectric.electric_pcb_printer.name=PCB Drucker +tile.baseelectric.geothermal_generator.name=Geothermal Generator +tile.baseelectric.hydroelectric_generator.name=Hydroelectric Generator +tile.baseelectric.photovoltaic_generator.name=Photovoltaik-Generator +tile.baseelectric.steam_powered_generator.name=Pumpenlose Stromerzeuger +tile.baseelectric.growth_chamber.name=Wachstumskammer +tile.baseelectric.growth_chamber_controller.name=Wachstumskammer Steuereinheit +tile.baseelectric.li_ore.name=Lithiumerz +tile.baseelectric.sulfur_ore.name=Schwefelerz +tile.baseelectric.led_bar.name=LED Draht + +tooltip.battery.charge=Lade +tooltip.battery.capacity=Kapazität + +death.attack.laser=%1$s verdampft +death.attack.laser.player=%2$s verdampft %1$s +death.attack.propeller=%1$s wurde von einem Propeller pulverisiert. +death.attack.propeller.player=%2$s geschoben %1$s in einen Propeller. + + +tile.baseelectric.electric_switch.name=Elektrische Schalter +tile.baseelectric.electric_still.name=Elektro Brennerei +tile.baseelectric.electric_pump.name=Elektropumpe +tile.baseelectric.plastic_refinery.name=Kunststoff-Raffinerie +item.baseelectric.petrolplastic_ingot.name=Erdöl Kunststoff Barren +tile.baseelectric.pump_pipe_electric.name=Pumpenrohr diff --git a/src/main/resources/assets/baseelectric/lang/en_au.lang b/src/main/resources/assets/baseelectric/lang/en_au.lang new file mode 100644 index 0000000..c20bc22 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/en_au.lang @@ -0,0 +1,54 @@ +language_support_goals=english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR) + +item.baseelectric.blank_circuit_board.name=Circuit Board (Blank) +item.baseelectric.control_circuit.name=Control Circuit +item.baseelectric.integrated_circuit.name=Microchip +item.baseelectric.psu.name=Power Supply Unit +item.baseelectric.silicon_ingot.name=Silicon Ingot +item.baseelectric.silicon_mix.name=Silicon Blend +item.baseelectric.solder_mix.name=Solder Blend +item.baseelectric.solder.name=Solder +item.baseelectric.li_powder.name=Powdered Lithium +item.baseelectric.li_ingot.name=Lithium Ingot +item.baseelectric.li_nugget.name=Lithium Nugget +item.baseelectric.sulfur_powder.name=Powdered Sulfur +item.baseelectric.lead_acid_battery.name=Lead-Acid Battery +item.baseelectric.nickel_hydride_battery.name=Nickel-Metal Hydride Battery +item.baseelectric.alkaline_battery.name=Alkaline Battery +item.baseelectric.lithium_battery.name=Lithium-Ion Battery + +tile.baseelectric.electric_conduit.name=Electric Power Cable +tile.baseelectric.electric_track.name=Electric Scaffold +tile.baseelectric.electric_battery_array.name=Battery Array +tile.baseelectric.electric_crusher.name=Electric Rock Crusher +tile.baseelectric.laser_turret.name=Laser Defense Turret +tile.baseelectric.electric_drill.name=Electric Mining Drill +tile.baseelectric.electric_fabricator.name=Automated Assembler +tile.baseelectric.electric_furnace.name=Electric Arc Furnace +tile.baseelectric.electric_oven.name=Electric Oven +tile.baseelectric.electric_pcb_printer.name=PCB Printer +tile.baseelectric.geothermal_generator.name=Geothermal Generator +tile.baseelectric.hydroelectric_generator.name=Hydroelectric Generator +tile.baseelectric.photovoltaic_generator.name=Photovoltaic Generator +tile.baseelectric.steam_powered_generator.name=Steam-Powered Electric Generator +tile.baseelectric.growth_chamber.name=Growth Chamber +tile.baseelectric.growth_chamber_controller.name=Growth Chamber Control Unit +tile.baseelectric.li_ore.name=Lithium Ore +tile.baseelectric.sulfur_ore.name=Sulfur Ore +tile.baseelectric.led_bar.name=LED Bar + +tooltip.battery.charge=Charge +tooltip.battery.capacity=Capacity + +death.attack.laser=%1$s vaporized +death.attack.laser.player=%2$s vaporized %1$s +death.attack.propeller=%1$s was pulverized by a propeller. +death.attack.propeller.player=%2$s pushed %1$s into a propeller. + + +tile.baseelectric.electric_switch.name=Electric Switch +tile.baseelectric.electric_still.name=Electric Distiller +tile.baseelectric.electric_pump.name=Electric Pump +tile.baseelectric.plastic_refinery.name=Petro-Plastic Refinery +item.baseelectric.petrolplastic_ingot.name=Petro-Plastic Ingot +tile.baseelectric.pump_pipe_electric.name=Pump Pipe diff --git a/src/main/resources/assets/baseelectric/lang/en_ca.lang b/src/main/resources/assets/baseelectric/lang/en_ca.lang new file mode 100644 index 0000000..c20bc22 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/en_ca.lang @@ -0,0 +1,54 @@ +language_support_goals=english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR) + +item.baseelectric.blank_circuit_board.name=Circuit Board (Blank) +item.baseelectric.control_circuit.name=Control Circuit +item.baseelectric.integrated_circuit.name=Microchip +item.baseelectric.psu.name=Power Supply Unit +item.baseelectric.silicon_ingot.name=Silicon Ingot +item.baseelectric.silicon_mix.name=Silicon Blend +item.baseelectric.solder_mix.name=Solder Blend +item.baseelectric.solder.name=Solder +item.baseelectric.li_powder.name=Powdered Lithium +item.baseelectric.li_ingot.name=Lithium Ingot +item.baseelectric.li_nugget.name=Lithium Nugget +item.baseelectric.sulfur_powder.name=Powdered Sulfur +item.baseelectric.lead_acid_battery.name=Lead-Acid Battery +item.baseelectric.nickel_hydride_battery.name=Nickel-Metal Hydride Battery +item.baseelectric.alkaline_battery.name=Alkaline Battery +item.baseelectric.lithium_battery.name=Lithium-Ion Battery + +tile.baseelectric.electric_conduit.name=Electric Power Cable +tile.baseelectric.electric_track.name=Electric Scaffold +tile.baseelectric.electric_battery_array.name=Battery Array +tile.baseelectric.electric_crusher.name=Electric Rock Crusher +tile.baseelectric.laser_turret.name=Laser Defense Turret +tile.baseelectric.electric_drill.name=Electric Mining Drill +tile.baseelectric.electric_fabricator.name=Automated Assembler +tile.baseelectric.electric_furnace.name=Electric Arc Furnace +tile.baseelectric.electric_oven.name=Electric Oven +tile.baseelectric.electric_pcb_printer.name=PCB Printer +tile.baseelectric.geothermal_generator.name=Geothermal Generator +tile.baseelectric.hydroelectric_generator.name=Hydroelectric Generator +tile.baseelectric.photovoltaic_generator.name=Photovoltaic Generator +tile.baseelectric.steam_powered_generator.name=Steam-Powered Electric Generator +tile.baseelectric.growth_chamber.name=Growth Chamber +tile.baseelectric.growth_chamber_controller.name=Growth Chamber Control Unit +tile.baseelectric.li_ore.name=Lithium Ore +tile.baseelectric.sulfur_ore.name=Sulfur Ore +tile.baseelectric.led_bar.name=LED Bar + +tooltip.battery.charge=Charge +tooltip.battery.capacity=Capacity + +death.attack.laser=%1$s vaporized +death.attack.laser.player=%2$s vaporized %1$s +death.attack.propeller=%1$s was pulverized by a propeller. +death.attack.propeller.player=%2$s pushed %1$s into a propeller. + + +tile.baseelectric.electric_switch.name=Electric Switch +tile.baseelectric.electric_still.name=Electric Distiller +tile.baseelectric.electric_pump.name=Electric Pump +tile.baseelectric.plastic_refinery.name=Petro-Plastic Refinery +item.baseelectric.petrolplastic_ingot.name=Petro-Plastic Ingot +tile.baseelectric.pump_pipe_electric.name=Pump Pipe diff --git a/src/main/resources/assets/baseelectric/lang/en_en.lang b/src/main/resources/assets/baseelectric/lang/en_en.lang new file mode 100644 index 0000000..733bb5f --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/en_en.lang @@ -0,0 +1,54 @@ +language_support_goals=english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR) + +item.baseelectric.blank_circuit_board.name=Circuit Board (Blank) +item.baseelectric.control_circuit.name=Control Circuit +item.baseelectric.integrated_circuit.name=Microchip +item.baseelectric.psu.name=Power Supply Unit +item.baseelectric.silicon_ingot.name=Silicon Ingot +item.baseelectric.silicon_mix.name=Silicon Blend +item.baseelectric.solder_mix.name=Solder Blend +item.baseelectric.solder.name=Solder +item.baseelectric.li_powder.name=Powdered Lithium +item.baseelectric.li_ingot.name=Lithium Ingot +item.baseelectric.li_nugget.name=Lithium Nugget +item.baseelectric.sulfur_powder.name=Powdered Sulfur +item.baseelectric.lead_acid_battery.name=Lead-Acid Battery +item.baseelectric.nickel_hydride_battery.name=Nickel-Metal Hydride Battery +item.baseelectric.alkaline_battery.name=Alkaline Battery +item.baseelectric.lithium_battery.name=Lithium-Ion Battery + +tile.baseelectric.electric_conduit.name=Electric Power Cable +tile.baseelectric.electric_track.name=Electric Scaffold +tile.baseelectric.electric_battery_array.name=Battery Array +tile.baseelectric.electric_crusher.name=Electric Rock Crusher +tile.baseelectric.laser_turret.name=Laser Turret +tile.baseelectric.electric_drill.name=Electric Mining Drill +tile.baseelectric.electric_fabricator.name=Automated Assembler +tile.baseelectric.electric_furnace.name=Electric Arc Furnace +tile.baseelectric.electric_oven.name=Electric Oven +tile.baseelectric.electric_pcb_printer.name=PCB Printer +tile.baseelectric.geothermal_generator.name=Geothermal Generator +tile.baseelectric.hydroelectric_generator.name=Hydroelectric Generator +tile.baseelectric.photovoltaic_generator.name=Photovoltaic Generator +tile.baseelectric.steam_powered_generator.name=Steam-Powered Electric Generator +tile.baseelectric.growth_chamber.name=Growth Chamber +tile.baseelectric.growth_chamber_controller.name=Growth Chamber Control Unit +tile.baseelectric.li_ore.name=Lithium Ore +tile.baseelectric.sulfur_ore.name=Sulfur Ore +tile.baseelectric.led_bar.name=LED Bar + +tooltip.battery.charge=Charge +tooltip.battery.capacity=Capacity + +death.attack.laser=%1$s vaporized +death.attack.laser.player=%2$s vaporized %1$s +death.attack.propeller=%1$s was pulverized by a propeller. +death.attack.propeller.player=%2$s pushed %1$s into a propeller. + + +tile.baseelectric.electric_switch.name=Electric Switch +tile.baseelectric.electric_still.name=Electric Distiller +tile.baseelectric.electric_pump.name=Electric Pump +tile.baseelectric.plastic_refinery.name=Petro-Plastic Refinery +item.baseelectric.petrolplastic_ingot.name=Petro-Plastic Ingot +tile.baseelectric.pump_pipe_electric.name=Pump Pipe diff --git a/src/main/resources/assets/baseelectric/lang/en_gb.lang b/src/main/resources/assets/baseelectric/lang/en_gb.lang new file mode 100644 index 0000000..c20bc22 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/en_gb.lang @@ -0,0 +1,54 @@ +language_support_goals=english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR) + +item.baseelectric.blank_circuit_board.name=Circuit Board (Blank) +item.baseelectric.control_circuit.name=Control Circuit +item.baseelectric.integrated_circuit.name=Microchip +item.baseelectric.psu.name=Power Supply Unit +item.baseelectric.silicon_ingot.name=Silicon Ingot +item.baseelectric.silicon_mix.name=Silicon Blend +item.baseelectric.solder_mix.name=Solder Blend +item.baseelectric.solder.name=Solder +item.baseelectric.li_powder.name=Powdered Lithium +item.baseelectric.li_ingot.name=Lithium Ingot +item.baseelectric.li_nugget.name=Lithium Nugget +item.baseelectric.sulfur_powder.name=Powdered Sulfur +item.baseelectric.lead_acid_battery.name=Lead-Acid Battery +item.baseelectric.nickel_hydride_battery.name=Nickel-Metal Hydride Battery +item.baseelectric.alkaline_battery.name=Alkaline Battery +item.baseelectric.lithium_battery.name=Lithium-Ion Battery + +tile.baseelectric.electric_conduit.name=Electric Power Cable +tile.baseelectric.electric_track.name=Electric Scaffold +tile.baseelectric.electric_battery_array.name=Battery Array +tile.baseelectric.electric_crusher.name=Electric Rock Crusher +tile.baseelectric.laser_turret.name=Laser Defense Turret +tile.baseelectric.electric_drill.name=Electric Mining Drill +tile.baseelectric.electric_fabricator.name=Automated Assembler +tile.baseelectric.electric_furnace.name=Electric Arc Furnace +tile.baseelectric.electric_oven.name=Electric Oven +tile.baseelectric.electric_pcb_printer.name=PCB Printer +tile.baseelectric.geothermal_generator.name=Geothermal Generator +tile.baseelectric.hydroelectric_generator.name=Hydroelectric Generator +tile.baseelectric.photovoltaic_generator.name=Photovoltaic Generator +tile.baseelectric.steam_powered_generator.name=Steam-Powered Electric Generator +tile.baseelectric.growth_chamber.name=Growth Chamber +tile.baseelectric.growth_chamber_controller.name=Growth Chamber Control Unit +tile.baseelectric.li_ore.name=Lithium Ore +tile.baseelectric.sulfur_ore.name=Sulfur Ore +tile.baseelectric.led_bar.name=LED Bar + +tooltip.battery.charge=Charge +tooltip.battery.capacity=Capacity + +death.attack.laser=%1$s vaporized +death.attack.laser.player=%2$s vaporized %1$s +death.attack.propeller=%1$s was pulverized by a propeller. +death.attack.propeller.player=%2$s pushed %1$s into a propeller. + + +tile.baseelectric.electric_switch.name=Electric Switch +tile.baseelectric.electric_still.name=Electric Distiller +tile.baseelectric.electric_pump.name=Electric Pump +tile.baseelectric.plastic_refinery.name=Petro-Plastic Refinery +item.baseelectric.petrolplastic_ingot.name=Petro-Plastic Ingot +tile.baseelectric.pump_pipe_electric.name=Pump Pipe diff --git a/src/main/resources/assets/baseelectric/lang/en_pt.lang b/src/main/resources/assets/baseelectric/lang/en_pt.lang new file mode 100644 index 0000000..733bb5f --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/en_pt.lang @@ -0,0 +1,54 @@ +language_support_goals=english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR) + +item.baseelectric.blank_circuit_board.name=Circuit Board (Blank) +item.baseelectric.control_circuit.name=Control Circuit +item.baseelectric.integrated_circuit.name=Microchip +item.baseelectric.psu.name=Power Supply Unit +item.baseelectric.silicon_ingot.name=Silicon Ingot +item.baseelectric.silicon_mix.name=Silicon Blend +item.baseelectric.solder_mix.name=Solder Blend +item.baseelectric.solder.name=Solder +item.baseelectric.li_powder.name=Powdered Lithium +item.baseelectric.li_ingot.name=Lithium Ingot +item.baseelectric.li_nugget.name=Lithium Nugget +item.baseelectric.sulfur_powder.name=Powdered Sulfur +item.baseelectric.lead_acid_battery.name=Lead-Acid Battery +item.baseelectric.nickel_hydride_battery.name=Nickel-Metal Hydride Battery +item.baseelectric.alkaline_battery.name=Alkaline Battery +item.baseelectric.lithium_battery.name=Lithium-Ion Battery + +tile.baseelectric.electric_conduit.name=Electric Power Cable +tile.baseelectric.electric_track.name=Electric Scaffold +tile.baseelectric.electric_battery_array.name=Battery Array +tile.baseelectric.electric_crusher.name=Electric Rock Crusher +tile.baseelectric.laser_turret.name=Laser Turret +tile.baseelectric.electric_drill.name=Electric Mining Drill +tile.baseelectric.electric_fabricator.name=Automated Assembler +tile.baseelectric.electric_furnace.name=Electric Arc Furnace +tile.baseelectric.electric_oven.name=Electric Oven +tile.baseelectric.electric_pcb_printer.name=PCB Printer +tile.baseelectric.geothermal_generator.name=Geothermal Generator +tile.baseelectric.hydroelectric_generator.name=Hydroelectric Generator +tile.baseelectric.photovoltaic_generator.name=Photovoltaic Generator +tile.baseelectric.steam_powered_generator.name=Steam-Powered Electric Generator +tile.baseelectric.growth_chamber.name=Growth Chamber +tile.baseelectric.growth_chamber_controller.name=Growth Chamber Control Unit +tile.baseelectric.li_ore.name=Lithium Ore +tile.baseelectric.sulfur_ore.name=Sulfur Ore +tile.baseelectric.led_bar.name=LED Bar + +tooltip.battery.charge=Charge +tooltip.battery.capacity=Capacity + +death.attack.laser=%1$s vaporized +death.attack.laser.player=%2$s vaporized %1$s +death.attack.propeller=%1$s was pulverized by a propeller. +death.attack.propeller.player=%2$s pushed %1$s into a propeller. + + +tile.baseelectric.electric_switch.name=Electric Switch +tile.baseelectric.electric_still.name=Electric Distiller +tile.baseelectric.electric_pump.name=Electric Pump +tile.baseelectric.plastic_refinery.name=Petro-Plastic Refinery +item.baseelectric.petrolplastic_ingot.name=Petro-Plastic Ingot +tile.baseelectric.pump_pipe_electric.name=Pump Pipe diff --git a/src/main/resources/assets/baseelectric/lang/en_us.lang b/src/main/resources/assets/baseelectric/lang/en_us.lang new file mode 100644 index 0000000..985dad9 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/en_us.lang @@ -0,0 +1,54 @@ +language_support_goals=english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR) + +item.baseelectric.blank_circuit_board.name=Circuit Board (Blank) +item.baseelectric.control_circuit.name=Control Circuit +item.baseelectric.integrated_circuit.name=Microchip +item.baseelectric.psu.name=Power Supply Unit +item.baseelectric.silicon_ingot.name=Silicon Ingot +item.baseelectric.silicon_mix.name=Silicon Blend +item.baseelectric.solder_mix.name=Solder Blend +item.baseelectric.solder.name=Solder +item.baseelectric.li_powder.name=Powdered Lithium +item.baseelectric.li_ingot.name=Lithium Ingot +item.baseelectric.li_nugget.name=Lithium Nugget +item.baseelectric.sulfur_powder.name=Powdered Sulfur +item.baseelectric.lead_acid_battery.name=Lead-Acid Battery +item.baseelectric.nickel_hydride_battery.name=Nickel-Metal Hydride Battery +item.baseelectric.alkaline_battery.name=Alkaline Battery +item.baseelectric.lithium_battery.name=Lithium-Ion Battery + +tile.baseelectric.electric_conduit.name=Electric Power Cable +tile.baseelectric.electric_track.name=Electric Scaffold +tile.baseelectric.electric_battery_array.name=Battery Array +tile.baseelectric.electric_crusher.name=Electric Rock Crusher +tile.baseelectric.laser_turret.name=Laser Turret +tile.baseelectric.electric_drill.name=Electric Mining Drill +tile.baseelectric.electric_fabricator.name=Automated Assembler +tile.baseelectric.electric_furnace.name=Electric Arc Furnace +tile.baseelectric.electric_oven.name=Electric Oven +tile.baseelectric.electric_pcb_printer.name=PCB Printer +tile.baseelectric.geothermal_generator.name=Geothermal Generator +tile.baseelectric.hydroelectric_generator.name=Hydroelectric Generator +tile.baseelectric.photovoltaic_generator.name=Photovoltaic Generator +tile.baseelectric.steam_powered_generator.name=Steam-Powered Electric Generator +tile.baseelectric.growth_chamber.name=Growth Chamber +tile.baseelectric.growth_chamber_controller.name=Growth Chamber Control Unit +tile.baseelectric.li_ore.name=Lithium Ore +tile.baseelectric.sulfur_ore.name=Sulfur Ore +tile.baseelectric.led_bar.name=LED Bar + +tooltip.battery.charge=Charge +tooltip.battery.capacity=Capacity + +death.attack.laser=%1$s vaporized +death.attack.laser.player=%2$s vaporized %1$s +death.attack.propeller=%1$s was pulverized by a propeller. +death.attack.propeller.player=%2$s pushed %1$s into a propeller. + +tile.baseelectric.electric_switch.name=Electric Switch +tile.baseelectric.electric_still.name=Electric Distiller +tile.baseelectric.electric_pump.name=Electric Pump +tile.baseelectric.plastic_refinery.name=Petro-Plastic Refinery +item.baseelectric.petrolplastic_ingot.name=Petro-Plastic Ingot +tile.baseelectric.pump_pipe_electric.name=Pump Pipe + diff --git a/src/main/resources/assets/baseelectric/lang/es_es.lang b/src/main/resources/assets/baseelectric/lang/es_es.lang new file mode 100644 index 0000000..cd4aa18 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/es_es.lang @@ -0,0 +1,55 @@ +language_support_goals=Inglés (en_US, en_EN, en_CA, es_ES, es_ES, en_PT), Español (es_MX, es_ES), chino (zh_CN), japonés (ja_JA), portugués (pt_BR), Alemán (de_DE), italiano (it_IT), coreano (ko_KR) + +item.baseelectric.blank_circuit_board.name=Placa de Circuito (Blanco) +item.baseelectric.control_circuit.name=Circuito de Computadora +item.baseelectric.integrated_circuit.name=Microchip +item.baseelectric.psu.name=Unidad de Fuente de Alimentación +item.baseelectric.silicon_ingot.name=Silicio Lingote +item.baseelectric.silicon_mix.name=Blend Silicio +item.baseelectric.solder_mix.name=Blend Soldadura +item.baseelectric.solder.name=Soldadura +item.baseelectric.li_powder.name=Polvo de Litio +item.baseelectric.li_ingot.name=Litio Lingote +item.baseelectric.li_nugget.name=Pepita de Litio +item.baseelectric.sulfur_powder.name=Azufre en Polvo +item.baseelectric.lead_acid_battery.name=Plomo-Ácido de la Batería +item.baseelectric.nickel_hydride_battery.name=Níquel e Hidruro Metálico +item.baseelectric.alkaline_battery.name=Batería Alcalina +item.baseelectric.lithium_battery.name=Batería de Litio-Ion + +tile.baseelectric.electric_conduit.name=Cable de Energía Eléctrica +tile.baseelectric.electric_track.name=Eléctrica Andamios +tile.baseelectric.electric_battery_array.name=Batería Matriz +tile.baseelectric.electric_crusher.name=Eléctrica de la Roca Trituradora +tile.baseelectric.laser_turret.name=Laser Defensa Torreta +tile.baseelectric.electric_drill.name=Eléctrica Minería Taladro +tile.baseelectric.electric_fabricator.name=Automatizado Ensamblador +tile.baseelectric.electric_furnace.name=Horno de Arco Eléctrico +tile.baseelectric.electric_oven.name=Horno Eléctrico +tile.baseelectric.electric_pcb_printer.name=PCB Impresora +tile.baseelectric.geothermal_generator.name=Geotérmica Generador +tile.baseelectric.hydroelectric_generator.name=Hidroeléctrico Generador +tile.baseelectric.photovoltaic_generator.name=Fotovoltaica Generador +tile.baseelectric.steam_powered_generator.name=a Vapor Generador Eléctrico +tile.baseelectric.growth_chamber.name=Cámara Crecimiento +tile.baseelectric.growth_chamber_controller.name=Unidad de Control de Crecimiento Cámara +tile.baseelectric.li_ore.name=Mineral de Litio +tile.baseelectric.sulfur_ore.name=Mineral de Azufre +tile.baseelectric.led_bar.name=Luz LED + +tooltip.battery.charge=Carga +tooltip.battery.capacity=Capacidad + +death.attack.laser=%1$s vaporiza +death.attack.laser.player=%2$s vaporizado s%1$s +death.attack.propeller=%1$s se pulverizan por una hélice. +death.attack.propeller.player=%2$s empujaron %1$s en la hélice. + + + +tile.baseelectric.electric_switch.name=Interruptor Eléctrico +tile.baseelectric.electric_still.name=Destilador Eléctrico +tile.baseelectric.electric_pump.name=Bomba Eléctrica +tile.baseelectric.plastic_refinery.name=Refinería de Plástico +item.baseelectric.petrolplastic_ingot.name=Petróleo Lingote de Plástico +tile.baseelectric.pump_pipe_electric.name=Tubería de la Bomba diff --git a/src/main/resources/assets/baseelectric/lang/es_mx.lang b/src/main/resources/assets/baseelectric/lang/es_mx.lang new file mode 100644 index 0000000..d54915b --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/es_mx.lang @@ -0,0 +1,53 @@ +language_support_goals=Inglés (en_US, en_EN, en_CA, es_ES, es_ES, en_PT), Español (es_MX, es_ES), chino (zh_CN), japonés (ja_JA), portugués (pt_BR), Alemán (de_DE), italiano (it_IT), coreano (ko_KR) + +item.baseelectric.blank_circuit_board.name=Placa de Circuito (Blanco) +item.baseelectric.control_circuit.name=Circuito de Computadora +item.baseelectric.integrated_circuit.name=Microchip +item.baseelectric.psu.name=Unidad de Fuente de Alimentación +item.baseelectric.silicon_ingot.name=Silicio Lingote +item.baseelectric.silicon_mix.name=Blend Silicio +item.baseelectric.solder_mix.name=Blend Soldadura +item.baseelectric.solder.name=Soldadura +item.baseelectric.li_powder.name=Polvo de Litio +item.baseelectric.li_ingot.name=Litio Lingote +item.baseelectric.li_nugget.name=Pepita de Litio +item.baseelectric.sulfur_powder.name=Azufre en Polvo +item.baseelectric.lead_acid_battery.name=Plomo-Ácido de la Batería +item.baseelectric.nickel_hydride_battery.name=Níquel e Hidruro Metálico +item.baseelectric.alkaline_battery.name=Batería Alcalina +item.baseelectric.lithium_battery.name=Batería de Litio-Ion + +tile.baseelectric.electric_conduit.name=Cable de Energía Eléctrica +tile.baseelectric.electric_track.name=Eléctrica Andamios +tile.baseelectric.electric_battery_array.name=Batería Matriz +tile.baseelectric.electric_crusher.name=Eléctrica de la Roca Trituradora +tile.baseelectric.laser_turret.name=Laser Defensa Torreta +tile.baseelectric.electric_drill.name=Eléctrica Minería Taladro +tile.baseelectric.electric_fabricator.name=Automatizado Ensamblador +tile.baseelectric.electric_furnace.name=Horno de Arco Eléctrico +tile.baseelectric.electric_oven.name=Horno Eléctrico +tile.baseelectric.electric_pcb_printer.name=PCB Impresora +tile.baseelectric.geothermal_generator.name=Geotérmica Generador +tile.baseelectric.hydroelectric_generator.name=Hidroeléctrico Generador +tile.baseelectric.photovoltaic_generator.name=Fotovoltaica Generador +tile.baseelectric.steam_powered_generator.name=a Vapor Generador Eléctrico +tile.baseelectric.growth_chamber.name=Cámara Crecimiento +tile.baseelectric.growth_chamber_controller.name=Unidad de Control de Crecimiento Cámara +tile.baseelectric.li_ore.name=Mineral de Litio +tile.baseelectric.sulfur_ore.name=Mineral de Azufre +tile.baseelectric.led_bar.name=Luz LED + +tooltip.battery.charge=Carga +tooltip.battery.capacity=Capacidad + +death.attack.laser=%1$s vaporiza +death.attack.laser.player=%2$s vaporizado s%1$s +death.attack.propeller=%1$s se pulverizan por una hélice. +death.attack.propeller.player=%2$s empujaron %1$s en la hélice. + +tile.baseelectric.electric_switch.name=Interruptor Eléctrico +tile.baseelectric.electric_still.name=Destilador Eléctrico +tile.baseelectric.electric_pump.name=Bomba Eléctrica +tile.baseelectric.plastic_refinery.name=Refinería de Plástico +item.baseelectric.petrolplastic_ingot.name=Petróleo Lingote de Plástico +tile.baseelectric.pump_pipe_electric.name=Tubería de la Bomba diff --git a/src/main/resources/assets/baseelectric/lang/it_it.lang b/src/main/resources/assets/baseelectric/lang/it_it.lang new file mode 100644 index 0000000..d0ecb20 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/it_it.lang @@ -0,0 +1,53 @@ +language_support_goals=inglese (it, en_EN, en_CA, en_GB, en_AU, en_PT), spagnolo (es_MX, es_ES), cinese (zh_CN), giapponese (ja_JA), portoghese (pt_BR), tedesco (de_DE), italiano (it_IT), coreano (ko_KR) + +item.baseelectric.blank_circuit_board.name=Scheda di Circuito (Vuoto) +item.baseelectric.control_circuit.name=Circuito di Controllo +item.baseelectric.integrated_circuit.name=Microcircuito Integrato +item.baseelectric.psu.name=Alimentatore +item.baseelectric.silicon_ingot.name=Silicio Lingotto +item.baseelectric.silicon_mix.name=Silicio Miscela +item.baseelectric.solder_mix.name=Saldatura Miscela +item.baseelectric.solder.name=Saldatura +item.baseelectric.li_powder.name=Polvere di Litio +item.baseelectric.li_ingot.name=Litio Lingotto +item.baseelectric.li_nugget.name=Pepita d'Litio +item.baseelectric.sulfur_powder.name=Zolfo in Polvere +item.baseelectric.lead_acid_battery.name=Batteria al Piombo +item.baseelectric.nickel_hydride_battery.name=Ni-MH batteria +item.baseelectric.alkaline_battery.name=Batteria Alcalina +item.baseelectric.lithium_battery.name=Agli Ioni di Litio + +tile.baseelectric.electric_conduit.name=Cavo Alettrico di Alimentazione +tile.baseelectric.electric_track.name=Ponteggio Elettrico +tile.baseelectric.electric_battery_array.name=Array Batteria +tile.baseelectric.electric_crusher.name=Polverizzatore Masso a Elettrico Alimentata +tile.baseelectric.laser_turret.name=Laser Difesa Torretta +tile.baseelectric.electric_drill.name=Trapano Elettrico +tile.baseelectric.electric_fabricator.name=Fabbrica Automatizzata +tile.baseelectric.electric_furnace.name=Forno Elettrico ad Arco +tile.baseelectric.electric_oven.name=Forno Elettrico +tile.baseelectric.electric_pcb_printer.name=PCB Stampante +tile.baseelectric.geothermal_generator.name=Geotermica Generatore +tile.baseelectric.hydroelectric_generator.name=idroelettrica Generatore +tile.baseelectric.photovoltaic_generator.name=Fotovoltaico Generatore +tile.baseelectric.steam_powered_generator.name=Generatore Elettrico a Vapore +tile.baseelectric.growth_chamber.name=Camera di Crescita +tile.baseelectric.growth_chamber_controller.name=Controllore Camera di Crescita +tile.baseelectric.li_ore.name=Minerale di litio +tile.baseelectric.sulfur_ore.name=Minerale di Zolfo +tile.baseelectric.led_bar.name=Luce a led + +tooltip.battery.charge=Carica +tooltip.battery.capacity=Capacità + +death.attack.laser=%1$s vaporizzato +death.attack.laser.player=%2$s vaporizzati %1$s +death.attack.propeller=%1$s è stato polverizzato da un'elica. +death.attack.propeller.player=%2$s spinti %1$s nelle eliche. + +tile.baseelectric.electric_switch.name=Interruttore Elettrico +tile.baseelectric.electric_still.name=Distillatore Elettrico +tile.baseelectric.electric_pump.name=Pompa Elettricaa +tile.baseelectric.plastic_refinery.name=Raffineria Plastica +item.baseelectric.petrolplastic_ingot.name=Petrolio Plastica Lingotto +tile.baseelectric.pump_pipe_electric.name=Tubo Pompa diff --git a/src/main/resources/assets/baseelectric/lang/ja_jp.lang b/src/main/resources/assets/baseelectric/lang/ja_jp.lang new file mode 100644 index 0000000..e78529a --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/ja_jp.lang @@ -0,0 +1,54 @@ +language_support_goals = 英語 (en_US en_EN en_CA、en_GB, en_AU, en_PT), スペイン語 (es_MX、es_ES)、中国 (zh_CN)、日本語 (ja_JA)、ポルトガル (pt_BR)、ドイツ語 (de_DE)、イタリア語 (it_IT), 韓国語 (ko_KR) + +item.baseelectric.blank_circuit_board.name=回路基板 (空の) +item.baseelectric.control_circuit.name=コンピューター回路 +item.baseelectric.integrated_circuit.name=マイクロチップ +item.baseelectric.psu.name=電源ユニット +item.baseelectric.silicon_ingot.name=シリコン +item.baseelectric.silicon_mix.name=シリコンレシピ +item.baseelectric.solder_mix.name=はんだレシピ +item.baseelectric.solder.name=はんだ +item.baseelectric.li_powder.name=リチウム粉末 +item.baseelectric.li_ingot.name=リチウム金属 +item.baseelectric.li_nugget.name=リチウムナゲット +item.baseelectric.sulfur_powder.name=硫黄粉末 +item.baseelectric.lead_acid_battery.name=鉛蓄電池 +item.baseelectric.nickel_hydride_battery.name=ニッケル水素バッテリー +item.baseelectric.alkaline_battery.name=アルカリ電池 +item.baseelectric.lithium_battery.name=リチウムイオン電池 + +tile.baseelectric.electric_conduit.name=電線 +tile.baseelectric.electric_track.name=電動足場 +tile.baseelectric.electric_battery_array.name=電池貯蔵 +tile.baseelectric.electric_crusher.name=電気岩クラッシャー +tile.baseelectric.laser_turret.name=レーザー砲塔 +tile.baseelectric.electric_drill.name=電気ドリル +tile.baseelectric.electric_fabricator.name=ロボット工場 +tile.baseelectric.electric_furnace.name=電気炉 +tile.baseelectric.electric_oven.name=電気オーブン +tile.baseelectric.electric_pcb_printer.name=回路基板プリンター +tile.baseelectric.geothermal_generator.name=地熱発電 +tile.baseelectric.hydroelectric_generator.name=水力発電機 +tile.baseelectric.photovoltaic_generator.name=太陽電池パネル +tile.baseelectric.steam_powered_generator.name=蒸気駆動の発電機 +tile.baseelectric.growth_chamber.name=植物生長室 +tile.baseelectric.growth_chamber_controller.name=植物成長室コントローラ +tile.baseelectric.li_ore.name=リチウム 鉱石 +tile.baseelectric.sulfur_ore.name=硫黄鉱石 +tile.baseelectric.led_bar.name=LEDライト + +tooltip.battery.charge=量 +tooltip.battery.capacity=合計金額 + +death.attack.laser=%1$s気化 +蒸発 death.attack.laser.player=%2$sは%1$sを気化しました +death.attack.propeller=プロペラ殺さ%1$s +death.attack.propeller.player=%2$sはプロペラと%1$sを殺しました + + +tile.baseelectric.electric_switch.name=電気スイッチ +tile.baseelectric.electric_still.name=電気蒸留器 +tile.baseelectric.electric_pump.name=電気ポンプ +tile.baseelectric.plastic_refinery.name=プラスチック製油所 +item.baseelectric.petrolplastic_ingot.name=石油系プラスチックインゴット +tile.baseelectric.pump_pipe_electric.name=ポンプ配管 diff --git a/src/main/resources/assets/baseelectric/lang/ko_ko.lang b/src/main/resources/assets/baseelectric/lang/ko_ko.lang new file mode 100644 index 0000000..33a8195 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/ko_ko.lang @@ -0,0 +1,52 @@ +item.baseelectric.blank_circuit_board.name=회로 기판 (빈) +item.baseelectric.control_circuit.name=제어 회로 +item.baseelectric.integrated_circuit.name=마이크로 칩 +item.baseelectric.psu.name=전원 공급 장치 +item.baseelectric.silicon_ingot.name=실리콘 잉곳 +item.baseelectric.silicon_mix.name=실리콘 혼합 +item.baseelectric.solder_mix.name=솔더 혼합 +item.baseelectric.solder.name=솔더 +item.baseelectric.li_powder.name=분말 리튬 +item.baseelectric.li_ingot.name=리튬 잉곳 +item.baseelectric.li_nugget.name=리튬 너겟 +item.baseelectric.sulfur_powder.name=분말 유황 +item.baseelectric.lead_acid_battery.name=납 축전지 +item.baseelectric.nickel_hydride_battery.name=니켈 수소 배터리 +item.baseelectric.alkaline_battery.name=알카라인 배터리 +item.baseelectric.lithium_battery.name=리튬 이온 배터리 + +tile.baseelectric.electric_conduit.name=전력 케이블 +tile.baseelectric.electric_track.name=전기 비계 +tile.baseelectric.electric_battery_array.name=전지 어레이 +tile.baseelectric.electric_crusher.name=전기 락 크러셔 +tile.baseelectric.laser_turret.name=레이저 방어 터렛 +tile.baseelectric.electric_drill.name=전기 마이닝 드릴 +tile.baseelectric.electric_fabricator.name=자동 어셈블러 +tile.baseelectric.electric_furnace.name=전기로 +tile.baseelectric.electric_oven.name=전기 오븐 +tile.baseelectric.electric_pcb_printer.name=회로 기판 프린터 +tile.baseelectric.geothermal_generator.name=지열 발전기 +tile.baseelectric.hydroelectric_generator.name=수력 발전기 +tile.baseelectric.photovoltaic_generator.name=태양 광 발전기 +tile.baseelectric.steam_powered_generator.name=증기 발전기 +tile.baseelectric.growth_chamber.name=성장 상공 회의소 +tile.baseelectric.growth_chamber_controller.name=성장 챔버 제어 장치 +tile.baseelectric.li_ore.name=리튬 광석 +tile.baseelectric.sulfur_ore.name=유황 광석 +tile.baseelectric.led_bar.name=LED 조명 + +tooltip.battery.charge=요금 +tooltip.battery.capacity=생산 능력 + +death.attack.laser=%1$s이 (가) 증발 +death.attack.laser.player=%2$s의 증발 %1$s +death.attack.propeller=%1$s는 프로펠러에 의해 분쇄 하였다. +death.attack.propeller.player=%2$s는 프로펠러에 %1$s을 (를) 밀었다. + + +tile.baseelectric.electric_switch.name=전기 스위치 +tile.baseelectric.electric_still.name=전기 증류기 +tile.baseelectric.electric_pump.name=전기 펌프 +tile.baseelectric.plastic_refinery.name=플라스틱 정유 +item.baseelectric.petrolplastic_ingot.name=석유 수지 잉곳 +tile.baseelectric.pump_pipe_electric.name=펌프 파이프 diff --git a/src/main/resources/assets/baseelectric/lang/pt_br.lang b/src/main/resources/assets/baseelectric/lang/pt_br.lang new file mode 100644 index 0000000..772f2e2 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/pt_br.lang @@ -0,0 +1,54 @@ +language_support_goals=inglês (en_US, en_EN, en_CA, en_GB, en_AU, en_PT), espanhol (es_MX, es_ES), chinês (zh_CN), japonês (ja_JA), Português (pt_BR), alemão (de_DE), italiano (it_IT), coreano (ko_KR) + +item.baseelectric.blank_circuit_board.name=Placa de Circuito (Vago) +item.baseelectric.control_circuit.name=Circuito de Controle +item.baseelectric.integrated_circuit.name=Circuito Integrado +item.baseelectric.psu.name=Unidade de Alimentação +item.baseelectric.silicon_ingot.name=Silício Lingote +item.baseelectric.silicon_mix.name=Mistura de Silício +item.baseelectric.solder_mix.name=Mistura de Solda +item.baseelectric.solder.name=Solda +item.baseelectric.li_powder.name=Pó de Lítio +item.baseelectric.li_ingot.name=Lítio Lingote +item.baseelectric.li_nugget.name=Pepita de Lítio +item.baseelectric.sulfur_powder.name=Enxofre em Pó +item.baseelectric.lead_acid_battery.name=Bateria de Chumbo Ácido +item.baseelectric.nickel_hydride_battery.name=Bateria Níquel-Hidreto Metálico +item.baseelectric.alkaline_battery.name=Bateria Alcalina +item.baseelectric.lithium_battery.name=Bateria de Lítio + +tile.baseelectric.electric_conduit.name=Fio Elétrico +tile.baseelectric.electric_track.name=Elétrica Andaime +tile.baseelectric.electric_battery_array.name=Armazenamento da Bateria +tile.baseelectric.electric_crusher.name=Triturador de Rocha Elétrica +tile.baseelectric.laser_turret.name=Torre de Arma a Laser +tile.baseelectric.electric_drill.name=Broca Mineração Elétrica +tile.baseelectric.electric_fabricator.name=Fábrica Automatizada +tile.baseelectric.electric_furnace.name=Forno Elétrico a Arco +tile.baseelectric.electric_oven.name=Forno Elétrico +tile.baseelectric.electric_pcb_printer.name=Impressora Circuito +tile.baseelectric.geothermal_generator.name=Gerador de Elétrico Geotérmica +tile.baseelectric.hydroelectric_generator.name=Gerador Hidrelétrico +tile.baseelectric.photovoltaic_generator.name=Painel Solar +tile.baseelectric.steam_powered_generator.name=a Vapor Gerador Elétrico +tile.baseelectric.growth_chamber.name=Câmara de Crescimento +tile.baseelectric.growth_chamber_controller.name=Unidade de Controle de Crescimento Câmara +tile.baseelectric.li_ore.name=Minério de Lítio +tile.baseelectric.sulfur_ore.name=Minério de Enxofre +tile.baseelectric.led_bar.name=Luz LED + +tooltip.battery.charge=Carga +tooltip.battery.capacity=Capacidade + +death.attack.laser=%1$S vaporizado +death.attack.laser.player=%2$s vaporizados %1$s +death.attack.propeller=%1$s foi pulverizado por uma hélice. +death.attack.propeller.player=%2$s empurrou %1$s em uma hélice. + + +tile.baseelectric.electric_switch.name=Chave Elétrica +tile.baseelectric.electric_still.name=Destilador Elétrico +tile.baseelectric.electric_pump.name=Bomba Elétrica +tile.baseelectric.plastic_refinery.name=Refinaria de Plástico +item.baseelectric.petrolplastic_ingot.name=Petróleo Plástico Lingote +tile.baseelectric.pump_pipe_electric.name=Tubo de Bomba diff --git a/src/main/resources/assets/baseelectric/lang/zh_cn.lang b/src/main/resources/assets/baseelectric/lang/zh_cn.lang new file mode 100644 index 0000000..13af6c5 --- /dev/null +++ b/src/main/resources/assets/baseelectric/lang/zh_cn.lang @@ -0,0 +1,55 @@ +language_support_goals=英语（EN_US，的en_EN，en_CA，EN_GB，en_AU，en_PT），西班牙语（es_MX，es_ES），中国（zh_CN的），日本（ja_JA），葡萄牙语（PT_BR），德语（de_DE这个），意大利语（it_IT），韩国（ko_KR） + +item.baseelectric.blank_circuit_board.name=电路板（空白） +item.baseelectric.control_circuit.name=控制电路 +item.baseelectric.integrated_circuit.name=微芯片 +item.baseelectric.psu.name=电源单元 +item.baseelectric.silicon_ingot.name=硅锭 +item.baseelectric.silicon_mix.name=硅混合 +item.baseelectric.solder_mix.name=焊接混合 +item.baseelectric.solder.name=焊料 +item.baseelectric.li_powder.name=粉状锂 +item.baseelectric.li_ingot.name=锂锭 +item.baseelectric.li_nugget.name=锂掘金 +item.baseelectric.sulfur_powder.name=硫粉 +item.baseelectric.lead_acid_battery.name=铅酸蓄电池 +item.baseelectric.nickel_hydride_battery.name=镍氢电池 +item.baseelectric.alkaline_battery.name=碱性电池 +item.baseelectric.lithium_battery.name=锂离子电池 + +tile.baseelectric.electric_conduit.name=电力电缆 +tile.baseelectric.electric_track.name=电动脚手架 +tile.baseelectric.electric_battery_array.name=电池阵列 +tile.baseelectric.electric_crusher.name=电碎石机 +tile.baseelectric.laser_turret.name=激光防御炮塔 +tile.baseelectric.electric_drill.name=电矿钻 +tile.baseelectric.electric_fabricator.name=自动汇编 +tile.baseelectric.electric_furnace.name=电弧炉 +tile.baseelectric.electric_oven.name=电烤箱 +tile.baseelectric.electric_pcb_printer.name= 电路板打印机 +tile.baseelectric.geothermal_generator.name=热发电机 +tile.baseelectric.hydroelectric_generator.name=水轮发电机 +tile.baseelectric.photovoltaic_generator.name=光电发生器 +tile.baseelectric.steam_powered_generator.name=蒸汽为动力的电动发电机 +tile.baseelectric.growth_chamber.name=生长箱 +tile.baseelectric.growth_chamber_controller.name=生长箱控制单元 +tile.baseelectric.li_ore.name=锂矿 +tile.baseelectric.sulfur_ore.name=硫矿石 +tile.baseelectric.led_bar.name=LED燈 + +tooltip.battery.charge=充电 +tooltip.battery.capacity=容量 + +death.attack.laser=％1$s蒸发 +death.attack.laser.player=％2$s汽化％1$s +death.attack.propeller=％1$s被粉碎螺旋桨。 +death.attack.propeller.player=％2$s推％1$s转换为螺旋桨。 + + +tile.baseelectric.electric_switch.name=電器開關 +tile.baseelectric.electric_still.name=電熱蒸餾水 +tile.baseelectric.electric_pump.name=電動泵 +tile.baseelectric.plastic_refinery.name=塑料煉油廠 +item.baseelectric.petrolplastic_ingot.name=石油膠錠 +tile.baseelectric.pump_pipe_electric.name=泵管 + diff --git a/src/main/resources/assets/baseelectric/models/block/electric_battery_array.json b/src/main/resources/assets/baseelectric/models/block/electric_battery_array.json new file mode 100644 index 0000000..4cd33d4 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_battery_array.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_battery_array", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_0.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_0.json new file mode 100644 index 0000000..0771356 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_0.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_ensw", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_densuw.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_densuw.json new file mode 100644 index 0000000..daf68cd --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_densuw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_densuw", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_desuw.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_desuw.json new file mode 100644 index 0000000..a18647f --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_desuw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_desuw", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_dnu.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_dnu.json new file mode 100644 index 0000000..082bb93 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_dnu.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_dnu", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_ensw.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_ensw.json new file mode 100644 index 0000000..0771356 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_ensw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_ensw", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_n.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_n.json new file mode 100644 index 0000000..112f395 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_n.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_n", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_ns.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_ns.json new file mode 100644 index 0000000..cd5238e --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_ns.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_ns", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_nsuw.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_nsuw.json new file mode 100644 index 0000000..0758b1b --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_nsuw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_nsuw", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_nsw.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_nsw.json new file mode 100644 index 0000000..8d04319 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_nsw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_nsw", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_nuw.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_nuw.json new file mode 100644 index 0000000..450f9da --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_nuw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_nuw", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_conduit_nw.json b/src/main/resources/assets/baseelectric/models/block/electric_conduit_nw.json new file mode 100644 index 0000000..e252ae0 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_conduit_nw.json @@ -0,0 +1,7 @@ +{ + "parent": "basepower:block/pipe2_nw", + "textures": { + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_crusher_off.json b/src/main/resources/assets/baseelectric/models/block/electric_crusher_off.json new file mode 100644 index 0000000..9384cc5 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_crusher_off.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_crusher_off", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_crusher_on.json b/src/main/resources/assets/baseelectric/models/block/electric_crusher_on.json new file mode 100644 index 0000000..b10d6f9 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_crusher_on.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_crusher_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_crusher_powered.json b/src/main/resources/assets/baseelectric/models/block/electric_crusher_powered.json new file mode 100644 index 0000000..29bb992 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_crusher_powered.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_crusher_powered", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_drill_base.json b/src/main/resources/assets/baseelectric/models/block/electric_drill_base.json similarity index 93% rename from src/main/resources/assets/electricadvantage/models/block/electric_drill_base.json rename to src/main/resources/assets/baseelectric/models/block/electric_drill_base.json index 917982f..b69cb83 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_drill_base.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_drill_base.json @@ -1,9 +1,9 @@ { "parent": "block/block", "textures": { - "particle": "electricadvantage:materials/machine_case", - "feet":"poweradvantage:materials/steel", - "side": "electricadvantage:materials/machine_case" + "particle": "baseelectric:materials/machine_case", + "feet":"basepower:materials/steel", + "side": "baseelectric:materials/machine_case" }, "elements": [ diff --git a/src/main/resources/assets/baseelectric/models/block/electric_drill_off.json b/src/main/resources/assets/baseelectric/models/block/electric_drill_off.json new file mode 100644 index 0000000..870a9af --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_drill_off.json @@ -0,0 +1,7 @@ +{ + "parent": "baseelectric:block/electric_drill_base", + "textures": { + "top": "baseelectric:blocks/electric_drill_off", + "bottom": "baseelectric:blocks/laser_drill_optic" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_drill_on.json b/src/main/resources/assets/baseelectric/models/block/electric_drill_on.json new file mode 100644 index 0000000..47fd2ec --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_drill_on.json @@ -0,0 +1,7 @@ +{ + "parent": "baseelectric:block/electric_drill_base", + "textures": { + "top": "baseelectric:blocks/electric_drill_on", + "bottom": "baseelectric:blocks/laser_drill_optic_on" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_fabricator_off.json b/src/main/resources/assets/baseelectric/models/block/electric_fabricator_off.json new file mode 100644 index 0000000..d00668c --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_fabricator_off.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_fabricator_off", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_fabricator_on.json b/src/main/resources/assets/baseelectric/models/block/electric_fabricator_on.json new file mode 100644 index 0000000..c9c2b8f --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_fabricator_on.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_fabricator_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_fabricator_powered.json b/src/main/resources/assets/baseelectric/models/block/electric_fabricator_powered.json new file mode 100644 index 0000000..2f19a58 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_fabricator_powered.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_fabricator_powered", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_furnace_off.json b/src/main/resources/assets/baseelectric/models/block/electric_furnace_off.json new file mode 100644 index 0000000..c5fcc99 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_furnace_off.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_furnace_off", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_furnace_on.json b/src/main/resources/assets/baseelectric/models/block/electric_furnace_on.json new file mode 100644 index 0000000..9101efc --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_furnace_on.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_furnace_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_furnace_powered.json b/src/main/resources/assets/baseelectric/models/block/electric_furnace_powered.json new file mode 100644 index 0000000..6f0d52b --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_furnace_powered.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_furnace_powered", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_machine_base.json b/src/main/resources/assets/baseelectric/models/block/electric_machine_base.json similarity index 90% rename from src/main/resources/assets/electricadvantage/models/block/electric_machine_base.json rename to src/main/resources/assets/baseelectric/models/block/electric_machine_base.json index d9b5072..065f242 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_machine_base.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_machine_base.json @@ -1,7 +1,7 @@ { "parent": "block/block", "textures": { - "particle": "electricadvantage:materials/machine_case" + "particle": "baseelectric:materials/machine_case" }, "elements": [ diff --git a/src/main/resources/assets/baseelectric/models/block/electric_oven_off.json b/src/main/resources/assets/baseelectric/models/block/electric_oven_off.json new file mode 100644 index 0000000..c390bed --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_oven_off.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_oven_off", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_oven_on.json b/src/main/resources/assets/baseelectric/models/block/electric_oven_on.json new file mode 100644 index 0000000..af61527 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_oven_on.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_oven_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_oven_powered.json b/src/main/resources/assets/baseelectric/models/block/electric_oven_powered.json new file mode 100644 index 0000000..42cd890 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_oven_powered.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_oven_powered", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_off.json b/src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_off.json new file mode 100644 index 0000000..20119fa --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_off.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_pcb_printer_off", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_on.json b/src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_on.json new file mode 100644 index 0000000..990c631 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_on.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_pcb_printer_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_powered.json b/src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_powered.json new file mode 100644 index 0000000..9090958 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_pcb_printer_powered.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_pcb_printer_powered", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_pump_off.json b/src/main/resources/assets/baseelectric/models/block/electric_pump_off.json new file mode 100644 index 0000000..b5f3ed8 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_pump_off.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_pump_off", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_pump_on.json b/src/main/resources/assets/baseelectric/models/block/electric_pump_on.json new file mode 100644 index 0000000..975c7f9 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_pump_on.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_pump_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_pump_powered.json b/src/main/resources/assets/baseelectric/models/block/electric_pump_powered.json new file mode 100644 index 0000000..975c7f9 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_pump_powered.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_pump_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_still_off.json b/src/main/resources/assets/baseelectric/models/block/electric_still_off.json new file mode 100644 index 0000000..d493a87 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_still_off.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_still_off", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_still_on.json b/src/main/resources/assets/baseelectric/models/block/electric_still_on.json new file mode 100644 index 0000000..c1114df --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_still_on.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_still_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_still_powered.json b/src/main/resources/assets/baseelectric/models/block/electric_still_powered.json new file mode 100644 index 0000000..fa00b86 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_still_powered.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/electric_still_powered", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_switch_off.json b/src/main/resources/assets/baseelectric/models/block/electric_switch_off.json new file mode 100644 index 0000000..da5800b --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_switch_off.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "baseelectric:blocks/electric_switch_off", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/electric_switch_on.json b/src/main/resources/assets/baseelectric/models/block/electric_switch_on.json new file mode 100644 index 0000000..06f8209 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/electric_switch_on.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "baseelectric:blocks/electric_switch_on", + "particle": "baseelectric:materials/machine_case" + } +} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_0.json b/src/main/resources/assets/baseelectric/models/block/electric_track_0.json similarity index 90% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_0.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_0.json index 719a169..ee1f638 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_0.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_0.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_densuw.json b/src/main/resources/assets/baseelectric/models/block/electric_track_densuw.json similarity index 95% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_densuw.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_densuw.json index 7072e69..01fa1f2 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_densuw.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_densuw.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "__comment": "down", diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_desuw.json b/src/main/resources/assets/baseelectric/models/block/electric_track_desuw.json similarity index 95% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_desuw.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_desuw.json index f3c0067..e02dc5a 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_desuw.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_desuw.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_dnu.json b/src/main/resources/assets/baseelectric/models/block/electric_track_dnu.json similarity index 94% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_dnu.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_dnu.json index e456531..c0e6adb 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_dnu.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_dnu.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_ensw.json b/src/main/resources/assets/baseelectric/models/block/electric_track_ensw.json similarity index 94% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_ensw.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_ensw.json index f117ed2..e6f32ab 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_ensw.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_ensw.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_n.json b/src/main/resources/assets/baseelectric/models/block/electric_track_n.json similarity index 93% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_n.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_n.json index bf50242..e8e811c 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_n.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_n.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "__comment": "north-south", diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_ns.json b/src/main/resources/assets/baseelectric/models/block/electric_track_ns.json similarity index 94% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_ns.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_ns.json index 0c3cd91..4fc026e 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_ns.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_ns.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "__comment": "north-south", diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_nsuw.json b/src/main/resources/assets/baseelectric/models/block/electric_track_nsuw.json similarity index 94% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_nsuw.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_nsuw.json index 5d68e98..7f084f6 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_nsuw.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_nsuw.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_nsw.json b/src/main/resources/assets/baseelectric/models/block/electric_track_nsw.json similarity index 93% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_nsw.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_nsw.json index 1459629..a796d3a 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_nsw.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_nsw.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_nuw.json b/src/main/resources/assets/baseelectric/models/block/electric_track_nuw.json similarity index 93% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_nuw.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_nuw.json index 27316f8..82adb35 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_nuw.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_nuw.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_track_nw.json b/src/main/resources/assets/baseelectric/models/block/electric_track_nw.json similarity index 92% rename from src/main/resources/assets/electricadvantage/models/block/electric_track_nw.json rename to src/main/resources/assets/baseelectric/models/block/electric_track_nw.json index f1a7196..831016b 100644 --- a/src/main/resources/assets/electricadvantage/models/block/electric_track_nw.json +++ b/src/main/resources/assets/baseelectric/models/block/electric_track_nw.json @@ -1,9 +1,9 @@ { - "parent": "poweradvantage:block/steel_frame", + "parent": "basepower:block/steel_frame", "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case", - "face": "poweradvantage:blocks/steel_frame" + "texture": "baseelectric:blocks/electric_conduit", + "particle": "baseelectric:materials/machine_case", + "face": "basepower:blocks/steel_frame" }, "elements": [ { "from": [ 6, 6, 6 ], diff --git a/src/main/resources/assets/baseelectric/models/block/geothermal_generator.json b/src/main/resources/assets/baseelectric/models/block/geothermal_generator.json new file mode 100644 index 0000000..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..541b7c7 100644 --- a/src/main/resources/assets/electricadvantage/models/block/li_ore.json +++ b/src/main/resources/assets/baseelectric/models/block/li_ore.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "electricadvantage:blocks/lithium_ore" - } -} +{ + "parent": "block/cube_all", + "textures": { + "all": "baseelectric:blocks/lithium_ore" + } +} diff --git a/src/main/resources/assets/electricadvantage/models/block/photovoltaic_generator.json b/src/main/resources/assets/baseelectric/models/block/photovoltaic_generator.json similarity index 50% rename from src/main/resources/assets/electricadvantage/models/block/photovoltaic_generator.json rename to src/main/resources/assets/baseelectric/models/block/photovoltaic_generator.json index 2668019..ebe34e3 100644 --- a/src/main/resources/assets/electricadvantage/models/block/photovoltaic_generator.json +++ b/src/main/resources/assets/baseelectric/models/block/photovoltaic_generator.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "electricadvantage:blocks/photovoltaic_cell" + "all": "baseelectric:blocks/photovoltaic_cell" } } diff --git a/src/main/resources/assets/baseelectric/models/block/plastic_refinery_off.json b/src/main/resources/assets/baseelectric/models/block/plastic_refinery_off.json new file mode 100644 index 0000000..454bb36 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/plastic_refinery_off.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/plastic_refinery_off", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/plastic_refinery_on.json b/src/main/resources/assets/baseelectric/models/block/plastic_refinery_on.json new file mode 100644 index 0000000..8bc96ee --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/plastic_refinery_on.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/plastic_refinery_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/plastic_refinery_powered.json b/src/main/resources/assets/baseelectric/models/block/plastic_refinery_powered.json new file mode 100644 index 0000000..8bc96ee --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/plastic_refinery_powered.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/plastic_refinery_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} diff --git a/src/main/resources/assets/baseelectric/models/block/steam_powered_generator_off.json b/src/main/resources/assets/baseelectric/models/block/steam_powered_generator_off.json new file mode 100644 index 0000000..664378f --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/steam_powered_generator_off.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/steam_powered_generator_off", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/baseelectric/models/block/steam_powered_generator_on.json b/src/main/resources/assets/baseelectric/models/block/steam_powered_generator_on.json new file mode 100644 index 0000000..e3cd40e --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/block/steam_powered_generator_on.json @@ -0,0 +1,10 @@ +{ + "parent": "baseelectric:block/electric_machine_base", + "textures": { + "front": "baseelectric:blocks/steam_powered_generator_on", + "top": "baseelectric:blocks/machine_top", + "bottom":"baseelectric:blocks/machine_top", + "back": "baseelectric:blocks/machine_back", + "side": "baseelectric:blocks/machine_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/models/block/sulfur_ore.json b/src/main/resources/assets/baseelectric/models/block/sulfur_ore.json similarity index 52% rename from src/main/resources/assets/electricadvantage/models/block/sulfur_ore.json rename to src/main/resources/assets/baseelectric/models/block/sulfur_ore.json index e7e534c..aacc42b 100644 --- a/src/main/resources/assets/electricadvantage/models/block/sulfur_ore.json +++ b/src/main/resources/assets/baseelectric/models/block/sulfur_ore.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "electricadvantage:blocks/sulfur_ore" + "all": "baseelectric:blocks/sulfur_ore" } } \ No newline at end of file diff --git a/src/main/resources/assets/baseelectric/models/item/alkaline_battery.json b/src/main/resources/assets/baseelectric/models/item/alkaline_battery.json new file mode 100644 index 0000000..14f7e50 --- /dev/null +++ b/src/main/resources/assets/baseelectric/models/item/alkaline_battery.json @@ -0,0 +1,6 @@ +{ + "parent": "baseelectric:item/battery_base", + "textures": { + "item_texture": "baseelectric:items/alkaline_battery" + } +} diff --git a/src/main/resources/assets/electricadvantage/models/item/battery_base.json b/src/main/resources/assets/baseelectric/models/item/battery_base.json similarity index 91% rename from src/main/resources/assets/electricadvantage/models/item/battery_base.json rename to src/main/resources/assets/baseelectric/models/item/battery_base.json index 62326fd..43bda84 100644 --- a/src/main/resources/assets/electricadvantage/models/item/battery_base.json +++ b/src/main/resources/assets/baseelectric/models/item/battery_base.json @@ -1,7 +1,7 @@ { "parent": "block/block", "textures": { - "particle": "electricadvantage:materials/machine_case" + "particle": "baseelectric:materials/machine_case" }, "ambientocclusion": false, "elements": [ diff --git a/src/main/resources/assets/baseelectric/models/item/blank_circuit_board.json b/src/main/resources/assets/baseelectric/models/item/blank_circuit_board.json new file mode 100644 index 0000000..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/baseelectric/recipes/_factories.json b/src/main/resources/assets/baseelectric/recipes/_factories.json new file mode 100644 index 0000000..a1a1d10 --- /dev/null +++ b/src/main/resources/assets/baseelectric/recipes/_factories.json @@ -0,0 +1,6 @@ +{ + "conditions": { + "recipe_mode": "zone.moddev.mc.baseelectric.recipe.condition.RecipeModeConditionFactory", + "not_recipe_mode": "zone.moddev.mc.baseelectric.recipe.condition.NotRecipeModeConditionFactory" + } +} diff --git a/src/main/resources/assets/electricadvantage/recipes/alkaline_battery.json b/src/main/resources/assets/baseelectric/recipes/alkaline_battery.json similarity index 88% rename from src/main/resources/assets/electricadvantage/recipes/alkaline_battery.json rename to src/main/resources/assets/baseelectric/recipes/alkaline_battery.json index 996da4a..c74703d 100644 --- a/src/main/resources/assets/electricadvantage/recipes/alkaline_battery.json +++ b/src/main/resources/assets/baseelectric/recipes/alkaline_battery.json @@ -23,7 +23,7 @@ } }, "result": { - "item": "electricadvantage:alkaline_battery" + "item": "baseelectric:alkaline_battery" }, "group": "batteries" } diff --git a/src/main/resources/assets/electricadvantage/recipes/blank_circuit_board_ingot_normal.json b/src/main/resources/assets/baseelectric/recipes/blank_circuit_board_ingot_normal.json similarity index 74% rename from src/main/resources/assets/electricadvantage/recipes/blank_circuit_board_ingot_normal.json rename to src/main/resources/assets/baseelectric/recipes/blank_circuit_board_ingot_normal.json index 3feaaaa..636c997 100644 --- a/src/main/resources/assets/electricadvantage/recipes/blank_circuit_board_ingot_normal.json +++ b/src/main/resources/assets/baseelectric/recipes/blank_circuit_board_ingot_normal.json @@ -11,12 +11,12 @@ } ], "result": { - "item": "electricadvantage:blank_circuit_board", + "item": "baseelectric:blank_circuit_board", "count": 2 }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "NORMAL" } ], diff --git a/src/main/resources/assets/electricadvantage/recipes/blank_circuit_board_plate.json b/src/main/resources/assets/baseelectric/recipes/blank_circuit_board_plate.json similarity index 81% rename from src/main/resources/assets/electricadvantage/recipes/blank_circuit_board_plate.json rename to src/main/resources/assets/baseelectric/recipes/blank_circuit_board_plate.json index 12292a1..0fa6821 100644 --- a/src/main/resources/assets/electricadvantage/recipes/blank_circuit_board_plate.json +++ b/src/main/resources/assets/baseelectric/recipes/blank_circuit_board_plate.json @@ -11,7 +11,7 @@ } ], "result": { - "item": "electricadvantage:blank_circuit_board", + "item": "baseelectric:blank_circuit_board", "count": 2 }, "group": "circuits" diff --git a/src/main/resources/assets/electricadvantage/recipes/control_circuit.json b/src/main/resources/assets/baseelectric/recipes/control_circuit.json similarity index 69% rename from src/main/resources/assets/electricadvantage/recipes/control_circuit.json rename to src/main/resources/assets/baseelectric/recipes/control_circuit.json index be4af2a..eca9ad2 100644 --- a/src/main/resources/assets/electricadvantage/recipes/control_circuit.json +++ b/src/main/resources/assets/baseelectric/recipes/control_circuit.json @@ -2,7 +2,7 @@ "type": "forge:ore_shapeless", "ingredients": [ { - "item": "electricadvantage:blank_circuit_board" + "item": "baseelectric:blank_circuit_board" }, { "type": "forge:ore_dict", @@ -14,7 +14,7 @@ } ], "result": { - "item": "electricadvantage:control_circuit" + "item": "baseelectric:control_circuit" }, "group": "circuits" } diff --git a/src/main/resources/assets/electricadvantage/recipes/electric_battery_array.json b/src/main/resources/assets/baseelectric/recipes/electric_battery_array.json similarity index 87% rename from src/main/resources/assets/electricadvantage/recipes/electric_battery_array.json rename to src/main/resources/assets/baseelectric/recipes/electric_battery_array.json index cc5613b..506be40 100644 --- a/src/main/resources/assets/electricadvantage/recipes/electric_battery_array.json +++ b/src/main/resources/assets/baseelectric/recipes/electric_battery_array.json @@ -22,7 +22,7 @@ } }, "result": { - "item": "electricadvantage:electric_battery_array" + "item": "baseelectric:electric_battery_array" }, "group": "electric_machines" } diff --git a/src/main/resources/assets/electricadvantage/recipes/electric_conduit_plastic_ingot.json b/src/main/resources/assets/baseelectric/recipes/electric_conduit_plastic_ingot.json similarity index 84% rename from src/main/resources/assets/electricadvantage/recipes/electric_conduit_plastic_ingot.json rename to src/main/resources/assets/baseelectric/recipes/electric_conduit_plastic_ingot.json index 8e60d04..26b93f4 100644 --- a/src/main/resources/assets/electricadvantage/recipes/electric_conduit_plastic_ingot.json +++ b/src/main/resources/assets/baseelectric/recipes/electric_conduit_plastic_ingot.json @@ -16,7 +16,7 @@ } }, "result": { - "item": "electricadvantage:electric_conduit", + "item": "baseelectric:electric_conduit", "count": 6 }, "group": "wires" diff --git a/src/main/resources/assets/electricadvantage/recipes/electric_conduit_plastic_rod.json b/src/main/resources/assets/baseelectric/recipes/electric_conduit_plastic_rod.json similarity index 83% rename from src/main/resources/assets/electricadvantage/recipes/electric_conduit_plastic_rod.json rename to src/main/resources/assets/baseelectric/recipes/electric_conduit_plastic_rod.json index 6cdb434..ce7868c 100644 --- a/src/main/resources/assets/electricadvantage/recipes/electric_conduit_plastic_rod.json +++ b/src/main/resources/assets/baseelectric/recipes/electric_conduit_plastic_rod.json @@ -15,7 +15,7 @@ } }, "result": { - "item": "electricadvantage:electric_conduit" + "item": "baseelectric:electric_conduit" }, "group": "wires" } diff --git a/src/main/resources/assets/electricadvantage/recipes/electric_conduit_rubber_ingot.json b/src/main/resources/assets/baseelectric/recipes/electric_conduit_rubber_ingot.json similarity index 84% rename from src/main/resources/assets/electricadvantage/recipes/electric_conduit_rubber_ingot.json rename to src/main/resources/assets/baseelectric/recipes/electric_conduit_rubber_ingot.json index 8719c7d..32b92ec 100644 --- a/src/main/resources/assets/electricadvantage/recipes/electric_conduit_rubber_ingot.json +++ b/src/main/resources/assets/baseelectric/recipes/electric_conduit_rubber_ingot.json @@ -16,7 +16,7 @@ } }, "result": { - "item": "electricadvantage:electric_conduit", + "item": "baseelectric:electric_conduit", "count": 6 }, "group": "wires" diff --git a/src/main/resources/assets/electricadvantage/recipes/electric_conduit_rubber_rod.json b/src/main/resources/assets/baseelectric/recipes/electric_conduit_rubber_rod.json similarity index 83% rename from src/main/resources/assets/electricadvantage/recipes/electric_conduit_rubber_rod.json rename to src/main/resources/assets/baseelectric/recipes/electric_conduit_rubber_rod.json index ffc4452..c720056 100644 --- a/src/main/resources/assets/electricadvantage/recipes/electric_conduit_rubber_rod.json +++ b/src/main/resources/assets/baseelectric/recipes/electric_conduit_rubber_rod.json @@ -15,7 +15,7 @@ } }, "result": { - "item": "electricadvantage:electric_conduit" + "item": "baseelectric:electric_conduit" }, "group": "wires" } diff --git a/src/main/resources/assets/electricadvantage/recipes/electric_crusher.json b/src/main/resources/assets/baseelectric/recipes/electric_crusher.json similarity index 90% rename from src/main/resources/assets/electricadvantage/recipes/electric_crusher.json rename to src/main/resources/assets/baseelectric/recipes/electric_crusher.json index d9b30e2..e593853 100644 --- a/src/main/resources/assets/electricadvantage/recipes/electric_crusher.json +++ b/src/main/resources/assets/baseelectric/recipes/electric_crusher.json @@ -27,7 +27,7 @@ } }, "result": { - "item": "electricadvantage:electric_crusher" + "item": "baseelectric:electric_crusher" }, "group": "electric_machines" } diff --git a/src/main/resources/assets/electricadvantage/recipes/electric_drill.json b/src/main/resources/assets/baseelectric/recipes/electric_drill.json similarity index 89% rename from src/main/resources/assets/electricadvantage/recipes/electric_drill.json rename to src/main/resources/assets/baseelectric/recipes/electric_drill.json index 42c4a6a..fc1c376 100644 --- a/src/main/resources/assets/electricadvantage/recipes/electric_drill.json +++ b/src/main/resources/assets/baseelectric/recipes/electric_drill.json @@ -23,7 +23,7 @@ } }, "result": { - "item": "electricadvantage:electric_drill" + "item": "baseelectric:electric_drill" }, "group": "electric_machines" } diff --git a/src/main/resources/assets/electricadvantage/recipes/electric_fabricator.json b/src/main/resources/assets/baseelectric/recipes/electric_fabricator.json similarity index 88% rename from src/main/resources/assets/electricadvantage/recipes/electric_fabricator.json rename to src/main/resources/assets/baseelectric/recipes/electric_fabricator.json index 08a4d02..a1ca0df 100644 --- a/src/main/resources/assets/electricadvantage/recipes/electric_fabricator.json +++ b/src/main/resources/assets/baseelectric/recipes/electric_fabricator.json @@ -22,7 +22,7 @@ } }, "result": { - "item": "electricadvantage:electric_fabricator" + "item": "baseelectric:electric_fabricator" }, "group": "electric_machines" } diff --git a/src/main/resources/assets/electricadvantage/recipes/electric_furnace.json b/src/main/resources/assets/baseelectric/recipes/electric_furnace.json similarity index 83% rename from src/main/resources/assets/electricadvantage/recipes/electric_furnace.json rename to src/main/resources/assets/baseelectric/recipes/electric_furnace.json index 0c63e34..c67aa65 100644 --- a/src/main/resources/assets/electricadvantage/recipes/electric_furnace.json +++ b/src/main/resources/assets/baseelectric/recipes/electric_furnace.json @@ -15,7 +15,7 @@ } }, "result": { - "item": "electricadvantage:electric_furnace" + "item": "baseelectric:electric_furnace" }, "group": "electric_machines" } diff --git a/src/main/resources/assets/electricadvantage/recipes/electric_oven.json b/src/main/resources/assets/baseelectric/recipes/electric_oven.json similarity index 90% rename from src/main/resources/assets/electricadvantage/recipes/electric_oven.json rename to src/main/resources/assets/baseelectric/recipes/electric_oven.json index 3d9c719..3b85fa7 100644 --- a/src/main/resources/assets/electricadvantage/recipes/electric_oven.json +++ b/src/main/resources/assets/baseelectric/recipes/electric_oven.json @@ -27,7 +27,7 @@ } }, "result": { - "item": "electricadvantage:electric_oven" + "item": "baseelectric:electric_oven" }, "group": "electric_machines" } diff --git a/src/main/resources/assets/electricadvantage/recipes/electric_pump.json b/src/main/resources/assets/baseelectric/recipes/electric_pump.json similarity index 90% rename from src/main/resources/assets/electricadvantage/recipes/electric_pump.json rename to src/main/resources/assets/baseelectric/recipes/electric_pump.json index 0d0ad98..f7126fd 100644 --- a/src/main/resources/assets/electricadvantage/recipes/electric_pump.json +++ b/src/main/resources/assets/baseelectric/recipes/electric_pump.json @@ -25,7 +25,7 @@ } }, "result": { - "item": "electricadvantage:electric_pump" + "item": "baseelectric:electric_pump" }, "group": "electric_machines" } diff --git a/src/main/resources/assets/electricadvantage/recipes/electric_still.json b/src/main/resources/assets/baseelectric/recipes/electric_still.json similarity index 90% rename from src/main/resources/assets/electricadvantage/recipes/electric_still.json rename to src/main/resources/assets/baseelectric/recipes/electric_still.json index 78b52ea..abb43e3 100644 --- a/src/main/resources/assets/electricadvantage/recipes/electric_still.json +++ b/src/main/resources/assets/baseelectric/recipes/electric_still.json @@ -25,7 +25,7 @@ } }, "result": { - "item": "electricadvantage:electric_still" + "item": "baseelectric:electric_still" }, "group": "electric_machines" } diff --git a/src/main/resources/assets/electricadvantage/recipes/electric_switch.json b/src/main/resources/assets/baseelectric/recipes/electric_switch.json similarity index 86% rename from src/main/resources/assets/electricadvantage/recipes/electric_switch.json rename to src/main/resources/assets/baseelectric/recipes/electric_switch.json index 7b55d78..8e13bfe 100644 --- a/src/main/resources/assets/electricadvantage/recipes/electric_switch.json +++ b/src/main/resources/assets/baseelectric/recipes/electric_switch.json @@ -18,7 +18,7 @@ } }, "result": { - "item": "electricadvantage:electric_switch" + "item": "baseelectric:electric_switch" }, "group": "electric_machines" } diff --git a/src/main/resources/assets/baseelectric/recipes/electric_track.json b/src/main/resources/assets/baseelectric/recipes/electric_track.json new file mode 100644 index 0000000..6032abf --- /dev/null +++ b/src/main/resources/assets/baseelectric/recipes/electric_track.json @@ -0,0 +1,15 @@ +{ + "type": "forge:ore_shapeless", + "ingredients": [ + { + "item": "baseelectric:electric_conduit" + }, + { + "item": "basepower:steel_frame" + } + ], + "result": { + "item": "baseelectric:electric_track" + }, + "group": "tracks" +} diff --git a/src/main/resources/assets/electricadvantage/recipes/growth_chamber.json b/src/main/resources/assets/baseelectric/recipes/growth_chamber.json similarity index 90% rename from src/main/resources/assets/electricadvantage/recipes/growth_chamber.json rename to src/main/resources/assets/baseelectric/recipes/growth_chamber.json index 72d46a2..af18d86 100644 --- a/src/main/resources/assets/electricadvantage/recipes/growth_chamber.json +++ b/src/main/resources/assets/baseelectric/recipes/growth_chamber.json @@ -26,7 +26,7 @@ } }, "result": { - "item": "electricadvantage:growth_chamber" + "item": "baseelectric:growth_chamber" }, "group": "electric_machines" } diff --git a/src/main/resources/assets/electricadvantage/recipes/growth_chamber_controller.json b/src/main/resources/assets/baseelectric/recipes/growth_chamber_controller.json similarity index 88% rename from src/main/resources/assets/electricadvantage/recipes/growth_chamber_controller.json rename to src/main/resources/assets/baseelectric/recipes/growth_chamber_controller.json index e95c0ec..1c9a2f8 100644 --- a/src/main/resources/assets/electricadvantage/recipes/growth_chamber_controller.json +++ b/src/main/resources/assets/baseelectric/recipes/growth_chamber_controller.json @@ -26,7 +26,7 @@ } }, "result": { - "item": "electricadvantage:growth_chamber_controller" + "item": "baseelectric:growth_chamber_controller" }, "group": "electric_machines" } diff --git a/src/main/resources/assets/electricadvantage/recipes/hydroelectric_generator.json b/src/main/resources/assets/baseelectric/recipes/hydroelectric_generator.json similarity index 89% rename from src/main/resources/assets/electricadvantage/recipes/hydroelectric_generator.json rename to src/main/resources/assets/baseelectric/recipes/hydroelectric_generator.json index 3c8e7d3..dcb9dfb 100644 --- a/src/main/resources/assets/electricadvantage/recipes/hydroelectric_generator.json +++ b/src/main/resources/assets/baseelectric/recipes/hydroelectric_generator.json @@ -27,7 +27,7 @@ } }, "result": { - "item": "electricadvantage:hydroelectric_generator" + "item": "baseelectric:hydroelectric_generator" }, "group": "electric_machines" } diff --git a/src/main/resources/assets/electricadvantage/recipes/integrated_circuit_copper_normal.json b/src/main/resources/assets/baseelectric/recipes/integrated_circuit_copper_normal.json similarity index 77% rename from src/main/resources/assets/electricadvantage/recipes/integrated_circuit_copper_normal.json rename to src/main/resources/assets/baseelectric/recipes/integrated_circuit_copper_normal.json index 9018708..fc52474 100644 --- a/src/main/resources/assets/electricadvantage/recipes/integrated_circuit_copper_normal.json +++ b/src/main/resources/assets/baseelectric/recipes/integrated_circuit_copper_normal.json @@ -15,12 +15,12 @@ } }, "result": { - "item": "electricadvantage:integrated_circuit", + "item": "baseelectric:integrated_circuit", "count": 3 }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "NORMAL" } ], diff --git a/src/main/resources/assets/electricadvantage/recipes/integrated_circuit_copper_tech.json b/src/main/resources/assets/baseelectric/recipes/integrated_circuit_copper_tech.json similarity index 83% rename from src/main/resources/assets/electricadvantage/recipes/integrated_circuit_copper_tech.json rename to src/main/resources/assets/baseelectric/recipes/integrated_circuit_copper_tech.json index 0af96f2..7eacb45 100644 --- a/src/main/resources/assets/electricadvantage/recipes/integrated_circuit_copper_tech.json +++ b/src/main/resources/assets/baseelectric/recipes/integrated_circuit_copper_tech.json @@ -24,12 +24,12 @@ } }, "result": { - "item": "electricadvantage:integrated_circuit", + "item": "baseelectric:integrated_circuit", "count": 3 }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "TECH_PROGRESSION" } ], diff --git a/src/main/resources/assets/electricadvantage/recipes/integrated_circuit_gold_normal.json b/src/main/resources/assets/baseelectric/recipes/integrated_circuit_gold_normal.json similarity index 77% rename from src/main/resources/assets/electricadvantage/recipes/integrated_circuit_gold_normal.json rename to src/main/resources/assets/baseelectric/recipes/integrated_circuit_gold_normal.json index 2d255cd..499dd5c 100644 --- a/src/main/resources/assets/electricadvantage/recipes/integrated_circuit_gold_normal.json +++ b/src/main/resources/assets/baseelectric/recipes/integrated_circuit_gold_normal.json @@ -15,12 +15,12 @@ } }, "result": { - "item": "electricadvantage:integrated_circuit", + "item": "baseelectric:integrated_circuit", "count": 3 }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "NORMAL" } ], diff --git a/src/main/resources/assets/electricadvantage/recipes/integrated_circuit_gold_tech.json b/src/main/resources/assets/baseelectric/recipes/integrated_circuit_gold_tech.json similarity index 83% rename from src/main/resources/assets/electricadvantage/recipes/integrated_circuit_gold_tech.json rename to src/main/resources/assets/baseelectric/recipes/integrated_circuit_gold_tech.json index 96dfc27..8340654 100644 --- a/src/main/resources/assets/electricadvantage/recipes/integrated_circuit_gold_tech.json +++ b/src/main/resources/assets/baseelectric/recipes/integrated_circuit_gold_tech.json @@ -24,12 +24,12 @@ } }, "result": { - "item": "electricadvantage:integrated_circuit", + "item": "baseelectric:integrated_circuit", "count": 3 }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "TECH_PROGRESSION" } ], diff --git a/src/main/resources/assets/electricadvantage/recipes/integrated_circuit_tin_normal.json b/src/main/resources/assets/baseelectric/recipes/integrated_circuit_tin_normal.json similarity index 76% rename from src/main/resources/assets/electricadvantage/recipes/integrated_circuit_tin_normal.json rename to src/main/resources/assets/baseelectric/recipes/integrated_circuit_tin_normal.json index c910699..eda9d7f 100644 --- a/src/main/resources/assets/electricadvantage/recipes/integrated_circuit_tin_normal.json +++ b/src/main/resources/assets/baseelectric/recipes/integrated_circuit_tin_normal.json @@ -15,12 +15,12 @@ } }, "result": { - "item": "electricadvantage:integrated_circuit", + "item": "baseelectric:integrated_circuit", "count": 3 }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "NORMAL" } ], diff --git a/src/main/resources/assets/electricadvantage/recipes/integrated_circuit_tin_tech.json b/src/main/resources/assets/baseelectric/recipes/integrated_circuit_tin_tech.json similarity index 83% rename from src/main/resources/assets/electricadvantage/recipes/integrated_circuit_tin_tech.json rename to src/main/resources/assets/baseelectric/recipes/integrated_circuit_tin_tech.json index 146943a..30e874f 100644 --- a/src/main/resources/assets/electricadvantage/recipes/integrated_circuit_tin_tech.json +++ b/src/main/resources/assets/baseelectric/recipes/integrated_circuit_tin_tech.json @@ -24,12 +24,12 @@ } }, "result": { - "item": "electricadvantage:integrated_circuit", + "item": "baseelectric:integrated_circuit", "count": 3 }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "TECH_PROGRESSION" } ], diff --git a/src/main/resources/assets/electricadvantage/recipes/laser_turret_diamond_emerald.json b/src/main/resources/assets/baseelectric/recipes/laser_turret_diamond_emerald.json similarity index 91% rename from src/main/resources/assets/electricadvantage/recipes/laser_turret_diamond_emerald.json rename to src/main/resources/assets/baseelectric/recipes/laser_turret_diamond_emerald.json index 090e4d2..d0e6c4f 100644 --- a/src/main/resources/assets/electricadvantage/recipes/laser_turret_diamond_emerald.json +++ b/src/main/resources/assets/baseelectric/recipes/laser_turret_diamond_emerald.json @@ -27,7 +27,7 @@ } }, "result": { - "item": "electricadvantage:laser_turret" + "item": "baseelectric:laser_turret" }, "group": "electric_machines" } diff --git a/src/main/resources/assets/electricadvantage/recipes/laser_turret_emerald_diamond.json b/src/main/resources/assets/baseelectric/recipes/laser_turret_emerald_diamond.json similarity index 91% rename from src/main/resources/assets/electricadvantage/recipes/laser_turret_emerald_diamond.json rename to src/main/resources/assets/baseelectric/recipes/laser_turret_emerald_diamond.json index 21fabf0..a585a79 100644 --- a/src/main/resources/assets/electricadvantage/recipes/laser_turret_emerald_diamond.json +++ b/src/main/resources/assets/baseelectric/recipes/laser_turret_emerald_diamond.json @@ -27,7 +27,7 @@ } }, "result": { - "item": "electricadvantage:laser_turret" + "item": "baseelectric:laser_turret" }, "group": "electric_machines" } diff --git a/src/main/resources/assets/electricadvantage/recipes/lead_acid_battery_dust_sulfur.json b/src/main/resources/assets/baseelectric/recipes/lead_acid_battery_dust_sulfur.json similarity index 88% rename from src/main/resources/assets/electricadvantage/recipes/lead_acid_battery_dust_sulfur.json rename to src/main/resources/assets/baseelectric/recipes/lead_acid_battery_dust_sulfur.json index 24e0bf9..3bae713 100644 --- a/src/main/resources/assets/electricadvantage/recipes/lead_acid_battery_dust_sulfur.json +++ b/src/main/resources/assets/baseelectric/recipes/lead_acid_battery_dust_sulfur.json @@ -23,7 +23,7 @@ } }, "result": { - "item": "electricadvantage:lead_acid_battery" + "item": "baseelectric:lead_acid_battery" }, "group": "batteries" } diff --git a/src/main/resources/assets/electricadvantage/recipes/lead_acid_battery_sulfur.json b/src/main/resources/assets/baseelectric/recipes/lead_acid_battery_sulfur.json similarity index 88% rename from src/main/resources/assets/electricadvantage/recipes/lead_acid_battery_sulfur.json rename to src/main/resources/assets/baseelectric/recipes/lead_acid_battery_sulfur.json index 9ef3f32..cbb98cc 100644 --- a/src/main/resources/assets/electricadvantage/recipes/lead_acid_battery_sulfur.json +++ b/src/main/resources/assets/baseelectric/recipes/lead_acid_battery_sulfur.json @@ -23,7 +23,7 @@ } }, "result": { - "item": "electricadvantage:lead_acid_battery" + "item": "baseelectric:lead_acid_battery" }, "group": "batteries" } diff --git a/src/main/resources/assets/electricadvantage/recipes/led_bar.json b/src/main/resources/assets/baseelectric/recipes/led_bar.json similarity index 89% rename from src/main/resources/assets/electricadvantage/recipes/led_bar.json rename to src/main/resources/assets/baseelectric/recipes/led_bar.json index 0614e31..5b414f6 100644 --- a/src/main/resources/assets/electricadvantage/recipes/led_bar.json +++ b/src/main/resources/assets/baseelectric/recipes/led_bar.json @@ -20,7 +20,7 @@ } }, "result": { - "item": "electricadvantage:led_bar", + "item": "baseelectric:led_bar", "count": 3 }, "group": "parts" diff --git a/src/main/resources/assets/electricadvantage/recipes/lithium_battery.json b/src/main/resources/assets/baseelectric/recipes/lithium_battery.json similarity index 89% rename from src/main/resources/assets/electricadvantage/recipes/lithium_battery.json rename to src/main/resources/assets/baseelectric/recipes/lithium_battery.json index a25c27f..3c869e6 100644 --- a/src/main/resources/assets/electricadvantage/recipes/lithium_battery.json +++ b/src/main/resources/assets/baseelectric/recipes/lithium_battery.json @@ -24,7 +24,7 @@ } }, "result": { - "item": "electricadvantage:lithium_battery" + "item": "baseelectric:lithium_battery" }, "group": "batteries" } diff --git a/src/main/resources/assets/electricadvantage/recipes/nickel_hydride_battery.json b/src/main/resources/assets/baseelectric/recipes/nickel_hydride_battery.json similarity index 87% rename from src/main/resources/assets/electricadvantage/recipes/nickel_hydride_battery.json rename to src/main/resources/assets/baseelectric/recipes/nickel_hydride_battery.json index b1930c1..19e79f8 100644 --- a/src/main/resources/assets/electricadvantage/recipes/nickel_hydride_battery.json +++ b/src/main/resources/assets/baseelectric/recipes/nickel_hydride_battery.json @@ -23,7 +23,7 @@ } }, "result": { - "item": "electricadvantage:nickel_hydride_battery" + "item": "baseelectric:nickel_hydride_battery" }, "group": "batteries" } diff --git a/src/main/resources/assets/electricadvantage/recipes/photovoltaic_generator.json b/src/main/resources/assets/baseelectric/recipes/photovoltaic_generator.json similarity index 81% rename from src/main/resources/assets/electricadvantage/recipes/photovoltaic_generator.json rename to src/main/resources/assets/baseelectric/recipes/photovoltaic_generator.json index c01ab47..ec46d30 100644 --- a/src/main/resources/assets/electricadvantage/recipes/photovoltaic_generator.json +++ b/src/main/resources/assets/baseelectric/recipes/photovoltaic_generator.json @@ -24,11 +24,11 @@ } }, "result": { - "item": "electricadvantage:photovoltaic_generator" + "item": "baseelectric:photovoltaic_generator" }, "conditions": [ { - "type": "electricadvantage:not_recipe_mode", + "type": "baseelectric:not_recipe_mode", "mode": "APOCALYPTIC" } ], diff --git a/src/main/resources/assets/electricadvantage/recipes/plastic_refinery.json b/src/main/resources/assets/baseelectric/recipes/plastic_refinery.json similarity index 90% rename from src/main/resources/assets/electricadvantage/recipes/plastic_refinery.json rename to src/main/resources/assets/baseelectric/recipes/plastic_refinery.json index aa86503..3ec95f8 100644 --- a/src/main/resources/assets/electricadvantage/recipes/plastic_refinery.json +++ b/src/main/resources/assets/baseelectric/recipes/plastic_refinery.json @@ -26,7 +26,7 @@ } }, "result": { - "item": "electricadvantage:plastic_refinery" + "item": "baseelectric:plastic_refinery" }, "group": "electric_machines" } diff --git a/src/main/resources/assets/electricadvantage/recipes/power_supply_unit_iron_normal.json b/src/main/resources/assets/baseelectric/recipes/power_supply_unit_iron_normal.json similarity index 82% rename from src/main/resources/assets/electricadvantage/recipes/power_supply_unit_iron_normal.json rename to src/main/resources/assets/baseelectric/recipes/power_supply_unit_iron_normal.json index 7f0eab6..a4547b1 100644 --- a/src/main/resources/assets/electricadvantage/recipes/power_supply_unit_iron_normal.json +++ b/src/main/resources/assets/baseelectric/recipes/power_supply_unit_iron_normal.json @@ -19,11 +19,11 @@ } }, "result": { - "item": "electricadvantage:psu" + "item": "baseelectric:psu" }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "NORMAL" } ], diff --git a/src/main/resources/assets/electricadvantage/recipes/power_supply_unit_plate_steel_apocalyptic.json b/src/main/resources/assets/baseelectric/recipes/power_supply_unit_plate_steel_apocalyptic.json similarity index 82% rename from src/main/resources/assets/electricadvantage/recipes/power_supply_unit_plate_steel_apocalyptic.json rename to src/main/resources/assets/baseelectric/recipes/power_supply_unit_plate_steel_apocalyptic.json index 47f232a..96e8611 100644 --- a/src/main/resources/assets/electricadvantage/recipes/power_supply_unit_plate_steel_apocalyptic.json +++ b/src/main/resources/assets/baseelectric/recipes/power_supply_unit_plate_steel_apocalyptic.json @@ -19,11 +19,11 @@ } }, "result": { - "item": "electricadvantage:psu" + "item": "baseelectric:psu" }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "APOCALYPTIC" } ], diff --git a/src/main/resources/assets/electricadvantage/recipes/power_supply_unit_plate_steel_tech.json b/src/main/resources/assets/baseelectric/recipes/power_supply_unit_plate_steel_tech.json similarity index 82% rename from src/main/resources/assets/electricadvantage/recipes/power_supply_unit_plate_steel_tech.json rename to src/main/resources/assets/baseelectric/recipes/power_supply_unit_plate_steel_tech.json index b999337..5435523 100644 --- a/src/main/resources/assets/electricadvantage/recipes/power_supply_unit_plate_steel_tech.json +++ b/src/main/resources/assets/baseelectric/recipes/power_supply_unit_plate_steel_tech.json @@ -19,11 +19,11 @@ } }, "result": { - "item": "electricadvantage:psu" + "item": "baseelectric:psu" }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "TECH_PROGRESSION" } ], diff --git a/src/main/resources/assets/electricadvantage/recipes/power_supply_unit_steel_normal.json b/src/main/resources/assets/baseelectric/recipes/power_supply_unit_steel_normal.json similarity index 82% rename from src/main/resources/assets/electricadvantage/recipes/power_supply_unit_steel_normal.json rename to src/main/resources/assets/baseelectric/recipes/power_supply_unit_steel_normal.json index f3466cb..045ff6a 100644 --- a/src/main/resources/assets/electricadvantage/recipes/power_supply_unit_steel_normal.json +++ b/src/main/resources/assets/baseelectric/recipes/power_supply_unit_steel_normal.json @@ -19,11 +19,11 @@ } }, "result": { - "item": "electricadvantage:psu" + "item": "baseelectric:psu" }, "conditions": [ { - "type": "electricadvantage:recipe_mode", + "type": "baseelectric:recipe_mode", "mode": "NORMAL" } ], diff --git a/src/main/resources/assets/electricadvantage/recipes/silicon_blend.json b/src/main/resources/assets/baseelectric/recipes/silicon_blend.json similarity index 83% rename from src/main/resources/assets/electricadvantage/recipes/silicon_blend.json rename to src/main/resources/assets/baseelectric/recipes/silicon_blend.json index eab9630..4924c20 100644 --- a/src/main/resources/assets/electricadvantage/recipes/silicon_blend.json +++ b/src/main/resources/assets/baseelectric/recipes/silicon_blend.json @@ -11,7 +11,7 @@ } ], "result": { - "item": "electricadvantage:silicon_mix" + "item": "baseelectric:silicon_mix" }, "group": "materials" } diff --git a/src/main/resources/assets/electricadvantage/recipes/solder_blend_tin_lead.json b/src/main/resources/assets/baseelectric/recipes/solder_blend_tin_lead.json similarity index 87% rename from src/main/resources/assets/electricadvantage/recipes/solder_blend_tin_lead.json rename to src/main/resources/assets/baseelectric/recipes/solder_blend_tin_lead.json index 430da7f..98b208d 100644 --- a/src/main/resources/assets/electricadvantage/recipes/solder_blend_tin_lead.json +++ b/src/main/resources/assets/baseelectric/recipes/solder_blend_tin_lead.json @@ -15,7 +15,7 @@ } ], "result": { - "item": "electricadvantage:solder_mix", + "item": "baseelectric:solder_mix", "count": 3 }, "group": "materials" diff --git a/src/main/resources/assets/electricadvantage/recipes/solder_blend_tin_silver.json b/src/main/resources/assets/baseelectric/recipes/solder_blend_tin_silver.json similarity index 87% rename from src/main/resources/assets/electricadvantage/recipes/solder_blend_tin_silver.json rename to src/main/resources/assets/baseelectric/recipes/solder_blend_tin_silver.json index 3672d8f..14a49d6 100644 --- a/src/main/resources/assets/electricadvantage/recipes/solder_blend_tin_silver.json +++ b/src/main/resources/assets/baseelectric/recipes/solder_blend_tin_silver.json @@ -15,7 +15,7 @@ } ], "result": { - "item": "electricadvantage:solder_mix", + "item": "baseelectric:solder_mix", "count": 3 }, "group": "materials" diff --git a/src/main/resources/assets/electricadvantage/recipes/steam_powered_generator.json b/src/main/resources/assets/baseelectric/recipes/steam_powered_generator.json similarity index 89% rename from src/main/resources/assets/electricadvantage/recipes/steam_powered_generator.json rename to src/main/resources/assets/baseelectric/recipes/steam_powered_generator.json index 39dc238..fa18e95 100644 --- a/src/main/resources/assets/electricadvantage/recipes/steam_powered_generator.json +++ b/src/main/resources/assets/baseelectric/recipes/steam_powered_generator.json @@ -27,7 +27,7 @@ } }, "result": { - "item": "electricadvantage:steam_powered_generator" + "item": "baseelectric:steam_powered_generator" }, "group": "electric_machines" } diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_battery_array.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_battery_array.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_battery_array.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_battery_array.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_conduit.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_conduit.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_conduit.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_conduit.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_crusher_off.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_crusher_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_crusher_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_crusher_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_crusher_on.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_crusher_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_crusher_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_crusher_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_crusher_on.png.mcmeta b/src/main/resources/assets/baseelectric/textures/blocks/electric_crusher_on.png.mcmeta similarity index 88% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_crusher_on.png.mcmeta rename to src/main/resources/assets/baseelectric/textures/blocks/electric_crusher_on.png.mcmeta index 72c98b9..dd1bedb 100644 --- a/src/main/resources/assets/electricadvantage/textures/blocks/electric_crusher_on.png.mcmeta +++ b/src/main/resources/assets/baseelectric/textures/blocks/electric_crusher_on.png.mcmeta @@ -1,3 +1,3 @@ -{ - "animation": {} -} +{ + "animation": {} +} diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_crusher_powered.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_crusher_powered.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_crusher_powered.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_crusher_powered.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_drill_off.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_drill_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_drill_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_drill_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_drill_on.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_drill_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_drill_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_drill_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_drill_powered.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_drill_powered.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_drill_powered.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_drill_powered.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_fabricator_off.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_fabricator_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_fabricator_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_fabricator_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_fabricator_on.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_fabricator_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_fabricator_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_fabricator_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_fabricator_on.png.mcmeta b/src/main/resources/assets/baseelectric/textures/blocks/electric_fabricator_on.png.mcmeta similarity index 91% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_fabricator_on.png.mcmeta rename to src/main/resources/assets/baseelectric/textures/blocks/electric_fabricator_on.png.mcmeta index 8e23b64..5c072b7 100644 --- a/src/main/resources/assets/electricadvantage/textures/blocks/electric_fabricator_on.png.mcmeta +++ b/src/main/resources/assets/baseelectric/textures/blocks/electric_fabricator_on.png.mcmeta @@ -1,16 +1,16 @@ -{ - "animation": { - "frametime": 24, - "interpolate": false, - "frames": [ - 0, - 1, - 3, - 2, - 1, - 3, - 0, - 2 - ] - } -} +{ + "animation": { + "frametime": 24, + "interpolate": false, + "frames": [ + 0, + 1, + 3, + 2, + 1, + 3, + 0, + 2 + ] + } +} diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_fabricator_powered.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_fabricator_powered.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_fabricator_powered.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_fabricator_powered.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_furnace_off.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_furnace_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_furnace_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_furnace_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_furnace_on.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_furnace_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_furnace_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_furnace_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_furnace_powered.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_furnace_powered.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_furnace_powered.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_furnace_powered.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_oven_off.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_oven_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_oven_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_oven_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_oven_on.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_oven_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_oven_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_oven_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_oven_powered.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_oven_powered.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_oven_powered.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_oven_powered.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_pcb_printer_off.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_pcb_printer_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_pcb_printer_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_pcb_printer_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_pcb_printer_on.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_pcb_printer_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_pcb_printer_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_pcb_printer_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_pcb_printer_powered.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_pcb_printer_powered.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_pcb_printer_powered.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_pcb_printer_powered.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_pump_off.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_pump_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_pump_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_pump_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_pump_on.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_pump_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_pump_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_pump_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_still_off.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_still_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_still_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_still_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_still_on.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_still_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_still_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_still_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_still_on.png.mcmeta b/src/main/resources/assets/baseelectric/textures/blocks/electric_still_on.png.mcmeta similarity index 88% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_still_on.png.mcmeta rename to src/main/resources/assets/baseelectric/textures/blocks/electric_still_on.png.mcmeta index 72c98b9..dd1bedb 100644 --- a/src/main/resources/assets/electricadvantage/textures/blocks/electric_still_on.png.mcmeta +++ b/src/main/resources/assets/baseelectric/textures/blocks/electric_still_on.png.mcmeta @@ -1,3 +1,3 @@ -{ - "animation": {} -} +{ + "animation": {} +} diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_still_powered.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_still_powered.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_still_powered.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_still_powered.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_switch_off.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_switch_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_switch_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_switch_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/electric_switch_on.png b/src/main/resources/assets/baseelectric/textures/blocks/electric_switch_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/electric_switch_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/electric_switch_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/growth_chamber_controller.png b/src/main/resources/assets/baseelectric/textures/blocks/growth_chamber_controller.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/growth_chamber_controller.png rename to src/main/resources/assets/baseelectric/textures/blocks/growth_chamber_controller.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/growth_chamber_off.png b/src/main/resources/assets/baseelectric/textures/blocks/growth_chamber_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/growth_chamber_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/growth_chamber_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/growth_chamber_on.png b/src/main/resources/assets/baseelectric/textures/blocks/growth_chamber_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/growth_chamber_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/growth_chamber_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/growth_chamber_powered.png b/src/main/resources/assets/baseelectric/textures/blocks/growth_chamber_powered.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/growth_chamber_powered.png rename to src/main/resources/assets/baseelectric/textures/blocks/growth_chamber_powered.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/hydroelectric_generator_off.png b/src/main/resources/assets/baseelectric/textures/blocks/hydroelectric_generator_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/hydroelectric_generator_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/hydroelectric_generator_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/hydroelectric_generator_on.png b/src/main/resources/assets/baseelectric/textures/blocks/hydroelectric_generator_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/hydroelectric_generator_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/hydroelectric_generator_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/hydroelectric_generator_on.png.mcmeta b/src/main/resources/assets/baseelectric/textures/blocks/hydroelectric_generator_on.png.mcmeta similarity index 88% rename from src/main/resources/assets/electricadvantage/textures/blocks/hydroelectric_generator_on.png.mcmeta rename to src/main/resources/assets/baseelectric/textures/blocks/hydroelectric_generator_on.png.mcmeta index 72c98b9..dd1bedb 100644 --- a/src/main/resources/assets/electricadvantage/textures/blocks/hydroelectric_generator_on.png.mcmeta +++ b/src/main/resources/assets/baseelectric/textures/blocks/hydroelectric_generator_on.png.mcmeta @@ -1,3 +1,3 @@ -{ - "animation": {} -} +{ + "animation": {} +} diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/laser_drill_optic.png b/src/main/resources/assets/baseelectric/textures/blocks/laser_drill_optic.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/laser_drill_optic.png rename to src/main/resources/assets/baseelectric/textures/blocks/laser_drill_optic.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/laser_drill_optic_on.png b/src/main/resources/assets/baseelectric/textures/blocks/laser_drill_optic_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/laser_drill_optic_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/laser_drill_optic_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/laser_turret_base.png b/src/main/resources/assets/baseelectric/textures/blocks/laser_turret_base.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/laser_turret_base.png rename to src/main/resources/assets/baseelectric/textures/blocks/laser_turret_base.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/led_bar_off.png b/src/main/resources/assets/baseelectric/textures/blocks/led_bar_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/led_bar_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/led_bar_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/led_bar_on.png b/src/main/resources/assets/baseelectric/textures/blocks/led_bar_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/led_bar_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/led_bar_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/lithium_ore.png b/src/main/resources/assets/baseelectric/textures/blocks/lithium_ore.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/lithium_ore.png rename to src/main/resources/assets/baseelectric/textures/blocks/lithium_ore.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/machine_back.png b/src/main/resources/assets/baseelectric/textures/blocks/machine_back.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/machine_back.png rename to src/main/resources/assets/baseelectric/textures/blocks/machine_back.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/machine_side.png b/src/main/resources/assets/baseelectric/textures/blocks/machine_side.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/machine_side.png rename to src/main/resources/assets/baseelectric/textures/blocks/machine_side.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/machine_top.png b/src/main/resources/assets/baseelectric/textures/blocks/machine_top.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/machine_top.png rename to src/main/resources/assets/baseelectric/textures/blocks/machine_top.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/photovoltaic_cell.png b/src/main/resources/assets/baseelectric/textures/blocks/photovoltaic_cell.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/photovoltaic_cell.png rename to src/main/resources/assets/baseelectric/textures/blocks/photovoltaic_cell.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/plastic_refinery_off.png b/src/main/resources/assets/baseelectric/textures/blocks/plastic_refinery_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/plastic_refinery_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/plastic_refinery_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/plastic_refinery_on.png b/src/main/resources/assets/baseelectric/textures/blocks/plastic_refinery_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/plastic_refinery_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/plastic_refinery_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/steam_powered_generator_off.png b/src/main/resources/assets/baseelectric/textures/blocks/steam_powered_generator_off.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/steam_powered_generator_off.png rename to src/main/resources/assets/baseelectric/textures/blocks/steam_powered_generator_off.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/steam_powered_generator_on.png b/src/main/resources/assets/baseelectric/textures/blocks/steam_powered_generator_on.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/steam_powered_generator_on.png rename to src/main/resources/assets/baseelectric/textures/blocks/steam_powered_generator_on.png diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/steam_powered_generator_on.png.mcmeta b/src/main/resources/assets/baseelectric/textures/blocks/steam_powered_generator_on.png.mcmeta similarity index 88% rename from src/main/resources/assets/electricadvantage/textures/blocks/steam_powered_generator_on.png.mcmeta rename to src/main/resources/assets/baseelectric/textures/blocks/steam_powered_generator_on.png.mcmeta index 72c98b9..dd1bedb 100644 --- a/src/main/resources/assets/electricadvantage/textures/blocks/steam_powered_generator_on.png.mcmeta +++ b/src/main/resources/assets/baseelectric/textures/blocks/steam_powered_generator_on.png.mcmeta @@ -1,3 +1,3 @@ -{ - "animation": {} -} +{ + "animation": {} +} diff --git a/src/main/resources/assets/electricadvantage/textures/blocks/sulfur_ore.png b/src/main/resources/assets/baseelectric/textures/blocks/sulfur_ore.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/blocks/sulfur_ore.png rename to src/main/resources/assets/baseelectric/textures/blocks/sulfur_ore.png diff --git a/src/main/resources/assets/electricadvantage/textures/entity/hydroturbine.png b/src/main/resources/assets/baseelectric/textures/entity/hydroturbine.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/entity/hydroturbine.png rename to src/main/resources/assets/baseelectric/textures/entity/hydroturbine.png diff --git a/src/main/resources/assets/electricadvantage/textures/entity/laser_turret.png b/src/main/resources/assets/baseelectric/textures/entity/laser_turret.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/entity/laser_turret.png rename to src/main/resources/assets/baseelectric/textures/entity/laser_turret.png diff --git a/src/main/resources/assets/electricadvantage/textures/entity/windturbine.png b/src/main/resources/assets/baseelectric/textures/entity/windturbine.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/entity/windturbine.png rename to src/main/resources/assets/baseelectric/textures/entity/windturbine.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/electric_battery_array_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/electric_battery_array_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/electric_battery_array_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/electric_battery_array_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/electric_crusher_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/electric_crusher_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/electric_crusher_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/electric_crusher_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/electric_drill_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/electric_drill_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/electric_drill_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/electric_drill_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/electric_fabricator_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/electric_fabricator_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/electric_fabricator_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/electric_fabricator_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/electric_furnace_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/electric_furnace_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/electric_furnace_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/electric_furnace_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/electric_generator_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/electric_generator_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/electric_generator_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/electric_generator_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/electric_machine_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/electric_machine_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/electric_machine_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/electric_machine_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/electric_oven_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/electric_oven_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/electric_oven_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/electric_oven_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/electric_pump_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/electric_pump_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/electric_pump_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/electric_pump_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/electric_still_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/electric_still_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/electric_still_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/electric_still_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/geothermal_generator_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/geothermal_generator_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/geothermal_generator_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/geothermal_generator_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/growth_chamber_controller_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/growth_chamber_controller_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/growth_chamber_controller_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/growth_chamber_controller_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/growth_chamber_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/growth_chamber_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/growth_chamber_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/growth_chamber_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/pcb_printer_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/pcb_printer_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/pcb_printer_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/pcb_printer_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/gui/container/plastic_refinery_gui.png b/src/main/resources/assets/baseelectric/textures/gui/container/plastic_refinery_gui.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/gui/container/plastic_refinery_gui.png rename to src/main/resources/assets/baseelectric/textures/gui/container/plastic_refinery_gui.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/alkaline_battery.png b/src/main/resources/assets/baseelectric/textures/items/alkaline_battery.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/alkaline_battery.png rename to src/main/resources/assets/baseelectric/textures/items/alkaline_battery.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/blank_circuit_board.png b/src/main/resources/assets/baseelectric/textures/items/blank_circuit_board.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/blank_circuit_board.png rename to src/main/resources/assets/baseelectric/textures/items/blank_circuit_board.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/control_circuit.png b/src/main/resources/assets/baseelectric/textures/items/control_circuit.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/control_circuit.png rename to src/main/resources/assets/baseelectric/textures/items/control_circuit.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/integrated_circuit.png b/src/main/resources/assets/baseelectric/textures/items/integrated_circuit.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/integrated_circuit.png rename to src/main/resources/assets/baseelectric/textures/items/integrated_circuit.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/lead_acid_battery.png b/src/main/resources/assets/baseelectric/textures/items/lead_acid_battery.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/lead_acid_battery.png rename to src/main/resources/assets/baseelectric/textures/items/lead_acid_battery.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/li_ingot.png b/src/main/resources/assets/baseelectric/textures/items/li_ingot.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/li_ingot.png rename to src/main/resources/assets/baseelectric/textures/items/li_ingot.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/li_nugget.png b/src/main/resources/assets/baseelectric/textures/items/li_nugget.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/li_nugget.png rename to src/main/resources/assets/baseelectric/textures/items/li_nugget.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/li_powder.png b/src/main/resources/assets/baseelectric/textures/items/li_powder.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/li_powder.png rename to src/main/resources/assets/baseelectric/textures/items/li_powder.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/lithium_battery.png b/src/main/resources/assets/baseelectric/textures/items/lithium_battery.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/lithium_battery.png rename to src/main/resources/assets/baseelectric/textures/items/lithium_battery.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/nickel_hydride_battery.png b/src/main/resources/assets/baseelectric/textures/items/nickel_hydride_battery.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/nickel_hydride_battery.png rename to src/main/resources/assets/baseelectric/textures/items/nickel_hydride_battery.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/petrolplastic_ingot.png b/src/main/resources/assets/baseelectric/textures/items/petrolplastic_ingot.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/petrolplastic_ingot.png rename to src/main/resources/assets/baseelectric/textures/items/petrolplastic_ingot.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/psu.png b/src/main/resources/assets/baseelectric/textures/items/psu.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/psu.png rename to src/main/resources/assets/baseelectric/textures/items/psu.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/silicon_ingot.png b/src/main/resources/assets/baseelectric/textures/items/silicon_ingot.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/silicon_ingot.png rename to src/main/resources/assets/baseelectric/textures/items/silicon_ingot.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/silicon_mix.png b/src/main/resources/assets/baseelectric/textures/items/silicon_mix.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/silicon_mix.png rename to src/main/resources/assets/baseelectric/textures/items/silicon_mix.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/solder.png b/src/main/resources/assets/baseelectric/textures/items/solder.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/solder.png rename to src/main/resources/assets/baseelectric/textures/items/solder.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/solder_mix.png b/src/main/resources/assets/baseelectric/textures/items/solder_mix.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/solder_mix.png rename to src/main/resources/assets/baseelectric/textures/items/solder_mix.png diff --git a/src/main/resources/assets/electricadvantage/textures/items/sulfur_powder.png b/src/main/resources/assets/baseelectric/textures/items/sulfur_powder.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/items/sulfur_powder.png rename to src/main/resources/assets/baseelectric/textures/items/sulfur_powder.png diff --git a/src/main/resources/assets/electricadvantage/textures/materials/laser_beam.png b/src/main/resources/assets/baseelectric/textures/materials/laser_beam.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/materials/laser_beam.png rename to src/main/resources/assets/baseelectric/textures/materials/laser_beam.png diff --git a/src/main/resources/assets/electricadvantage/textures/materials/machine_case.png b/src/main/resources/assets/baseelectric/textures/materials/machine_case.png similarity index 100% rename from src/main/resources/assets/electricadvantage/textures/materials/machine_case.png rename to src/main/resources/assets/baseelectric/textures/materials/machine_case.png diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_battery_array.json b/src/main/resources/assets/electricadvantage/blockstates/electric_battery_array.json deleted file mode 100644 index 3a42457..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_battery_array.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "active=true,facing=east": { "model": "electricadvantage:electric_battery_array", "y": 90 }, - "active=true,facing=north": { "model": "electricadvantage:electric_battery_array" }, - "active=true,facing=south": { "model": "electricadvantage:electric_battery_array", "y": 180 }, - "active=true,facing=west": { "model": "electricadvantage:electric_battery_array", "y": 270 }, - "active=false,facing=east": { "model": "electricadvantage:electric_battery_array", "y": 90 }, - "active=false,facing=north": { "model": "electricadvantage:electric_battery_array" }, - "active=false,facing=south": { "model": "electricadvantage:electric_battery_array", "y": 180 }, - "active=false,facing=west": { "model": "electricadvantage:electric_battery_array", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_conduit.json b/src/main/resources/assets/electricadvantage/blockstates/electric_conduit.json deleted file mode 100644 index f4d4d67..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_conduit.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "__comment": "blockstate parameters MUST be in alphabetical order!", - "variants": { - "down=false,east=false,north=false,south=false,up=false,west=false": { "model": "electricadvantage:electric_conduit_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=false,west=false": { "model": "electricadvantage:electric_conduit_n", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=false,west=false": { "model": "electricadvantage:electric_conduit_n", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=false,west=false": { "model": "electricadvantage:electric_conduit_n", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=false,west=false": { "model": "electricadvantage:electric_conduit_n", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=true,west=false": { "model": "electricadvantage:electric_conduit_n", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=false,west=true": { "model": "electricadvantage:electric_conduit_n", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=false,west=false": { "model": "electricadvantage:electric_conduit_nw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=false,west=false": { "model": "electricadvantage:electric_conduit_nw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=false,west=false": { "model": "electricadvantage:electric_conduit_nw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=true,west=false": { "model": "electricadvantage:electric_conduit_ns", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=false,west=true": { "model": "electricadvantage:electric_conduit_nw", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=false,west=false": { "model": "electricadvantage:electric_conduit_nw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=false,west=false": { "model": "electricadvantage:electric_conduit_nw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=true,west=false": { "model": "electricadvantage:electric_conduit_nw", "x": 270, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=false,west=true": { "model": "electricadvantage:electric_conduit_ns", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=false,west=false": { "model": "electricadvantage:electric_conduit_ns", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=true,west=false": { "model": "electricadvantage:electric_conduit_nw", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=false,west=true": { "model": "electricadvantage:electric_conduit_nw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=true,west=false": { "model": "electricadvantage:electric_conduit_nw", "x": 270, "y": 270, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=false,west=true": { "model": "electricadvantage:electric_conduit_nw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=true,west=true": { "model": "electricadvantage:electric_conduit_nw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=false,west=false": { "model": "electricadvantage:electric_conduit_nuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=false,west=false": { "model": "electricadvantage:electric_conduit_nuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=true,west=false": { "model": "electricadvantage:electric_conduit_dnu", "x": 0, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=false,west=true": { "model": "electricadvantage:electric_conduit_dnu", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=false,west=false": { "model": "electricadvantage:electric_conduit_dnu", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=true,west=false": { "model": "electricadvantage:electric_conduit_dnu", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=false,west=true": { "model": "electricadvantage:electric_conduit_nuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=true,west=false": { "model": "electricadvantage:electric_conduit_dnu", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=false,west=true": { "model": "electricadvantage:electric_conduit_nuw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=true,west=true": { "model": "electricadvantage:electric_conduit_dnu", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=false,west=false": { "model": "electricadvantage:electric_conduit_nsw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=true,west=false": { "model": "electricadvantage:electric_conduit_nuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=false,west=true": { "model": "electricadvantage:electric_conduit_nsw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=true,west=false": { "model": "electricadvantage:electric_conduit_nuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=false,west=true": { "model": "electricadvantage:electric_conduit_nsw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=true,west=true": { "model": "electricadvantage:electric_conduit_dnu", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=true,west=false": { "model": "electricadvantage:electric_conduit_dnu", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=false,west=true": { "model": "electricadvantage:electric_conduit_nsw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=true,west=true": { "model": "electricadvantage:electric_conduit_nuw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=true,west=true": { "model": "electricadvantage:electric_conduit_nuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=false,west=false": { "model": "electricadvantage:electric_conduit_nsuw", "x": 180, "y": 180, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=true,west=false": { "model": "electricadvantage:electric_conduit_nsuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=false,west=true": { "model": "electricadvantage:electric_conduit_nsuw", "x": 180, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=true,west=false": { "model": "electricadvantage:electric_conduit_nsuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=false,west=true": { "model": "electricadvantage:electric_conduit_nsuw", "x": 180, "y": 270, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=true,west=true": { "model": "electricadvantage:electric_conduit_ensw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=true,west=false": { "model": "electricadvantage:electric_conduit_ensw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=false,west=true": { "model": "electricadvantage:electric_conduit_nsuw", "x": 180, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=true,west=true": { "model": "electricadvantage:electric_conduit_nsuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=true,west=true": { "model": "electricadvantage:electric_conduit_nsuw", "x": 90, "y": 270, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=true,west=false": { "model": "electricadvantage:electric_conduit_nsuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=false,west=true": { "model": "electricadvantage:electric_conduit_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=true,west=true": { "model": "electricadvantage:electric_conduit_nsuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=true,west=true": { "model": "electricadvantage:electric_conduit_nsuw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=true,west=true": { "model": "electricadvantage:electric_conduit_nsuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=true,west=false": { "model": "electricadvantage:electric_conduit_desuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=false,west=true": { "model": "electricadvantage:electric_conduit_desuw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=true,west=true": { "model": "electricadvantage:electric_conduit_desuw", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=true,west=true": { "model": "electricadvantage:electric_conduit_desuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=true,west=true": { "model": "electricadvantage:electric_conduit_desuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=true,west=true": { "model": "electricadvantage:electric_conduit_desuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=true,west=true": { "model": "electricadvantage:electric_conduit_densuw", "x": 0, "y": 0, "uvlock": false } - - } -} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_crusher.json b/src/main/resources/assets/electricadvantage/blockstates/electric_crusher.json deleted file mode 100644 index c61f389..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_crusher.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:electric_crusher_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:electric_crusher_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:electric_crusher_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:electric_crusher_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:electric_crusher_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:electric_crusher_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:electric_crusher_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:electric_crusher_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:electric_crusher_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:electric_crusher_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:electric_crusher_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:electric_crusher_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:electric_crusher_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:electric_crusher_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:electric_crusher_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:electric_crusher_on", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_drill.json b/src/main/resources/assets/electricadvantage/blockstates/electric_drill.json deleted file mode 100644 index 2040964..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_drill.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "variants": { - "active=true,facing=up": { "model": "electricadvantage:electric_drill_on", "x":270 }, - "active=true,facing=down": { "model": "electricadvantage:electric_drill_on", "x": 90 }, - "active=true,facing=east": { "model": "electricadvantage:electric_drill_on", "y": 90 }, - "active=true,facing=north": { "model": "electricadvantage:electric_drill_on" }, - "active=true,facing=south": { "model": "electricadvantage:electric_drill_on", "y": 180 }, - "active=true,facing=west": { "model": "electricadvantage:electric_drill_on", "y": 270 }, - "active=false,facing=up": { "model": "electricadvantage:electric_drill_off", "x":270 }, - "active=false,facing=down": { "model": "electricadvantage:electric_drill_off", "x": 90 }, - "active=false,facing=east": { "model": "electricadvantage:electric_drill_off", "y": 90 }, - "active=false,facing=north": { "model": "electricadvantage:electric_drill_off" }, - "active=false,facing=south": { "model": "electricadvantage:electric_drill_off", "y": 180 }, - "active=false,facing=west": { "model": "electricadvantage:electric_drill_off", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_fabricator.json b/src/main/resources/assets/electricadvantage/blockstates/electric_fabricator.json deleted file mode 100644 index 22904b8..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_fabricator.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:electric_fabricator_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:electric_fabricator_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:electric_fabricator_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:electric_fabricator_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:electric_fabricator_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:electric_fabricator_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:electric_fabricator_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:electric_fabricator_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:electric_fabricator_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:electric_fabricator_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:electric_fabricator_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:electric_fabricator_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:electric_fabricator_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:electric_fabricator_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:electric_fabricator_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:electric_fabricator_on", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_furnace.json b/src/main/resources/assets/electricadvantage/blockstates/electric_furnace.json deleted file mode 100644 index 13cf5b5..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_furnace.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:electric_furnace_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:electric_furnace_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:electric_furnace_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:electric_furnace_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:electric_furnace_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:electric_furnace_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:electric_furnace_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:electric_furnace_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:electric_furnace_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:electric_furnace_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:electric_furnace_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:electric_furnace_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:electric_furnace_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:electric_furnace_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:electric_furnace_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:electric_furnace_on", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_oven.json b/src/main/resources/assets/electricadvantage/blockstates/electric_oven.json deleted file mode 100644 index d084fc3..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_oven.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:electric_oven_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:electric_oven_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:electric_oven_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:electric_oven_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:electric_oven_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:electric_oven_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:electric_oven_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:electric_oven_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:electric_oven_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:electric_oven_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:electric_oven_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:electric_oven_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:electric_oven_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:electric_oven_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:electric_oven_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:electric_oven_on", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_pcb_printer.json b/src/main/resources/assets/electricadvantage/blockstates/electric_pcb_printer.json deleted file mode 100644 index 63c4448..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_pcb_printer.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:electric_pcb_printer_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:electric_pcb_printer_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:electric_pcb_printer_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:electric_pcb_printer_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:electric_pcb_printer_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:electric_pcb_printer_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:electric_pcb_printer_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:electric_pcb_printer_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:electric_pcb_printer_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:electric_pcb_printer_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:electric_pcb_printer_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:electric_pcb_printer_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:electric_pcb_printer_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:electric_pcb_printer_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:electric_pcb_printer_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:electric_pcb_printer_on", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_pump.json b/src/main/resources/assets/electricadvantage/blockstates/electric_pump.json deleted file mode 100644 index a9b2b80..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_pump.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:electric_pump_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:electric_pump_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:electric_pump_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:electric_pump_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:electric_pump_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:electric_pump_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:electric_pump_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:electric_pump_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:electric_pump_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:electric_pump_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:electric_pump_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:electric_pump_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:electric_pump_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:electric_pump_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:electric_pump_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:electric_pump_on", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_still.json b/src/main/resources/assets/electricadvantage/blockstates/electric_still.json deleted file mode 100644 index 78121b3..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_still.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:electric_still_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:electric_still_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:electric_still_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:electric_still_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:electric_still_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:electric_still_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:electric_still_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:electric_still_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:electric_still_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:electric_still_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:electric_still_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:electric_still_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:electric_still_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:electric_still_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:electric_still_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:electric_still_on", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_switch.json b/src/main/resources/assets/electricadvantage/blockstates/electric_switch.json deleted file mode 100644 index 321a2e9..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_switch.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "variants": { - "active=false": { "model": "electricadvantage:electric_switch_off"}, - "active=true": { "model": "electricadvantage:electric_switch_on"} - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/electric_track.json b/src/main/resources/assets/electricadvantage/blockstates/electric_track.json deleted file mode 100644 index d233151..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/electric_track.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "__comment": "blockstate parameters MUST be in alphabetical order!", - "variants": { - "down=false,east=false,north=false,south=false,up=false,west=false": { "model": "electricadvantage:electric_track_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=false,west=false": { "model": "electricadvantage:electric_track_n", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=false,west=false": { "model": "electricadvantage:electric_track_n", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=false,west=false": { "model": "electricadvantage:electric_track_n", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=false,west=false": { "model": "electricadvantage:electric_track_n", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=true,west=false": { "model": "electricadvantage:electric_track_n", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=false,west=true": { "model": "electricadvantage:electric_track_n", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=false,west=false": { "model": "electricadvantage:electric_track_nw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=false,west=false": { "model": "electricadvantage:electric_track_nw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=false,west=false": { "model": "electricadvantage:electric_track_nw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=true,west=false": { "model": "electricadvantage:electric_track_ns", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=false,west=true": { "model": "electricadvantage:electric_track_nw", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=false,west=false": { "model": "electricadvantage:electric_track_nw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=false,west=false": { "model": "electricadvantage:electric_track_nw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=true,west=false": { "model": "electricadvantage:electric_track_nw", "x": 270, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=false,west=true": { "model": "electricadvantage:electric_track_ns", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=false,west=false": { "model": "electricadvantage:electric_track_ns", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=true,west=false": { "model": "electricadvantage:electric_track_nw", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=false,west=true": { "model": "electricadvantage:electric_track_nw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=true,west=false": { "model": "electricadvantage:electric_track_nw", "x": 270, "y": 270, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=false,west=true": { "model": "electricadvantage:electric_track_nw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,north=false,south=false,up=true,west=true": { "model": "electricadvantage:electric_track_nw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=false,west=false": { "model": "electricadvantage:electric_track_nuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=false,west=false": { "model": "electricadvantage:electric_track_nuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=true,west=false": { "model": "electricadvantage:electric_track_dnu", "x": 0, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=false,west=true": { "model": "electricadvantage:electric_track_dnu", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=false,west=false": { "model": "electricadvantage:electric_track_dnu", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=true,west=false": { "model": "electricadvantage:electric_track_dnu", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=false,west=true": { "model": "electricadvantage:electric_track_nuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=true,west=false": { "model": "electricadvantage:electric_track_dnu", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=false,west=true": { "model": "electricadvantage:electric_track_nuw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,north=false,south=false,up=true,west=true": { "model": "electricadvantage:electric_track_dnu", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=false,west=false": { "model": "electricadvantage:electric_track_nsw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=true,west=false": { "model": "electricadvantage:electric_track_nuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=false,west=true": { "model": "electricadvantage:electric_track_nsw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=true,west=false": { "model": "electricadvantage:electric_track_nuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=false,west=true": { "model": "electricadvantage:electric_track_nsw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,north=false,south=false,up=true,west=true": { "model": "electricadvantage:electric_track_dnu", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=true,west=false": { "model": "electricadvantage:electric_track_dnu", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=false,west=true": { "model": "electricadvantage:electric_track_nsw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=true,south=false,up=true,west=true": { "model": "electricadvantage:electric_track_nuw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,north=false,south=true,up=true,west=true": { "model": "electricadvantage:electric_track_nuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=false,west=false": { "model": "electricadvantage:electric_track_nsuw", "x": 180, "y": 180, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=true,west=false": { "model": "electricadvantage:electric_track_nsuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=false,west=true": { "model": "electricadvantage:electric_track_nsuw", "x": 180, "y": 90, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=true,west=false": { "model": "electricadvantage:electric_track_nsuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=false,west=true": { "model": "electricadvantage:electric_track_nsuw", "x": 180, "y": 270, "uvlock": false }, - "down=true,east=true,north=false,south=false,up=true,west=true": { "model": "electricadvantage:electric_track_ensw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=true,west=false": { "model": "electricadvantage:electric_track_ensw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=false,west=true": { "model": "electricadvantage:electric_track_nsuw", "x": 180, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=false,up=true,west=true": { "model": "electricadvantage:electric_track_nsuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,north=false,south=true,up=true,west=true": { "model": "electricadvantage:electric_track_nsuw", "x": 90, "y": 270, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=true,west=false": { "model": "electricadvantage:electric_track_nsuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=false,west=true": { "model": "electricadvantage:electric_track_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=true,north=true,south=false,up=true,west=true": { "model": "electricadvantage:electric_track_nsuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=false,south=true,up=true,west=true": { "model": "electricadvantage:electric_track_nsuw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,north=true,south=true,up=true,west=true": { "model": "electricadvantage:electric_track_nsuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=true,west=false": { "model": "electricadvantage:electric_track_desuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=false,west=true": { "model": "electricadvantage:electric_track_desuw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=false,up=true,west=true": { "model": "electricadvantage:electric_track_desuw", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=true,north=false,south=true,up=true,west=true": { "model": "electricadvantage:electric_track_desuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,north=true,south=true,up=true,west=true": { "model": "electricadvantage:electric_track_desuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,north=true,south=true,up=true,west=true": { "model": "electricadvantage:electric_track_desuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=true,north=true,south=true,up=true,west=true": { "model": "electricadvantage:electric_track_densuw", "x": 0, "y": 0, "uvlock": false } - - } -} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/blockstates/geothermal_generator.json b/src/main/resources/assets/electricadvantage/blockstates/geothermal_generator.json deleted file mode 100644 index ef7db1a..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/geothermal_generator.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "active=true,facing=east": { "model": "electricadvantage:geothermal_generator", "y": 90 }, - "active=true,facing=north": { "model": "electricadvantage:geothermal_generator" }, - "active=true,facing=south": { "model": "electricadvantage:geothermal_generator", "y": 180 }, - "active=true,facing=west": { "model": "electricadvantage:geothermal_generator", "y": 270 }, - "active=false,facing=east": { "model": "electricadvantage:geothermal_generator", "y": 90 }, - "active=false,facing=north": { "model": "electricadvantage:geothermal_generator" }, - "active=false,facing=south": { "model": "electricadvantage:geothermal_generator", "y": 180 }, - "active=false,facing=west": { "model": "electricadvantage:geothermal_generator", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/growth_chamber.json b/src/main/resources/assets/electricadvantage/blockstates/growth_chamber.json deleted file mode 100644 index 676a59b..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/growth_chamber.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:growth_chamber_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:growth_chamber_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:growth_chamber_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:growth_chamber_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:growth_chamber_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:growth_chamber_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:growth_chamber_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:growth_chamber_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:growth_chamber_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:growth_chamber_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:growth_chamber_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:growth_chamber_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:growth_chamber_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:growth_chamber_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:growth_chamber_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:growth_chamber_on", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/growth_chamber_controller.json b/src/main/resources/assets/electricadvantage/blockstates/growth_chamber_controller.json deleted file mode 100644 index 39e4d21..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/growth_chamber_controller.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=east": { "model": "electricadvantage:growth_chamber_controller", "y": 90 }, - "facing=north": { "model": "electricadvantage:growth_chamber_controller" }, - "facing=south": { "model": "electricadvantage:growth_chamber_controller", "y": 180 }, - "facing=west": { "model": "electricadvantage:growth_chamber_controller", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/hydroelectric_generator.json b/src/main/resources/assets/electricadvantage/blockstates/hydroelectric_generator.json deleted file mode 100644 index af7dee5..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/hydroelectric_generator.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "active=true,facing=east": { "model": "electricadvantage:hydroelectric_generator_on", "y": 90 }, - "active=true,facing=north": { "model": "electricadvantage:hydroelectric_generator_on" }, - "active=true,facing=south": { "model": "electricadvantage:hydroelectric_generator_on", "y": 180 }, - "active=true,facing=west": { "model": "electricadvantage:hydroelectric_generator_on", "y": 270 }, - "active=false,facing=east": { "model": "electricadvantage:hydroelectric_generator_off", "y": 90 }, - "active=false,facing=north": { "model": "electricadvantage:hydroelectric_generator_off" }, - "active=false,facing=south": { "model": "electricadvantage:hydroelectric_generator_off", "y": 180 }, - "active=false,facing=west": { "model": "electricadvantage:hydroelectric_generator_off", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/laser_turret.json b/src/main/resources/assets/electricadvantage/blockstates/laser_turret.json deleted file mode 100644 index 2ef9b07..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/laser_turret.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:laser_turret", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:laser_turret" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:laser_turret", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:laser_turret", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:laser_turret", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:laser_turret" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:laser_turret", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:laser_turret", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:laser_turret", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:laser_turret" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:laser_turret", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:laser_turret", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:laser_turret", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:laser_turret" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:laser_turret", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:laser_turret", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/laser_turret_evil.json b/src/main/resources/assets/electricadvantage/blockstates/laser_turret_evil.json deleted file mode 100644 index 2ef9b07..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/laser_turret_evil.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:laser_turret", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:laser_turret" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:laser_turret", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:laser_turret", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:laser_turret", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:laser_turret" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:laser_turret", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:laser_turret", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:laser_turret", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:laser_turret" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:laser_turret", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:laser_turret", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:laser_turret", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:laser_turret" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:laser_turret", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:laser_turret", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/led_bar.json b/src/main/resources/assets/electricadvantage/blockstates/led_bar.json deleted file mode 100644 index 2d13c59..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/led_bar.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "__comment": "blockstate parameters MUST be in alphabetical order!", - "variants": { - "down=false,east=false,lit=false,north=false,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_off_n", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=false,north=false,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_off_n", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,lit=false,north=false,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_off_n", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,lit=false,north=true,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_off_n", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,lit=false,north=false,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_off_n", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=false,lit=false,north=false,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_off_n", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,lit=false,north=false,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_off_n", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,lit=false,north=false,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_off_nw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=false,lit=false,north=true,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_off_nw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,lit=false,north=false,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_off_nw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,lit=false,north=false,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_off_ns", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=false,north=false,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_off_nw", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,lit=false,north=true,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_off_nw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,lit=false,north=false,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_off_nw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,lit=false,north=false,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_off_nw", "x": 270, "y": 180, "uvlock": false }, - "down=false,east=true,lit=false,north=false,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_off_ns", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,lit=false,north=true,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_off_ns", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,lit=false,north=true,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_off_nw", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,lit=false,north=true,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_off_nw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,lit=false,north=false,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_off_nw", "x": 270, "y": 270, "uvlock": false }, - "down=false,east=false,lit=false,north=false,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_off_nw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,lit=false,north=false,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_off_nw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,lit=false,north=true,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_off_nuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,lit=false,north=false,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_off_nuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,lit=false,north=false,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_off_dnu", "x": 0, "y": 90, "uvlock": false }, - "down=true,east=true,lit=false,north=false,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_off_dnu", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,lit=false,north=true,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_off_dnu", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=false,north=true,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_off_dnu", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,lit=false,north=true,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_off_nuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=false,north=false,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_off_dnu", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=false,lit=false,north=false,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_off_nuw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,lit=false,north=false,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_off_dnu", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,lit=false,north=true,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_off_nsw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,lit=false,north=true,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_off_nuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,lit=false,north=true,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_off_nsw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,lit=false,north=false,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_off_nuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,lit=false,north=false,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_off_nsw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,lit=false,north=false,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_off_dnu", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,lit=false,north=true,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_off_dnu", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,lit=false,north=true,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_off_nsw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,lit=false,north=true,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_off_nuw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,lit=false,north=false,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_off_nuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,lit=false,north=true,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_off_nsuw", "x": 180, "y": 180, "uvlock": false }, - "down=true,east=true,lit=false,north=true,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_off_nsuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,lit=false,north=true,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_off_nsuw", "x": 180, "y": 90, "uvlock": false }, - "down=true,east=true,lit=false,north=false,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_off_nsuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,lit=false,north=false,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_off_nsuw", "x": 180, "y": 270, "uvlock": false }, - "down=true,east=true,lit=false,north=false,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_off_ensw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=false,north=true,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_off_ensw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,lit=false,north=true,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_off_nsuw", "x": 180, "y": 0, "uvlock": false }, - "down=true,east=false,lit=false,north=true,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_off_nsuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=false,north=false,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_off_nsuw", "x": 90, "y": 270, "uvlock": false }, - "down=false,east=true,lit=false,north=true,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_off_nsuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,lit=false,north=true,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_off_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=true,lit=false,north=true,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_off_nsuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,lit=false,north=false,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_off_nsuw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,lit=false,north=true,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_off_nsuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=true,lit=false,north=true,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_off_desuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,lit=false,north=true,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_off_desuw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,lit=false,north=true,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_off_desuw", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=true,lit=false,north=false,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_off_desuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,lit=false,north=true,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_off_desuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,lit=false,north=true,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_off_desuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=true,lit=false,north=true,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_off_densuw", "x": 0, "y": 0, "uvlock": false }, - - "down=false,east=false,lit=true,north=false,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_on_n", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=true,north=false,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_on_n", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,lit=true,north=false,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_on_n", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,lit=true,north=true,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_on_n", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,lit=true,north=false,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_on_n", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=false,lit=true,north=false,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_on_n", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,lit=true,north=false,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_on_n", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,lit=true,north=false,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_on_nw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=false,lit=true,north=true,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_on_nw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,lit=true,north=false,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_on_nw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,lit=true,north=false,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_on_ns", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=true,north=false,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_on_nw", "x": 90, "y": 0, "uvlock": false }, - "down=false,east=true,lit=true,north=true,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_on_nw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,lit=true,north=false,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_on_nw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,lit=true,north=false,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_on_nw", "x": 270, "y": 180, "uvlock": false }, - "down=false,east=true,lit=true,north=false,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_on_ns", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=false,lit=true,north=true,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_on_ns", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,lit=true,north=true,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_on_nw", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,lit=true,north=true,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_on_nw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,lit=true,north=false,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_on_nw", "x": 270, "y": 270, "uvlock": false }, - "down=false,east=false,lit=true,north=false,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_on_nw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,lit=true,north=false,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_on_nw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,lit=true,north=true,south=false,up=false,west=false": { "model": "electricadvantage:led_bar_on_nuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,lit=true,north=false,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_on_nuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,lit=true,north=false,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_on_dnu", "x": 0, "y": 90, "uvlock": false }, - "down=true,east=true,lit=true,north=false,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_on_dnu", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,lit=true,north=true,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_on_dnu", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=true,north=true,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_on_dnu", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,lit=true,north=true,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_on_nuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=true,north=false,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_on_dnu", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=false,lit=true,north=false,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_on_nuw", "x": 90, "y": 270, "uvlock": false }, - "down=true,east=false,lit=true,north=false,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_on_dnu", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,lit=true,north=true,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_on_nsw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,lit=true,north=true,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_on_nuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,lit=true,north=true,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_on_nsw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,lit=true,north=false,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_on_nuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,lit=true,north=false,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_on_nsw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=true,lit=true,north=false,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_on_dnu", "x": 270, "y": 90, "uvlock": false }, - "down=false,east=false,lit=true,north=true,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_on_dnu", "x": 270, "y": 0, "uvlock": false }, - "down=false,east=false,lit=true,north=true,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_on_nsw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,lit=true,north=true,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_on_nuw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=false,lit=true,north=false,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_on_nuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,lit=true,north=true,south=true,up=false,west=false": { "model": "electricadvantage:led_bar_on_nsuw", "x": 180, "y": 180, "uvlock": false }, - "down=true,east=true,lit=true,north=true,south=false,up=true,west=false": { "model": "electricadvantage:led_bar_on_nsuw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=true,lit=true,north=true,south=false,up=false,west=true": { "model": "electricadvantage:led_bar_on_nsuw", "x": 180, "y": 90, "uvlock": false }, - "down=true,east=true,lit=true,north=false,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_on_nsuw", "x": 90, "y": 180, "uvlock": false }, - "down=true,east=true,lit=true,north=false,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_on_nsuw", "x": 180, "y": 270, "uvlock": false }, - "down=true,east=true,lit=true,north=false,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_on_ensw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=true,north=true,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_on_ensw", "x": 90, "y": 90, "uvlock": false }, - "down=true,east=false,lit=true,north=true,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_on_nsuw", "x": 180, "y": 0, "uvlock": false }, - "down=true,east=false,lit=true,north=true,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_on_nsuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=false,lit=true,north=false,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_on_nsuw", "x": 90, "y": 270, "uvlock": false }, - "down=false,east=true,lit=true,north=true,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_on_nsuw", "x": 0, "y": 180, "uvlock": false }, - "down=false,east=true,lit=true,north=true,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_on_ensw", "x": 0, "y": 0, "uvlock": false }, - "down=false,east=true,lit=true,north=true,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_on_nsuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,lit=true,north=false,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_on_nsuw", "x": 0, "y": 270, "uvlock": false }, - "down=false,east=false,lit=true,north=true,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_on_nsuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=true,lit=true,north=true,south=true,up=true,west=false": { "model": "electricadvantage:led_bar_on_desuw", "x": 0, "y": 270, "uvlock": false }, - "down=true,east=true,lit=true,north=true,south=true,up=false,west=true": { "model": "electricadvantage:led_bar_on_desuw", "x": 270, "y": 0, "uvlock": false }, - "down=true,east=true,lit=true,north=true,south=false,up=true,west=true": { "model": "electricadvantage:led_bar_on_desuw", "x": 0, "y": 180, "uvlock": false }, - "down=true,east=true,lit=true,north=false,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_on_desuw", "x": 0, "y": 0, "uvlock": false }, - "down=true,east=false,lit=true,north=true,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_on_desuw", "x": 0, "y": 90, "uvlock": false }, - "down=false,east=true,lit=true,north=true,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_on_desuw", "x": 90, "y": 0, "uvlock": false }, - "down=true,east=true,lit=true,north=true,south=true,up=true,west=true": { "model": "electricadvantage:led_bar_on_densuw", "x": 0, "y": 0, "uvlock": false } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/blockstates/li_ore.json b/src/main/resources/assets/electricadvantage/blockstates/li_ore.json deleted file mode 100644 index a47608f..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/li_ore.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "electricadvantage:li_ore" } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/photovoltaic_generator.json b/src/main/resources/assets/electricadvantage/blockstates/photovoltaic_generator.json deleted file mode 100644 index 78fbb88..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/photovoltaic_generator.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "active=true,facing=east": { "model": "electricadvantage:photovoltaic_generator", "y": 90 }, - "active=true,facing=north": { "model": "electricadvantage:photovoltaic_generator" }, - "active=true,facing=south": { "model": "electricadvantage:photovoltaic_generator", "y": 180 }, - "active=true,facing=west": { "model": "electricadvantage:photovoltaic_generator", "y": 270 }, - "active=false,facing=east": { "model": "electricadvantage:photovoltaic_generator", "y": 90 }, - "active=false,facing=north": { "model": "electricadvantage:photovoltaic_generator" }, - "active=false,facing=south": { "model": "electricadvantage:photovoltaic_generator", "y": 180 }, - "active=false,facing=west": { "model": "electricadvantage:photovoltaic_generator", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/plastic_refinery.json b/src/main/resources/assets/electricadvantage/blockstates/plastic_refinery.json deleted file mode 100644 index 049b48a..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/plastic_refinery.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "active=true,facing=east,powered=true": { "model": "electricadvantage:plastic_refinery_on", "y": 90 }, - "active=true,facing=north,powered=true": { "model": "electricadvantage:plastic_refinery_on" }, - "active=true,facing=south,powered=true": { "model": "electricadvantage:plastic_refinery_on", "y": 180 }, - "active=true,facing=west,powered=true": { "model": "electricadvantage:plastic_refinery_on", "y": 270 }, - "active=false,facing=east,powered=true": { "model": "electricadvantage:plastic_refinery_powered", "y": 90 }, - "active=false,facing=north,powered=true": { "model": "electricadvantage:plastic_refinery_powered" }, - "active=false,facing=south,powered=true": { "model": "electricadvantage:plastic_refinery_powered", "y": 180 }, - "active=false,facing=west,powered=true": { "model": "electricadvantage:plastic_refinery_powered", "y": 270 }, - "active=false,facing=east,powered=false": { "model": "electricadvantage:plastic_refinery_off", "y": 90 }, - "active=false,facing=north,powered=false": { "model": "electricadvantage:plastic_refinery_off" }, - "active=false,facing=south,powered=false": { "model": "electricadvantage:plastic_refinery_off", "y": 180 }, - "active=false,facing=west,powered=false": { "model": "electricadvantage:plastic_refinery_off", "y": 270 }, - "active=true,facing=east,powered=false": { "model": "electricadvantage:plastic_refinery_on", "y": 90 }, - "active=true,facing=north,powered=false": { "model": "electricadvantage:plastic_refinery_on" }, - "active=true,facing=south,powered=false": { "model": "electricadvantage:plastic_refinery_on", "y": 180 }, - "active=true,facing=west,powered=false": { "model": "electricadvantage:plastic_refinery_on", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/pump_pipe_electric.json b/src/main/resources/assets/electricadvantage/blockstates/pump_pipe_electric.json deleted file mode 100644 index ee18552..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/pump_pipe_electric.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": {"model": "poweradvantage:fluid_pipe_ns", "x": 90, "y": 0, "uvlock": false } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/steam_powered_generator.json b/src/main/resources/assets/electricadvantage/blockstates/steam_powered_generator.json deleted file mode 100644 index 3bccce9..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/steam_powered_generator.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "active=true,facing=east": { "model": "electricadvantage:steam_powered_generator_on", "y": 90 }, - "active=true,facing=north": { "model": "electricadvantage:steam_powered_generator_on" }, - "active=true,facing=south": { "model": "electricadvantage:steam_powered_generator_on", "y": 180 }, - "active=true,facing=west": { "model": "electricadvantage:steam_powered_generator_on", "y": 270 }, - "active=false,facing=east": { "model": "electricadvantage:steam_powered_generator_off", "y": 90 }, - "active=false,facing=north": { "model": "electricadvantage:steam_powered_generator_off" }, - "active=false,facing=south": { "model": "electricadvantage:steam_powered_generator_off", "y": 180 }, - "active=false,facing=west": { "model": "electricadvantage:steam_powered_generator_off", "y": 270 } - } -} diff --git a/src/main/resources/assets/electricadvantage/blockstates/sulfur_ore.json b/src/main/resources/assets/electricadvantage/blockstates/sulfur_ore.json deleted file mode 100644 index 424b8a2..0000000 --- a/src/main/resources/assets/electricadvantage/blockstates/sulfur_ore.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "normal": { "model": "electricadvantage:sulfur_ore" } - } -} diff --git a/src/main/resources/assets/electricadvantage/lang/de_de.lang b/src/main/resources/assets/electricadvantage/lang/de_de.lang deleted file mode 100644 index 6ccb63d..0000000 --- a/src/main/resources/assets/electricadvantage/lang/de_de.lang +++ /dev/null @@ -1,54 +0,0 @@ -language_support_goals=Englisch (en_US, de_DE, en_CA, de_DE, en_AU, en_PT), Spanisch (es_MX, es_ES), Chinesisch (zh_CN), Japanisch (ja_JA), Portugiesisch (pt_BR), Deutsch (de_DE), Italienisch (it_IT), Koreanisch (ko_KR) - -item.electricadvantage.blank_circuit_board.name=Leiterplatte (Leer) -item.electricadvantage.control_circuit.name=Steuerstromkreis -item.electricadvantage.integrated_circuit.name=Mikrochip -item.electricadvantage.psu.name=Netzteil -item.electricadvantage.silicon_ingot.name=Silizium-Ingots -item.electricadvantage.silicon_mix.name=Silizium-Mischung -item.electricadvantage.solder_mix.name=Lötmetall Mischung -item.electricadvantage.solder.name=Lötmetall -item.electricadvantage.li_powder.name=Pulverisierte Lithium -item.electricadvantage.li_ingot.name=Lithium-Barren -item.electricadvantage.li_nugget.name=Lithium Nugget -item.electricadvantage.sulfur_powder.name=Schwefelpulver -item.electricadvantage.lead_acid_battery.name=Blei-Säure-Batterie -item.electricadvantage.nickel_hydride_battery.name=Nickel-Metallhydrid-Batterie -item.electricadvantage.alkaline_battery.name=Alkali-Batterie -item.electricadvantage.lithium_battery.name=Lithium-Ionen-Batterie - -tile.electricadvantage.electric_conduit.name=Elektrischen Draht -tile.electricadvantage.electric_track.name=Elektro-Gerüst -tile.electricadvantage.electric_battery_array.name=Batterie Array -tile.electricadvantage.electric_crusher.name=Elektrische Felsen-Zerkleinerungsmaschine -tile.electricadvantage.laser_turret.name=Laser-Verteidigung Waffe -tile.electricadvantage.electric_drill.name=Laser Bohrer -tile.electricadvantage.electric_fabricator.name=Automatisierte Fabrik -tile.electricadvantage.electric_furnace.name=Lichtbogenofen -tile.electricadvantage.electric_oven.name=Elektro-Ofen -tile.electricadvantage.electric_pcb_printer.name=PCB Drucker -tile.electricadvantage.geothermal_generator.name=Geothermal Generator -tile.electricadvantage.hydroelectric_generator.name=Hydroelectric Generator -tile.electricadvantage.photovoltaic_generator.name=Photovoltaik-Generator -tile.electricadvantage.steam_powered_generator.name=Pumpenlose Stromerzeuger -tile.electricadvantage.growth_chamber.name=Wachstumskammer -tile.electricadvantage.growth_chamber_controller.name=Wachstumskammer Steuereinheit -tile.electricadvantage.li_ore.name=Lithiumerz -tile.electricadvantage.sulfur_ore.name=Schwefelerz -tile.electricadvantage.led_bar.name=LED Draht - -tooltip.battery.charge=Lade -tooltip.battery.capacity=Kapazität - -death.attack.laser=%1$s verdampft -death.attack.laser.player=%2$s verdampft %1$s -death.attack.propeller=%1$s wurde von einem Propeller pulverisiert. -death.attack.propeller.player=%2$s geschoben %1$s in einen Propeller. - - -tile.electricadvantage.electric_switch.name=Elektrische Schalter -tile.electricadvantage.electric_still.name=Elektro Brennerei -tile.electricadvantage.electric_pump.name=Elektropumpe -tile.electricadvantage.plastic_refinery.name=Kunststoff-Raffinerie -item.electricadvantage.petrolplastic_ingot.name=Erdöl Kunststoff Barren -tile.electricadvantage.pump_pipe_electric.name=Pumpenrohr diff --git a/src/main/resources/assets/electricadvantage/lang/en_au.lang b/src/main/resources/assets/electricadvantage/lang/en_au.lang deleted file mode 100644 index e300e57..0000000 --- a/src/main/resources/assets/electricadvantage/lang/en_au.lang +++ /dev/null @@ -1,54 +0,0 @@ -language_support_goals=english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR) - -item.electricadvantage.blank_circuit_board.name=Circuit Board (Blank) -item.electricadvantage.control_circuit.name=Control Circuit -item.electricadvantage.integrated_circuit.name=Microchip -item.electricadvantage.psu.name=Power Supply Unit -item.electricadvantage.silicon_ingot.name=Silicon Ingot -item.electricadvantage.silicon_mix.name=Silicon Blend -item.electricadvantage.solder_mix.name=Solder Blend -item.electricadvantage.solder.name=Solder -item.electricadvantage.li_powder.name=Powdered Lithium -item.electricadvantage.li_ingot.name=Lithium Ingot -item.electricadvantage.li_nugget.name=Lithium Nugget -item.electricadvantage.sulfur_powder.name=Powdered Sulfur -item.electricadvantage.lead_acid_battery.name=Lead-Acid Battery -item.electricadvantage.nickel_hydride_battery.name=Nickel-Metal Hydride Battery -item.electricadvantage.alkaline_battery.name=Alkaline Battery -item.electricadvantage.lithium_battery.name=Lithium-Ion Battery - -tile.electricadvantage.electric_conduit.name=Electric Power Cable -tile.electricadvantage.electric_track.name=Electric Scaffold -tile.electricadvantage.electric_battery_array.name=Battery Array -tile.electricadvantage.electric_crusher.name=Electric Rock Crusher -tile.electricadvantage.laser_turret.name=Laser Defense Turret -tile.electricadvantage.electric_drill.name=Electric Mining Drill -tile.electricadvantage.electric_fabricator.name=Automated Assembler -tile.electricadvantage.electric_furnace.name=Electric Arc Furnace -tile.electricadvantage.electric_oven.name=Electric Oven -tile.electricadvantage.electric_pcb_printer.name=PCB Printer -tile.electricadvantage.geothermal_generator.name=Geothermal Generator -tile.electricadvantage.hydroelectric_generator.name=Hydroelectric Generator -tile.electricadvantage.photovoltaic_generator.name=Photovoltaic Generator -tile.electricadvantage.steam_powered_generator.name=Steam-Powered Electric Generator -tile.electricadvantage.growth_chamber.name=Growth Chamber -tile.electricadvantage.growth_chamber_controller.name=Growth Chamber Control Unit -tile.electricadvantage.li_ore.name=Lithium Ore -tile.electricadvantage.sulfur_ore.name=Sulfur Ore -tile.electricadvantage.led_bar.name=LED Bar - -tooltip.battery.charge=Charge -tooltip.battery.capacity=Capacity - -death.attack.laser=%1$s vaporized -death.attack.laser.player=%2$s vaporized %1$s -death.attack.propeller=%1$s was pulverized by a propeller. -death.attack.propeller.player=%2$s pushed %1$s into a propeller. - - -tile.electricadvantage.electric_switch.name=Electric Switch -tile.electricadvantage.electric_still.name=Electric Distiller -tile.electricadvantage.electric_pump.name=Electric Pump -tile.electricadvantage.plastic_refinery.name=Petro-Plastic Refinery -item.electricadvantage.petrolplastic_ingot.name=Petro-Plastic Ingot -tile.electricadvantage.pump_pipe_electric.name=Pump Pipe diff --git a/src/main/resources/assets/electricadvantage/lang/en_ca.lang b/src/main/resources/assets/electricadvantage/lang/en_ca.lang deleted file mode 100644 index e300e57..0000000 --- a/src/main/resources/assets/electricadvantage/lang/en_ca.lang +++ /dev/null @@ -1,54 +0,0 @@ -language_support_goals=english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR) - -item.electricadvantage.blank_circuit_board.name=Circuit Board (Blank) -item.electricadvantage.control_circuit.name=Control Circuit -item.electricadvantage.integrated_circuit.name=Microchip -item.electricadvantage.psu.name=Power Supply Unit -item.electricadvantage.silicon_ingot.name=Silicon Ingot -item.electricadvantage.silicon_mix.name=Silicon Blend -item.electricadvantage.solder_mix.name=Solder Blend -item.electricadvantage.solder.name=Solder -item.electricadvantage.li_powder.name=Powdered Lithium -item.electricadvantage.li_ingot.name=Lithium Ingot -item.electricadvantage.li_nugget.name=Lithium Nugget -item.electricadvantage.sulfur_powder.name=Powdered Sulfur -item.electricadvantage.lead_acid_battery.name=Lead-Acid Battery -item.electricadvantage.nickel_hydride_battery.name=Nickel-Metal Hydride Battery -item.electricadvantage.alkaline_battery.name=Alkaline Battery -item.electricadvantage.lithium_battery.name=Lithium-Ion Battery - -tile.electricadvantage.electric_conduit.name=Electric Power Cable -tile.electricadvantage.electric_track.name=Electric Scaffold -tile.electricadvantage.electric_battery_array.name=Battery Array -tile.electricadvantage.electric_crusher.name=Electric Rock Crusher -tile.electricadvantage.laser_turret.name=Laser Defense Turret -tile.electricadvantage.electric_drill.name=Electric Mining Drill -tile.electricadvantage.electric_fabricator.name=Automated Assembler -tile.electricadvantage.electric_furnace.name=Electric Arc Furnace -tile.electricadvantage.electric_oven.name=Electric Oven -tile.electricadvantage.electric_pcb_printer.name=PCB Printer -tile.electricadvantage.geothermal_generator.name=Geothermal Generator -tile.electricadvantage.hydroelectric_generator.name=Hydroelectric Generator -tile.electricadvantage.photovoltaic_generator.name=Photovoltaic Generator -tile.electricadvantage.steam_powered_generator.name=Steam-Powered Electric Generator -tile.electricadvantage.growth_chamber.name=Growth Chamber -tile.electricadvantage.growth_chamber_controller.name=Growth Chamber Control Unit -tile.electricadvantage.li_ore.name=Lithium Ore -tile.electricadvantage.sulfur_ore.name=Sulfur Ore -tile.electricadvantage.led_bar.name=LED Bar - -tooltip.battery.charge=Charge -tooltip.battery.capacity=Capacity - -death.attack.laser=%1$s vaporized -death.attack.laser.player=%2$s vaporized %1$s -death.attack.propeller=%1$s was pulverized by a propeller. -death.attack.propeller.player=%2$s pushed %1$s into a propeller. - - -tile.electricadvantage.electric_switch.name=Electric Switch -tile.electricadvantage.electric_still.name=Electric Distiller -tile.electricadvantage.electric_pump.name=Electric Pump -tile.electricadvantage.plastic_refinery.name=Petro-Plastic Refinery -item.electricadvantage.petrolplastic_ingot.name=Petro-Plastic Ingot -tile.electricadvantage.pump_pipe_electric.name=Pump Pipe diff --git a/src/main/resources/assets/electricadvantage/lang/en_en.lang b/src/main/resources/assets/electricadvantage/lang/en_en.lang deleted file mode 100644 index 3fde5ab..0000000 --- a/src/main/resources/assets/electricadvantage/lang/en_en.lang +++ /dev/null @@ -1,54 +0,0 @@ -language_support_goals=english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR) - -item.electricadvantage.blank_circuit_board.name=Circuit Board (Blank) -item.electricadvantage.control_circuit.name=Control Circuit -item.electricadvantage.integrated_circuit.name=Microchip -item.electricadvantage.psu.name=Power Supply Unit -item.electricadvantage.silicon_ingot.name=Silicon Ingot -item.electricadvantage.silicon_mix.name=Silicon Blend -item.electricadvantage.solder_mix.name=Solder Blend -item.electricadvantage.solder.name=Solder -item.electricadvantage.li_powder.name=Powdered Lithium -item.electricadvantage.li_ingot.name=Lithium Ingot -item.electricadvantage.li_nugget.name=Lithium Nugget -item.electricadvantage.sulfur_powder.name=Powdered Sulfur -item.electricadvantage.lead_acid_battery.name=Lead-Acid Battery -item.electricadvantage.nickel_hydride_battery.name=Nickel-Metal Hydride Battery -item.electricadvantage.alkaline_battery.name=Alkaline Battery -item.electricadvantage.lithium_battery.name=Lithium-Ion Battery - -tile.electricadvantage.electric_conduit.name=Electric Power Cable -tile.electricadvantage.electric_track.name=Electric Scaffold -tile.electricadvantage.electric_battery_array.name=Battery Array -tile.electricadvantage.electric_crusher.name=Electric Rock Crusher -tile.electricadvantage.laser_turret.name=Laser Turret -tile.electricadvantage.electric_drill.name=Electric Mining Drill -tile.electricadvantage.electric_fabricator.name=Automated Assembler -tile.electricadvantage.electric_furnace.name=Electric Arc Furnace -tile.electricadvantage.electric_oven.name=Electric Oven -tile.electricadvantage.electric_pcb_printer.name=PCB Printer -tile.electricadvantage.geothermal_generator.name=Geothermal Generator -tile.electricadvantage.hydroelectric_generator.name=Hydroelectric Generator -tile.electricadvantage.photovoltaic_generator.name=Photovoltaic Generator -tile.electricadvantage.steam_powered_generator.name=Steam-Powered Electric Generator -tile.electricadvantage.growth_chamber.name=Growth Chamber -tile.electricadvantage.growth_chamber_controller.name=Growth Chamber Control Unit -tile.electricadvantage.li_ore.name=Lithium Ore -tile.electricadvantage.sulfur_ore.name=Sulfur Ore -tile.electricadvantage.led_bar.name=LED Bar - -tooltip.battery.charge=Charge -tooltip.battery.capacity=Capacity - -death.attack.laser=%1$s vaporized -death.attack.laser.player=%2$s vaporized %1$s -death.attack.propeller=%1$s was pulverized by a propeller. -death.attack.propeller.player=%2$s pushed %1$s into a propeller. - - -tile.electricadvantage.electric_switch.name=Electric Switch -tile.electricadvantage.electric_still.name=Electric Distiller -tile.electricadvantage.electric_pump.name=Electric Pump -tile.electricadvantage.plastic_refinery.name=Petro-Plastic Refinery -item.electricadvantage.petrolplastic_ingot.name=Petro-Plastic Ingot -tile.electricadvantage.pump_pipe_electric.name=Pump Pipe diff --git a/src/main/resources/assets/electricadvantage/lang/en_gb.lang b/src/main/resources/assets/electricadvantage/lang/en_gb.lang deleted file mode 100644 index e300e57..0000000 --- a/src/main/resources/assets/electricadvantage/lang/en_gb.lang +++ /dev/null @@ -1,54 +0,0 @@ -language_support_goals=english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR) - -item.electricadvantage.blank_circuit_board.name=Circuit Board (Blank) -item.electricadvantage.control_circuit.name=Control Circuit -item.electricadvantage.integrated_circuit.name=Microchip -item.electricadvantage.psu.name=Power Supply Unit -item.electricadvantage.silicon_ingot.name=Silicon Ingot -item.electricadvantage.silicon_mix.name=Silicon Blend -item.electricadvantage.solder_mix.name=Solder Blend -item.electricadvantage.solder.name=Solder -item.electricadvantage.li_powder.name=Powdered Lithium -item.electricadvantage.li_ingot.name=Lithium Ingot -item.electricadvantage.li_nugget.name=Lithium Nugget -item.electricadvantage.sulfur_powder.name=Powdered Sulfur -item.electricadvantage.lead_acid_battery.name=Lead-Acid Battery -item.electricadvantage.nickel_hydride_battery.name=Nickel-Metal Hydride Battery -item.electricadvantage.alkaline_battery.name=Alkaline Battery -item.electricadvantage.lithium_battery.name=Lithium-Ion Battery - -tile.electricadvantage.electric_conduit.name=Electric Power Cable -tile.electricadvantage.electric_track.name=Electric Scaffold -tile.electricadvantage.electric_battery_array.name=Battery Array -tile.electricadvantage.electric_crusher.name=Electric Rock Crusher -tile.electricadvantage.laser_turret.name=Laser Defense Turret -tile.electricadvantage.electric_drill.name=Electric Mining Drill -tile.electricadvantage.electric_fabricator.name=Automated Assembler -tile.electricadvantage.electric_furnace.name=Electric Arc Furnace -tile.electricadvantage.electric_oven.name=Electric Oven -tile.electricadvantage.electric_pcb_printer.name=PCB Printer -tile.electricadvantage.geothermal_generator.name=Geothermal Generator -tile.electricadvantage.hydroelectric_generator.name=Hydroelectric Generator -tile.electricadvantage.photovoltaic_generator.name=Photovoltaic Generator -tile.electricadvantage.steam_powered_generator.name=Steam-Powered Electric Generator -tile.electricadvantage.growth_chamber.name=Growth Chamber -tile.electricadvantage.growth_chamber_controller.name=Growth Chamber Control Unit -tile.electricadvantage.li_ore.name=Lithium Ore -tile.electricadvantage.sulfur_ore.name=Sulfur Ore -tile.electricadvantage.led_bar.name=LED Bar - -tooltip.battery.charge=Charge -tooltip.battery.capacity=Capacity - -death.attack.laser=%1$s vaporized -death.attack.laser.player=%2$s vaporized %1$s -death.attack.propeller=%1$s was pulverized by a propeller. -death.attack.propeller.player=%2$s pushed %1$s into a propeller. - - -tile.electricadvantage.electric_switch.name=Electric Switch -tile.electricadvantage.electric_still.name=Electric Distiller -tile.electricadvantage.electric_pump.name=Electric Pump -tile.electricadvantage.plastic_refinery.name=Petro-Plastic Refinery -item.electricadvantage.petrolplastic_ingot.name=Petro-Plastic Ingot -tile.electricadvantage.pump_pipe_electric.name=Pump Pipe diff --git a/src/main/resources/assets/electricadvantage/lang/en_pt.lang b/src/main/resources/assets/electricadvantage/lang/en_pt.lang deleted file mode 100644 index 3fde5ab..0000000 --- a/src/main/resources/assets/electricadvantage/lang/en_pt.lang +++ /dev/null @@ -1,54 +0,0 @@ -language_support_goals=english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR) - -item.electricadvantage.blank_circuit_board.name=Circuit Board (Blank) -item.electricadvantage.control_circuit.name=Control Circuit -item.electricadvantage.integrated_circuit.name=Microchip -item.electricadvantage.psu.name=Power Supply Unit -item.electricadvantage.silicon_ingot.name=Silicon Ingot -item.electricadvantage.silicon_mix.name=Silicon Blend -item.electricadvantage.solder_mix.name=Solder Blend -item.electricadvantage.solder.name=Solder -item.electricadvantage.li_powder.name=Powdered Lithium -item.electricadvantage.li_ingot.name=Lithium Ingot -item.electricadvantage.li_nugget.name=Lithium Nugget -item.electricadvantage.sulfur_powder.name=Powdered Sulfur -item.electricadvantage.lead_acid_battery.name=Lead-Acid Battery -item.electricadvantage.nickel_hydride_battery.name=Nickel-Metal Hydride Battery -item.electricadvantage.alkaline_battery.name=Alkaline Battery -item.electricadvantage.lithium_battery.name=Lithium-Ion Battery - -tile.electricadvantage.electric_conduit.name=Electric Power Cable -tile.electricadvantage.electric_track.name=Electric Scaffold -tile.electricadvantage.electric_battery_array.name=Battery Array -tile.electricadvantage.electric_crusher.name=Electric Rock Crusher -tile.electricadvantage.laser_turret.name=Laser Turret -tile.electricadvantage.electric_drill.name=Electric Mining Drill -tile.electricadvantage.electric_fabricator.name=Automated Assembler -tile.electricadvantage.electric_furnace.name=Electric Arc Furnace -tile.electricadvantage.electric_oven.name=Electric Oven -tile.electricadvantage.electric_pcb_printer.name=PCB Printer -tile.electricadvantage.geothermal_generator.name=Geothermal Generator -tile.electricadvantage.hydroelectric_generator.name=Hydroelectric Generator -tile.electricadvantage.photovoltaic_generator.name=Photovoltaic Generator -tile.electricadvantage.steam_powered_generator.name=Steam-Powered Electric Generator -tile.electricadvantage.growth_chamber.name=Growth Chamber -tile.electricadvantage.growth_chamber_controller.name=Growth Chamber Control Unit -tile.electricadvantage.li_ore.name=Lithium Ore -tile.electricadvantage.sulfur_ore.name=Sulfur Ore -tile.electricadvantage.led_bar.name=LED Bar - -tooltip.battery.charge=Charge -tooltip.battery.capacity=Capacity - -death.attack.laser=%1$s vaporized -death.attack.laser.player=%2$s vaporized %1$s -death.attack.propeller=%1$s was pulverized by a propeller. -death.attack.propeller.player=%2$s pushed %1$s into a propeller. - - -tile.electricadvantage.electric_switch.name=Electric Switch -tile.electricadvantage.electric_still.name=Electric Distiller -tile.electricadvantage.electric_pump.name=Electric Pump -tile.electricadvantage.plastic_refinery.name=Petro-Plastic Refinery -item.electricadvantage.petrolplastic_ingot.name=Petro-Plastic Ingot -tile.electricadvantage.pump_pipe_electric.name=Pump Pipe diff --git a/src/main/resources/assets/electricadvantage/lang/en_us.lang b/src/main/resources/assets/electricadvantage/lang/en_us.lang deleted file mode 100644 index a96ef0b..0000000 --- a/src/main/resources/assets/electricadvantage/lang/en_us.lang +++ /dev/null @@ -1,54 +0,0 @@ -language_support_goals=english (en_US,en_EN,en_CA,en_GB, en_AU, en_PT), spanish (es_MX,es_ES), chinese (zh_CN), japanese (ja_JA), portugese (pt_BR), german (de_DE), italian (it_IT), korean (ko_KR) - -item.electricadvantage.blank_circuit_board.name=Circuit Board (Blank) -item.electricadvantage.control_circuit.name=Control Circuit -item.electricadvantage.integrated_circuit.name=Microchip -item.electricadvantage.psu.name=Power Supply Unit -item.electricadvantage.silicon_ingot.name=Silicon Ingot -item.electricadvantage.silicon_mix.name=Silicon Blend -item.electricadvantage.solder_mix.name=Solder Blend -item.electricadvantage.solder.name=Solder -item.electricadvantage.li_powder.name=Powdered Lithium -item.electricadvantage.li_ingot.name=Lithium Ingot -item.electricadvantage.li_nugget.name=Lithium Nugget -item.electricadvantage.sulfur_powder.name=Powdered Sulfur -item.electricadvantage.lead_acid_battery.name=Lead-Acid Battery -item.electricadvantage.nickel_hydride_battery.name=Nickel-Metal Hydride Battery -item.electricadvantage.alkaline_battery.name=Alkaline Battery -item.electricadvantage.lithium_battery.name=Lithium-Ion Battery - -tile.electricadvantage.electric_conduit.name=Electric Power Cable -tile.electricadvantage.electric_track.name=Electric Scaffold -tile.electricadvantage.electric_battery_array.name=Battery Array -tile.electricadvantage.electric_crusher.name=Electric Rock Crusher -tile.electricadvantage.laser_turret.name=Laser Turret -tile.electricadvantage.electric_drill.name=Electric Mining Drill -tile.electricadvantage.electric_fabricator.name=Automated Assembler -tile.electricadvantage.electric_furnace.name=Electric Arc Furnace -tile.electricadvantage.electric_oven.name=Electric Oven -tile.electricadvantage.electric_pcb_printer.name=PCB Printer -tile.electricadvantage.geothermal_generator.name=Geothermal Generator -tile.electricadvantage.hydroelectric_generator.name=Hydroelectric Generator -tile.electricadvantage.photovoltaic_generator.name=Photovoltaic Generator -tile.electricadvantage.steam_powered_generator.name=Steam-Powered Electric Generator -tile.electricadvantage.growth_chamber.name=Growth Chamber -tile.electricadvantage.growth_chamber_controller.name=Growth Chamber Control Unit -tile.electricadvantage.li_ore.name=Lithium Ore -tile.electricadvantage.sulfur_ore.name=Sulfur Ore -tile.electricadvantage.led_bar.name=LED Bar - -tooltip.battery.charge=Charge -tooltip.battery.capacity=Capacity - -death.attack.laser=%1$s vaporized -death.attack.laser.player=%2$s vaporized %1$s -death.attack.propeller=%1$s was pulverized by a propeller. -death.attack.propeller.player=%2$s pushed %1$s into a propeller. - -tile.electricadvantage.electric_switch.name=Electric Switch -tile.electricadvantage.electric_still.name=Electric Distiller -tile.electricadvantage.electric_pump.name=Electric Pump -tile.electricadvantage.plastic_refinery.name=Petro-Plastic Refinery -item.electricadvantage.petrolplastic_ingot.name=Petro-Plastic Ingot -tile.electricadvantage.pump_pipe_electric.name=Pump Pipe - diff --git a/src/main/resources/assets/electricadvantage/lang/es_es.lang b/src/main/resources/assets/electricadvantage/lang/es_es.lang deleted file mode 100644 index da6a1c0..0000000 --- a/src/main/resources/assets/electricadvantage/lang/es_es.lang +++ /dev/null @@ -1,55 +0,0 @@ -language_support_goals=Inglés (en_US, en_EN, en_CA, es_ES, es_ES, en_PT), Español (es_MX, es_ES), chino (zh_CN), japonés (ja_JA), portugués (pt_BR), Alemán (de_DE), italiano (it_IT), coreano (ko_KR) - -item.electricadvantage.blank_circuit_board.name=Placa de Circuito (Blanco) -item.electricadvantage.control_circuit.name=Circuito de Computadora -item.electricadvantage.integrated_circuit.name=Microchip -item.electricadvantage.psu.name=Unidad de Fuente de Alimentación -item.electricadvantage.silicon_ingot.name=Silicio Lingote -item.electricadvantage.silicon_mix.name=Blend Silicio -item.electricadvantage.solder_mix.name=Blend Soldadura -item.electricadvantage.solder.name=Soldadura -item.electricadvantage.li_powder.name=Polvo de Litio -item.electricadvantage.li_ingot.name=Litio Lingote -item.electricadvantage.li_nugget.name=Pepita de Litio -item.electricadvantage.sulfur_powder.name=Azufre en Polvo -item.electricadvantage.lead_acid_battery.name=Plomo-Ácido de la Batería -item.electricadvantage.nickel_hydride_battery.name=Níquel e Hidruro Metálico -item.electricadvantage.alkaline_battery.name=Batería Alcalina -item.electricadvantage.lithium_battery.name=Batería de Litio-Ion - -tile.electricadvantage.electric_conduit.name=Cable de Energía Eléctrica -tile.electricadvantage.electric_track.name=Eléctrica Andamios -tile.electricadvantage.electric_battery_array.name=Batería Matriz -tile.electricadvantage.electric_crusher.name=Eléctrica de la Roca Trituradora -tile.electricadvantage.laser_turret.name=Laser Defensa Torreta -tile.electricadvantage.electric_drill.name=Eléctrica Minería Taladro -tile.electricadvantage.electric_fabricator.name=Automatizado Ensamblador -tile.electricadvantage.electric_furnace.name=Horno de Arco Eléctrico -tile.electricadvantage.electric_oven.name=Horno Eléctrico -tile.electricadvantage.electric_pcb_printer.name=PCB Impresora -tile.electricadvantage.geothermal_generator.name=Geotérmica Generador -tile.electricadvantage.hydroelectric_generator.name=Hidroeléctrico Generador -tile.electricadvantage.photovoltaic_generator.name=Fotovoltaica Generador -tile.electricadvantage.steam_powered_generator.name=a Vapor Generador Eléctrico -tile.electricadvantage.growth_chamber.name=Cámara Crecimiento -tile.electricadvantage.growth_chamber_controller.name=Unidad de Control de Crecimiento Cámara -tile.electricadvantage.li_ore.name=Mineral de Litio -tile.electricadvantage.sulfur_ore.name=Mineral de Azufre -tile.electricadvantage.led_bar.name=Luz LED - -tooltip.battery.charge=Carga -tooltip.battery.capacity=Capacidad - -death.attack.laser=%1$s vaporiza -death.attack.laser.player=%2$s vaporizado s%1$s -death.attack.propeller=%1$s se pulverizan por una hélice. -death.attack.propeller.player=%2$s empujaron %1$s en la hélice. - - - -tile.electricadvantage.electric_switch.name=Interruptor Eléctrico -tile.electricadvantage.electric_still.name=Destilador Eléctrico -tile.electricadvantage.electric_pump.name=Bomba Eléctrica -tile.electricadvantage.plastic_refinery.name=Refinería de Plástico -item.electricadvantage.petrolplastic_ingot.name=Petróleo Lingote de Plástico -tile.electricadvantage.pump_pipe_electric.name=Tubería de la Bomba diff --git a/src/main/resources/assets/electricadvantage/lang/es_mx.lang b/src/main/resources/assets/electricadvantage/lang/es_mx.lang deleted file mode 100644 index 186cc6f..0000000 --- a/src/main/resources/assets/electricadvantage/lang/es_mx.lang +++ /dev/null @@ -1,53 +0,0 @@ -language_support_goals=Inglés (en_US, en_EN, en_CA, es_ES, es_ES, en_PT), Español (es_MX, es_ES), chino (zh_CN), japonés (ja_JA), portugués (pt_BR), Alemán (de_DE), italiano (it_IT), coreano (ko_KR) - -item.electricadvantage.blank_circuit_board.name=Placa de Circuito (Blanco) -item.electricadvantage.control_circuit.name=Circuito de Computadora -item.electricadvantage.integrated_circuit.name=Microchip -item.electricadvantage.psu.name=Unidad de Fuente de Alimentación -item.electricadvantage.silicon_ingot.name=Silicio Lingote -item.electricadvantage.silicon_mix.name=Blend Silicio -item.electricadvantage.solder_mix.name=Blend Soldadura -item.electricadvantage.solder.name=Soldadura -item.electricadvantage.li_powder.name=Polvo de Litio -item.electricadvantage.li_ingot.name=Litio Lingote -item.electricadvantage.li_nugget.name=Pepita de Litio -item.electricadvantage.sulfur_powder.name=Azufre en Polvo -item.electricadvantage.lead_acid_battery.name=Plomo-Ácido de la Batería -item.electricadvantage.nickel_hydride_battery.name=Níquel e Hidruro Metálico -item.electricadvantage.alkaline_battery.name=Batería Alcalina -item.electricadvantage.lithium_battery.name=Batería de Litio-Ion - -tile.electricadvantage.electric_conduit.name=Cable de Energía Eléctrica -tile.electricadvantage.electric_track.name=Eléctrica Andamios -tile.electricadvantage.electric_battery_array.name=Batería Matriz -tile.electricadvantage.electric_crusher.name=Eléctrica de la Roca Trituradora -tile.electricadvantage.laser_turret.name=Laser Defensa Torreta -tile.electricadvantage.electric_drill.name=Eléctrica Minería Taladro -tile.electricadvantage.electric_fabricator.name=Automatizado Ensamblador -tile.electricadvantage.electric_furnace.name=Horno de Arco Eléctrico -tile.electricadvantage.electric_oven.name=Horno Eléctrico -tile.electricadvantage.electric_pcb_printer.name=PCB Impresora -tile.electricadvantage.geothermal_generator.name=Geotérmica Generador -tile.electricadvantage.hydroelectric_generator.name=Hidroeléctrico Generador -tile.electricadvantage.photovoltaic_generator.name=Fotovoltaica Generador -tile.electricadvantage.steam_powered_generator.name=a Vapor Generador Eléctrico -tile.electricadvantage.growth_chamber.name=Cámara Crecimiento -tile.electricadvantage.growth_chamber_controller.name=Unidad de Control de Crecimiento Cámara -tile.electricadvantage.li_ore.name=Mineral de Litio -tile.electricadvantage.sulfur_ore.name=Mineral de Azufre -tile.electricadvantage.led_bar.name=Luz LED - -tooltip.battery.charge=Carga -tooltip.battery.capacity=Capacidad - -death.attack.laser=%1$s vaporiza -death.attack.laser.player=%2$s vaporizado s%1$s -death.attack.propeller=%1$s se pulverizan por una hélice. -death.attack.propeller.player=%2$s empujaron %1$s en la hélice. - -tile.electricadvantage.electric_switch.name=Interruptor Eléctrico -tile.electricadvantage.electric_still.name=Destilador Eléctrico -tile.electricadvantage.electric_pump.name=Bomba Eléctrica -tile.electricadvantage.plastic_refinery.name=Refinería de Plástico -item.electricadvantage.petrolplastic_ingot.name=Petróleo Lingote de Plástico -tile.electricadvantage.pump_pipe_electric.name=Tubería de la Bomba diff --git a/src/main/resources/assets/electricadvantage/lang/it_it.lang b/src/main/resources/assets/electricadvantage/lang/it_it.lang deleted file mode 100644 index 7920979..0000000 --- a/src/main/resources/assets/electricadvantage/lang/it_it.lang +++ /dev/null @@ -1,53 +0,0 @@ -language_support_goals=inglese (it, en_EN, en_CA, en_GB, en_AU, en_PT), spagnolo (es_MX, es_ES), cinese (zh_CN), giapponese (ja_JA), portoghese (pt_BR), tedesco (de_DE), italiano (it_IT), coreano (ko_KR) - -item.electricadvantage.blank_circuit_board.name=Scheda di Circuito (Vuoto) -item.electricadvantage.control_circuit.name=Circuito di Controllo -item.electricadvantage.integrated_circuit.name=Microcircuito Integrato -item.electricadvantage.psu.name=Alimentatore -item.electricadvantage.silicon_ingot.name=Silicio Lingotto -item.electricadvantage.silicon_mix.name=Silicio Miscela -item.electricadvantage.solder_mix.name=Saldatura Miscela -item.electricadvantage.solder.name=Saldatura -item.electricadvantage.li_powder.name=Polvere di Litio -item.electricadvantage.li_ingot.name=Litio Lingotto -item.electricadvantage.li_nugget.name=Pepita d'Litio -item.electricadvantage.sulfur_powder.name=Zolfo in Polvere -item.electricadvantage.lead_acid_battery.name=Batteria al Piombo -item.electricadvantage.nickel_hydride_battery.name=Ni-MH batteria -item.electricadvantage.alkaline_battery.name=Batteria Alcalina -item.electricadvantage.lithium_battery.name=Agli Ioni di Litio - -tile.electricadvantage.electric_conduit.name=Cavo Alettrico di Alimentazione -tile.electricadvantage.electric_track.name=Ponteggio Elettrico -tile.electricadvantage.electric_battery_array.name=Array Batteria -tile.electricadvantage.electric_crusher.name=Polverizzatore Masso a Elettrico Alimentata -tile.electricadvantage.laser_turret.name=Laser Difesa Torretta -tile.electricadvantage.electric_drill.name=Trapano Elettrico -tile.electricadvantage.electric_fabricator.name=Fabbrica Automatizzata -tile.electricadvantage.electric_furnace.name=Forno Elettrico ad Arco -tile.electricadvantage.electric_oven.name=Forno Elettrico -tile.electricadvantage.electric_pcb_printer.name=PCB Stampante -tile.electricadvantage.geothermal_generator.name=Geotermica Generatore -tile.electricadvantage.hydroelectric_generator.name=idroelettrica Generatore -tile.electricadvantage.photovoltaic_generator.name=Fotovoltaico Generatore -tile.electricadvantage.steam_powered_generator.name=Generatore Elettrico a Vapore -tile.electricadvantage.growth_chamber.name=Camera di Crescita -tile.electricadvantage.growth_chamber_controller.name=Controllore Camera di Crescita -tile.electricadvantage.li_ore.name=Minerale di litio -tile.electricadvantage.sulfur_ore.name=Minerale di Zolfo -tile.electricadvantage.led_bar.name=Luce a led - -tooltip.battery.charge=Carica -tooltip.battery.capacity=Capacità - -death.attack.laser=%1$s vaporizzato -death.attack.laser.player=%2$s vaporizzati %1$s -death.attack.propeller=%1$s è stato polverizzato da un'elica. -death.attack.propeller.player=%2$s spinti %1$s nelle eliche. - -tile.electricadvantage.electric_switch.name=Interruttore Elettrico -tile.electricadvantage.electric_still.name=Distillatore Elettrico -tile.electricadvantage.electric_pump.name=Pompa Elettricaa -tile.electricadvantage.plastic_refinery.name=Raffineria Plastica -item.electricadvantage.petrolplastic_ingot.name=Petrolio Plastica Lingotto -tile.electricadvantage.pump_pipe_electric.name=Tubo Pompa diff --git a/src/main/resources/assets/electricadvantage/lang/ja_jp.lang b/src/main/resources/assets/electricadvantage/lang/ja_jp.lang deleted file mode 100644 index e7b4f33..0000000 --- a/src/main/resources/assets/electricadvantage/lang/ja_jp.lang +++ /dev/null @@ -1,54 +0,0 @@ -language_support_goals = 英語 (en_US en_EN en_CA、en_GB, en_AU, en_PT), スペイン語 (es_MX、es_ES)、中国 (zh_CN)、日本語 (ja_JA)、ポルトガル (pt_BR)、ドイツ語 (de_DE)、イタリア語 (it_IT), 韓国語 (ko_KR) - -item.electricadvantage.blank_circuit_board.name=回路基板 (空の) -item.electricadvantage.control_circuit.name=コンピューター回路 -item.electricadvantage.integrated_circuit.name=マイクロチップ -item.electricadvantage.psu.name=電源ユニット -item.electricadvantage.silicon_ingot.name=シリコン -item.electricadvantage.silicon_mix.name=シリコンレシピ -item.electricadvantage.solder_mix.name=はんだレシピ -item.electricadvantage.solder.name=はんだ -item.electricadvantage.li_powder.name=リチウム粉末 -item.electricadvantage.li_ingot.name=リチウム金属 -item.electricadvantage.li_nugget.name=リチウムナゲット -item.electricadvantage.sulfur_powder.name=硫黄粉末 -item.electricadvantage.lead_acid_battery.name=鉛蓄電池 -item.electricadvantage.nickel_hydride_battery.name=ニッケル水素バッテリー -item.electricadvantage.alkaline_battery.name=アルカリ電池 -item.electricadvantage.lithium_battery.name=リチウムイオン電池 - -tile.electricadvantage.electric_conduit.name=電線 -tile.electricadvantage.electric_track.name=電動足場 -tile.electricadvantage.electric_battery_array.name=電池貯蔵 -tile.electricadvantage.electric_crusher.name=電気岩クラッシャー -tile.electricadvantage.laser_turret.name=レーザー砲塔 -tile.electricadvantage.electric_drill.name=電気ドリル -tile.electricadvantage.electric_fabricator.name=ロボット工場 -tile.electricadvantage.electric_furnace.name=電気炉 -tile.electricadvantage.electric_oven.name=電気オーブン -tile.electricadvantage.electric_pcb_printer.name=回路基板プリンター -tile.electricadvantage.geothermal_generator.name=地熱発電 -tile.electricadvantage.hydroelectric_generator.name=水力発電機 -tile.electricadvantage.photovoltaic_generator.name=太陽電池パネル -tile.electricadvantage.steam_powered_generator.name=蒸気駆動の発電機 -tile.electricadvantage.growth_chamber.name=植物生長室 -tile.electricadvantage.growth_chamber_controller.name=植物成長室コントローラ -tile.electricadvantage.li_ore.name=リチウム 鉱石 -tile.electricadvantage.sulfur_ore.name=硫黄鉱石 -tile.electricadvantage.led_bar.name=LEDライト - -tooltip.battery.charge=量 -tooltip.battery.capacity=合計金額 - -death.attack.laser=%1$s気化 -蒸発 death.attack.laser.player=%2$sは%1$sを気化しました -death.attack.propeller=プロペラ殺さ%1$s -death.attack.propeller.player=%2$sはプロペラと%1$sを殺しました - - -tile.electricadvantage.electric_switch.name=電気スイッチ -tile.electricadvantage.electric_still.name=電気蒸留器 -tile.electricadvantage.electric_pump.name=電気ポンプ -tile.electricadvantage.plastic_refinery.name=プラスチック製油所 -item.electricadvantage.petrolplastic_ingot.name=石油系プラスチックインゴット -tile.electricadvantage.pump_pipe_electric.name=ポンプ配管 diff --git a/src/main/resources/assets/electricadvantage/lang/ko_ko.lang b/src/main/resources/assets/electricadvantage/lang/ko_ko.lang deleted file mode 100644 index f5dcd3f..0000000 --- a/src/main/resources/assets/electricadvantage/lang/ko_ko.lang +++ /dev/null @@ -1,52 +0,0 @@ -item.electricadvantage.blank_circuit_board.name=회로 기판 (빈) -item.electricadvantage.control_circuit.name=제어 회로 -item.electricadvantage.integrated_circuit.name=마이크로 칩 -item.electricadvantage.psu.name=전원 공급 장치 -item.electricadvantage.silicon_ingot.name=실리콘 잉곳 -item.electricadvantage.silicon_mix.name=실리콘 혼합 -item.electricadvantage.solder_mix.name=솔더 혼합 -item.electricadvantage.solder.name=솔더 -item.electricadvantage.li_powder.name=분말 리튬 -item.electricadvantage.li_ingot.name=리튬 잉곳 -item.electricadvantage.li_nugget.name=리튬 너겟 -item.electricadvantage.sulfur_powder.name=분말 유황 -item.electricadvantage.lead_acid_battery.name=납 축전지 -item.electricadvantage.nickel_hydride_battery.name=니켈 수소 배터리 -item.electricadvantage.alkaline_battery.name=알카라인 배터리 -item.electricadvantage.lithium_battery.name=리튬 이온 배터리 - -tile.electricadvantage.electric_conduit.name=전력 케이블 -tile.electricadvantage.electric_track.name=전기 비계 -tile.electricadvantage.electric_battery_array.name=전지 어레이 -tile.electricadvantage.electric_crusher.name=전기 락 크러셔 -tile.electricadvantage.laser_turret.name=레이저 방어 터렛 -tile.electricadvantage.electric_drill.name=전기 마이닝 드릴 -tile.electricadvantage.electric_fabricator.name=자동 어셈블러 -tile.electricadvantage.electric_furnace.name=전기로 -tile.electricadvantage.electric_oven.name=전기 오븐 -tile.electricadvantage.electric_pcb_printer.name=회로 기판 프린터 -tile.electricadvantage.geothermal_generator.name=지열 발전기 -tile.electricadvantage.hydroelectric_generator.name=수력 발전기 -tile.electricadvantage.photovoltaic_generator.name=태양 광 발전기 -tile.electricadvantage.steam_powered_generator.name=증기 발전기 -tile.electricadvantage.growth_chamber.name=성장 상공 회의소 -tile.electricadvantage.growth_chamber_controller.name=성장 챔버 제어 장치 -tile.electricadvantage.li_ore.name=리튬 광석 -tile.electricadvantage.sulfur_ore.name=유황 광석 -tile.electricadvantage.led_bar.name=LED 조명 - -tooltip.battery.charge=요금 -tooltip.battery.capacity=생산 능력 - -death.attack.laser=%1$s이 (가) 증발 -death.attack.laser.player=%2$s의 증발 %1$s -death.attack.propeller=%1$s는 프로펠러에 의해 분쇄 하였다. -death.attack.propeller.player=%2$s는 프로펠러에 %1$s을 (를) 밀었다. - - -tile.electricadvantage.electric_switch.name=전기 스위치 -tile.electricadvantage.electric_still.name=전기 증류기 -tile.electricadvantage.electric_pump.name=전기 펌프 -tile.electricadvantage.plastic_refinery.name=플라스틱 정유 -item.electricadvantage.petrolplastic_ingot.name=석유 수지 잉곳 -tile.electricadvantage.pump_pipe_electric.name=펌프 파이프 diff --git a/src/main/resources/assets/electricadvantage/lang/pt_br.lang b/src/main/resources/assets/electricadvantage/lang/pt_br.lang deleted file mode 100644 index 8bd8c91..0000000 --- a/src/main/resources/assets/electricadvantage/lang/pt_br.lang +++ /dev/null @@ -1,54 +0,0 @@ -language_support_goals=inglês (en_US, en_EN, en_CA, en_GB, en_AU, en_PT), espanhol (es_MX, es_ES), chinês (zh_CN), japonês (ja_JA), Português (pt_BR), alemão (de_DE), italiano (it_IT), coreano (ko_KR) - -item.electricadvantage.blank_circuit_board.name=Placa de Circuito (Vago) -item.electricadvantage.control_circuit.name=Circuito de Controle -item.electricadvantage.integrated_circuit.name=Circuito Integrado -item.electricadvantage.psu.name=Unidade de Alimentação -item.electricadvantage.silicon_ingot.name=Silício Lingote -item.electricadvantage.silicon_mix.name=Mistura de Silício -item.electricadvantage.solder_mix.name=Mistura de Solda -item.electricadvantage.solder.name=Solda -item.electricadvantage.li_powder.name=Pó de Lítio -item.electricadvantage.li_ingot.name=Lítio Lingote -item.electricadvantage.li_nugget.name=Pepita de Lítio -item.electricadvantage.sulfur_powder.name=Enxofre em Pó -item.electricadvantage.lead_acid_battery.name=Bateria de Chumbo Ácido -item.electricadvantage.nickel_hydride_battery.name=Bateria Níquel-Hidreto Metálico -item.electricadvantage.alkaline_battery.name=Bateria Alcalina -item.electricadvantage.lithium_battery.name=Bateria de Lítio - -tile.electricadvantage.electric_conduit.name=Fio Elétrico -tile.electricadvantage.electric_track.name=Elétrica Andaime -tile.electricadvantage.electric_battery_array.name=Armazenamento da Bateria -tile.electricadvantage.electric_crusher.name=Triturador de Rocha Elétrica -tile.electricadvantage.laser_turret.name=Torre de Arma a Laser -tile.electricadvantage.electric_drill.name=Broca Mineração Elétrica -tile.electricadvantage.electric_fabricator.name=Fábrica Automatizada -tile.electricadvantage.electric_furnace.name=Forno Elétrico a Arco -tile.electricadvantage.electric_oven.name=Forno Elétrico -tile.electricadvantage.electric_pcb_printer.name=Impressora Circuito -tile.electricadvantage.geothermal_generator.name=Gerador de Elétrico Geotérmica -tile.electricadvantage.hydroelectric_generator.name=Gerador Hidrelétrico -tile.electricadvantage.photovoltaic_generator.name=Painel Solar -tile.electricadvantage.steam_powered_generator.name=a Vapor Gerador Elétrico -tile.electricadvantage.growth_chamber.name=Câmara de Crescimento -tile.electricadvantage.growth_chamber_controller.name=Unidade de Controle de Crescimento Câmara -tile.electricadvantage.li_ore.name=Minério de Lítio -tile.electricadvantage.sulfur_ore.name=Minério de Enxofre -tile.electricadvantage.led_bar.name=Luz LED - -tooltip.battery.charge=Carga -tooltip.battery.capacity=Capacidade - -death.attack.laser=%1$S vaporizado -death.attack.laser.player=%2$s vaporizados %1$s -death.attack.propeller=%1$s foi pulverizado por uma hélice. -death.attack.propeller.player=%2$s empurrou %1$s em uma hélice. - - -tile.electricadvantage.electric_switch.name=Chave Elétrica -tile.electricadvantage.electric_still.name=Destilador Elétrico -tile.electricadvantage.electric_pump.name=Bomba Elétrica -tile.electricadvantage.plastic_refinery.name=Refinaria de Plástico -item.electricadvantage.petrolplastic_ingot.name=Petróleo Plástico Lingote -tile.electricadvantage.pump_pipe_electric.name=Tubo de Bomba diff --git a/src/main/resources/assets/electricadvantage/lang/zh_cn.lang b/src/main/resources/assets/electricadvantage/lang/zh_cn.lang deleted file mode 100644 index 55971ff..0000000 --- a/src/main/resources/assets/electricadvantage/lang/zh_cn.lang +++ /dev/null @@ -1,55 +0,0 @@ -language_support_goals=英语（EN_US，的en_EN，en_CA，EN_GB，en_AU，en_PT），西班牙语（es_MX，es_ES），中国（zh_CN的），日本（ja_JA），葡萄牙语（PT_BR），德语（de_DE这个），意大利语（it_IT），韩国（ko_KR） - -item.electricadvantage.blank_circuit_board.name=电路板（空白） -item.electricadvantage.control_circuit.name=控制电路 -item.electricadvantage.integrated_circuit.name=微芯片 -item.electricadvantage.psu.name=电源单元 -item.electricadvantage.silicon_ingot.name=硅锭 -item.electricadvantage.silicon_mix.name=硅混合 -item.electricadvantage.solder_mix.name=焊接混合 -item.electricadvantage.solder.name=焊料 -item.electricadvantage.li_powder.name=粉状锂 -item.electricadvantage.li_ingot.name=锂锭 -item.electricadvantage.li_nugget.name=锂掘金 -item.electricadvantage.sulfur_powder.name=硫粉 -item.electricadvantage.lead_acid_battery.name=铅酸蓄电池 -item.electricadvantage.nickel_hydride_battery.name=镍氢电池 -item.electricadvantage.alkaline_battery.name=碱性电池 -item.electricadvantage.lithium_battery.name=锂离子电池 - -tile.electricadvantage.electric_conduit.name=电力电缆 -tile.electricadvantage.electric_track.name=电动脚手架 -tile.electricadvantage.electric_battery_array.name=电池阵列 -tile.electricadvantage.electric_crusher.name=电碎石机 -tile.electricadvantage.laser_turret.name=激光防御炮塔 -tile.electricadvantage.electric_drill.name=电矿钻 -tile.electricadvantage.electric_fabricator.name=自动汇编 -tile.electricadvantage.electric_furnace.name=电弧炉 -tile.electricadvantage.electric_oven.name=电烤箱 -tile.electricadvantage.electric_pcb_printer.name= 电路板打印机 -tile.electricadvantage.geothermal_generator.name=热发电机 -tile.electricadvantage.hydroelectric_generator.name=水轮发电机 -tile.electricadvantage.photovoltaic_generator.name=光电发生器 -tile.electricadvantage.steam_powered_generator.name=蒸汽为动力的电动发电机 -tile.electricadvantage.growth_chamber.name=生长箱 -tile.electricadvantage.growth_chamber_controller.name=生长箱控制单元 -tile.electricadvantage.li_ore.name=锂矿 -tile.electricadvantage.sulfur_ore.name=硫矿石 -tile.electricadvantage.led_bar.name=LED燈 - -tooltip.battery.charge=充电 -tooltip.battery.capacity=容量 - -death.attack.laser=％1$s蒸发 -death.attack.laser.player=％2$s汽化％1$s -death.attack.propeller=％1$s被粉碎螺旋桨。 -death.attack.propeller.player=％2$s推％1$s转换为螺旋桨。 - - -tile.electricadvantage.electric_switch.name=電器開關 -tile.electricadvantage.electric_still.name=電熱蒸餾水 -tile.electricadvantage.electric_pump.name=電動泵 -tile.electricadvantage.plastic_refinery.name=塑料煉油廠 -item.electricadvantage.petrolplastic_ingot.name=石油膠錠 -tile.electricadvantage.pump_pipe_electric.name=泵管 - diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_battery_array.json b/src/main/resources/assets/electricadvantage/models/block/electric_battery_array.json deleted file mode 100644 index 3d42d60..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_battery_array.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_battery_array", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_0.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_0.json deleted file mode 100644 index 35ae031..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_0.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_ensw", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_densuw.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_densuw.json deleted file mode 100644 index 6e81d07..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_densuw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_densuw", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_desuw.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_desuw.json deleted file mode 100644 index 5926a15..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_desuw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_desuw", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_dnu.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_dnu.json deleted file mode 100644 index b8c0078..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_dnu.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_dnu", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_ensw.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_ensw.json deleted file mode 100644 index 35ae031..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_ensw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_ensw", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_n.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_n.json deleted file mode 100644 index 01b0692..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_n.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_n", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_ns.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_ns.json deleted file mode 100644 index bc70545..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_ns.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_ns", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nsuw.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nsuw.json deleted file mode 100644 index 08913ad..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nsuw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_nsuw", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nsw.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nsw.json deleted file mode 100644 index 83e661f..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nsw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_nsw", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nuw.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nuw.json deleted file mode 100644 index 37e7296..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nuw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_nuw", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nw.json b/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nw.json deleted file mode 100644 index bbdc488..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_conduit_nw.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "poweradvantage:block/pipe2_nw", - "textures": { - "texture": "electricadvantage:blocks/electric_conduit", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_crusher_off.json b/src/main/resources/assets/electricadvantage/models/block/electric_crusher_off.json deleted file mode 100644 index 48e1794..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_crusher_off.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_crusher_off", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_crusher_on.json b/src/main/resources/assets/electricadvantage/models/block/electric_crusher_on.json deleted file mode 100644 index 971881c..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_crusher_on.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_crusher_on", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_crusher_powered.json b/src/main/resources/assets/electricadvantage/models/block/electric_crusher_powered.json deleted file mode 100644 index dab4d02..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_crusher_powered.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_crusher_powered", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_drill_off.json b/src/main/resources/assets/electricadvantage/models/block/electric_drill_off.json deleted file mode 100644 index 93365be..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_drill_off.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_drill_base", - "textures": { - "top": "electricadvantage:blocks/electric_drill_off", - "bottom": "electricadvantage:blocks/laser_drill_optic" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_drill_on.json b/src/main/resources/assets/electricadvantage/models/block/electric_drill_on.json deleted file mode 100644 index f227a8e..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_drill_on.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_drill_base", - "textures": { - "top": "electricadvantage:blocks/electric_drill_on", - "bottom": "electricadvantage:blocks/laser_drill_optic_on" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_fabricator_off.json b/src/main/resources/assets/electricadvantage/models/block/electric_fabricator_off.json deleted file mode 100644 index 18ea194..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_fabricator_off.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_fabricator_off", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_fabricator_on.json b/src/main/resources/assets/electricadvantage/models/block/electric_fabricator_on.json deleted file mode 100644 index a078546..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_fabricator_on.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_fabricator_on", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_fabricator_powered.json b/src/main/resources/assets/electricadvantage/models/block/electric_fabricator_powered.json deleted file mode 100644 index 2d36d3f..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_fabricator_powered.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_fabricator_powered", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_furnace_off.json b/src/main/resources/assets/electricadvantage/models/block/electric_furnace_off.json deleted file mode 100644 index 1572af5..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_furnace_off.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_furnace_off", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_furnace_on.json b/src/main/resources/assets/electricadvantage/models/block/electric_furnace_on.json deleted file mode 100644 index 7566f40..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_furnace_on.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_furnace_on", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_furnace_powered.json b/src/main/resources/assets/electricadvantage/models/block/electric_furnace_powered.json deleted file mode 100644 index 6f2da39..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_furnace_powered.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_furnace_powered", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_oven_off.json b/src/main/resources/assets/electricadvantage/models/block/electric_oven_off.json deleted file mode 100644 index 6bcc5ca..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_oven_off.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_oven_off", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_oven_on.json b/src/main/resources/assets/electricadvantage/models/block/electric_oven_on.json deleted file mode 100644 index 5ecce52..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_oven_on.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_oven_on", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_oven_powered.json b/src/main/resources/assets/electricadvantage/models/block/electric_oven_powered.json deleted file mode 100644 index 3ca23f9..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_oven_powered.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_oven_powered", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_off.json b/src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_off.json deleted file mode 100644 index 2255595..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_off.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_pcb_printer_off", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_on.json b/src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_on.json deleted file mode 100644 index f150a30..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_on.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_pcb_printer_on", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_powered.json b/src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_powered.json deleted file mode 100644 index c9c2cee..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_pcb_printer_powered.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_pcb_printer_powered", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_pump_off.json b/src/main/resources/assets/electricadvantage/models/block/electric_pump_off.json deleted file mode 100644 index 6606e1d..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_pump_off.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_pump_off", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_pump_on.json b/src/main/resources/assets/electricadvantage/models/block/electric_pump_on.json deleted file mode 100644 index 0333dc1..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_pump_on.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_pump_on", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_pump_powered.json b/src/main/resources/assets/electricadvantage/models/block/electric_pump_powered.json deleted file mode 100644 index 0333dc1..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_pump_powered.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_pump_on", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_still_off.json b/src/main/resources/assets/electricadvantage/models/block/electric_still_off.json deleted file mode 100644 index 4c86573..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_still_off.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_still_off", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_still_on.json b/src/main/resources/assets/electricadvantage/models/block/electric_still_on.json deleted file mode 100644 index 99e5d84..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_still_on.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_still_on", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_still_powered.json b/src/main/resources/assets/electricadvantage/models/block/electric_still_powered.json deleted file mode 100644 index 87b8ee9..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_still_powered.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "electricadvantage:block/electric_machine_base", - "textures": { - "front": "electricadvantage:blocks/electric_still_powered", - "top": "electricadvantage:blocks/machine_top", - "bottom":"electricadvantage:blocks/machine_top", - "back": "electricadvantage:blocks/machine_back", - "side": "electricadvantage:blocks/machine_side" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_switch_off.json b/src/main/resources/assets/electricadvantage/models/block/electric_switch_off.json deleted file mode 100644 index 4b89d53..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_switch_off.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "electricadvantage:blocks/electric_switch_off", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/electric_switch_on.json b/src/main/resources/assets/electricadvantage/models/block/electric_switch_on.json deleted file mode 100644 index b9d3e78..0000000 --- a/src/main/resources/assets/electricadvantage/models/block/electric_switch_on.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "electricadvantage:blocks/electric_switch_on", - "particle": "electricadvantage:materials/machine_case" - } -} diff --git a/src/main/resources/assets/electricadvantage/models/block/geothermal_generator.json b/src/main/resources/assets/electricadvantage/models/block/geothermal_generator.json deleted file mode 100644 index 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/assets/electricadvantage/recipes/_factories.json b/src/main/resources/assets/electricadvantage/recipes/_factories.json deleted file mode 100644 index 0ff84c3..0000000 --- a/src/main/resources/assets/electricadvantage/recipes/_factories.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "conditions": { - "recipe_mode": "com.mcmoddev.electricadvantage.recipe.condition.RecipeModeConditionFactory", - "not_recipe_mode": "com.mcmoddev.electricadvantage.recipe.condition.NotRecipeModeConditionFactory" - } -} diff --git a/src/main/resources/assets/electricadvantage/recipes/electric_track.json b/src/main/resources/assets/electricadvantage/recipes/electric_track.json deleted file mode 100644 index 2351a99..0000000 --- a/src/main/resources/assets/electricadvantage/recipes/electric_track.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "forge:ore_shapeless", - "ingredients": [ - { - "item": "electricadvantage:electric_conduit" - }, - { - "item": "poweradvantage:steel_frame" - } - ], - "result": { - "item": "electricadvantage:electric_track" - }, - "group": "tracks" -} diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 29923c7..ffa53de 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,11 +1,11 @@ [ { - "modid": "electricadvantage", - "name": "Electric Advantage", + "modid": "baseelectric", + "name": "baseElectric", "description": "Add electricity to your game with this Power Advantage add-on", "version": "${version}", "mcversion": "${mcversion}", - "url": "https://github.com/MinecraftModDevelopmentMods/ElectricAdvantage", + "url": "https://github.com/MinecraftModDevelopmentMods/baseElectric", "updateUrl": "", "authorList": ["DrCyano"], "credits": "The Forge and FML guys, the author of this mod, Benjamin Franklin, and electrons everywhere", diff --git a/src/test/java/com/mcmoddev/electricadvantage/entities/ElectricOperationalHydroturbineAnchorTest.java b/src/test/java/zone/moddev/mc/baseelectric/entities/ElectricOperationalHydroturbineAnchorTest.java similarity index 98% rename from src/test/java/com/mcmoddev/electricadvantage/entities/ElectricOperationalHydroturbineAnchorTest.java rename to src/test/java/zone/moddev/mc/baseelectric/entities/ElectricOperationalHydroturbineAnchorTest.java index d62bf4a..aabc41f 100644 --- a/src/test/java/com/mcmoddev/electricadvantage/entities/ElectricOperationalHydroturbineAnchorTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/entities/ElectricOperationalHydroturbineAnchorTest.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.entities; +package zone.moddev.mc.baseelectric.entities; import java.lang.reflect.Field; import java.util.Random; diff --git a/src/test/java/com/mcmoddev/electricadvantage/entities/HydroturbinePersistenceTest.java b/src/test/java/zone/moddev/mc/baseelectric/entities/HydroturbinePersistenceTest.java similarity index 98% rename from src/test/java/com/mcmoddev/electricadvantage/entities/HydroturbinePersistenceTest.java rename to src/test/java/zone/moddev/mc/baseelectric/entities/HydroturbinePersistenceTest.java index 331dc3c..a5ec748 100644 --- a/src/test/java/com/mcmoddev/electricadvantage/entities/HydroturbinePersistenceTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/entities/HydroturbinePersistenceTest.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.entities; +package zone.moddev.mc.baseelectric.entities; import java.lang.reflect.Field; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/test/java/com/mcmoddev/electricadvantage/gui/GUIHelperTest.java b/src/test/java/zone/moddev/mc/baseelectric/gui/GUIHelperTest.java similarity index 97% rename from src/test/java/com/mcmoddev/electricadvantage/gui/GUIHelperTest.java rename to src/test/java/zone/moddev/mc/baseelectric/gui/GUIHelperTest.java index 68ff6fd..ca2b068 100644 --- a/src/test/java/com/mcmoddev/electricadvantage/gui/GUIHelperTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/gui/GUIHelperTest.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.gui; +package zone.moddev.mc.baseelectric.gui; import java.lang.reflect.Method; import org.junit.Test; diff --git a/src/test/java/com/mcmoddev/electricadvantage/machines/ElectricDrillMovementContractTest.java b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricDrillMovementContractTest.java similarity index 97% rename from src/test/java/com/mcmoddev/electricadvantage/machines/ElectricDrillMovementContractTest.java rename to src/test/java/zone/moddev/mc/baseelectric/machines/ElectricDrillMovementContractTest.java index 53ffecc..99e562b 100644 --- a/src/test/java/com/mcmoddev/electricadvantage/machines/ElectricDrillMovementContractTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricDrillMovementContractTest.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import java.nio.charset.StandardCharsets; import java.nio.file.Files; diff --git a/src/test/java/com/mcmoddev/electricadvantage/machines/ElectricDrillPersistenceTest.java b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricDrillPersistenceTest.java similarity index 97% rename from src/test/java/com/mcmoddev/electricadvantage/machines/ElectricDrillPersistenceTest.java rename to src/test/java/zone/moddev/mc/baseelectric/machines/ElectricDrillPersistenceTest.java index a722d8b..8a8b409 100644 --- a/src/test/java/com/mcmoddev/electricadvantage/machines/ElectricDrillPersistenceTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricDrillPersistenceTest.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraft.nbt.NBTTagCompound; import org.junit.Test; diff --git a/src/test/java/com/mcmoddev/electricadvantage/machines/ElectricOperationalNativeDefectsTest.java b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalNativeDefectsTest.java similarity index 99% rename from src/test/java/com/mcmoddev/electricadvantage/machines/ElectricOperationalNativeDefectsTest.java rename to src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalNativeDefectsTest.java index 49c4606..339c484 100644 --- a/src/test/java/com/mcmoddev/electricadvantage/machines/ElectricOperationalNativeDefectsTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalNativeDefectsTest.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraftforge.fluids.FluidStack; import java.lang.reflect.Field; @@ -16,7 +16,7 @@ import net.minecraft.world.WorldServer; import org.junit.BeforeClass; import org.junit.Test; -import com.mcmoddev.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import static org.junit.Assert.*; diff --git a/src/test/java/com/mcmoddev/electricadvantage/machines/ElectricOperationalPumpPickupTest.java b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalPumpPickupTest.java similarity index 99% rename from src/test/java/com/mcmoddev/electricadvantage/machines/ElectricOperationalPumpPickupTest.java rename to src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalPumpPickupTest.java index eeb21cb..23bec9f 100644 --- a/src/test/java/com/mcmoddev/electricadvantage/machines/ElectricOperationalPumpPickupTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalPumpPickupTest.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import java.lang.reflect.Field; import java.util.HashMap; @@ -25,7 +25,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.mcmoddev.electricadvantage.init.Power; +import zone.moddev.mc.baseelectric.init.Power; import static org.junit.Assert.*; diff --git a/src/test/java/com/mcmoddev/electricadvantage/machines/ElectricOperationalRedstoneCacheTest.java b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalRedstoneCacheTest.java similarity index 95% rename from src/test/java/com/mcmoddev/electricadvantage/machines/ElectricOperationalRedstoneCacheTest.java rename to src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalRedstoneCacheTest.java index 637a870..166c8be 100644 --- a/src/test/java/com/mcmoddev/electricadvantage/machines/ElectricOperationalRedstoneCacheTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalRedstoneCacheTest.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import cyano.poweradvantage.api.PoweredEntity; import java.lang.reflect.Field; @@ -7,6 +7,7 @@ import java.util.List; import net.minecraft.util.math.BlockPos; import net.minecraft.init.Bootstrap; +import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import org.junit.BeforeClass; @@ -94,6 +95,7 @@ public class ElectricOperationalRedstoneCacheTest { } assertEquals(Arrays.asList(first, refresh, refresh + 8), world.queryTimes); assertEquals(2, machine.powerUpdates); + assertEquals("Each real server tick must mark the machine chunk dirty", 16, world.dirtyTicks); } } } @@ -203,6 +205,7 @@ private static final class SignalWorld extends WorldServer { BlockPos position; boolean signalled; long time; + int dirtyTicks; List queryTimes; private SignalWorld() { super(null, null, null, 0, null); @@ -213,5 +216,10 @@ private SignalWorld() { return signalled; } @Override public long getTotalWorldTime() { return time; } + @Override public void markChunkDirty(BlockPos position, TileEntity tile) { + assertEquals(this.position, position); + assertTrue(tile instanceof ProbeMachine); + dirtyTicks++; + } } } diff --git a/src/test/java/com/mcmoddev/electricadvantage/machines/ElectricOperationalSoundBroadcastTest.java b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalSoundBroadcastTest.java similarity index 99% rename from src/test/java/com/mcmoddev/electricadvantage/machines/ElectricOperationalSoundBroadcastTest.java rename to src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalSoundBroadcastTest.java index e81a490..2970c8c 100644 --- a/src/test/java/com/mcmoddev/electricadvantage/machines/ElectricOperationalSoundBroadcastTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalSoundBroadcastTest.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/src/test/java/com/mcmoddev/electricadvantage/machines/ElectricOperationalStillCapacityTest.java b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalStillCapacityTest.java similarity index 92% rename from src/test/java/com/mcmoddev/electricadvantage/machines/ElectricOperationalStillCapacityTest.java rename to src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalStillCapacityTest.java index 2d00516..fb73770 100644 --- a/src/test/java/com/mcmoddev/electricadvantage/machines/ElectricOperationalStillCapacityTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/machines/ElectricOperationalStillCapacityTest.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraftforge.fluids.FluidStack; import java.lang.reflect.Field; @@ -8,10 +8,10 @@ import org.junit.Before; import org.junit.After; import org.junit.Test; -import com.mcmoddev.electricadvantage.init.Power; -import com.mcmoddev.poweradvantage.registry.still.recipe.DistillationRecipe; -import com.mcmoddev.poweradvantage.registry.still.recipe.DistillationRecipeRegistry; -import com.mcmoddev.poweradvantage.registry.still.recipe.ExplicitFluidReference; +import zone.moddev.mc.baseelectric.init.Power; +import zone.moddev.mc.basepower.registry.still.recipe.DistillationRecipe; +import zone.moddev.mc.basepower.registry.still.recipe.DistillationRecipeRegistry; +import zone.moddev.mc.basepower.registry.still.recipe.ExplicitFluidReference; import static org.junit.Assert.*; diff --git a/src/test/java/com/mcmoddev/electricadvantage/machines/GrowthChamberPersistenceTest.java b/src/test/java/zone/moddev/mc/baseelectric/machines/GrowthChamberPersistenceTest.java similarity index 98% rename from src/test/java/com/mcmoddev/electricadvantage/machines/GrowthChamberPersistenceTest.java rename to src/test/java/zone/moddev/mc/baseelectric/machines/GrowthChamberPersistenceTest.java index f68de77..e8a9c44 100644 --- a/src/test/java/com/mcmoddev/electricadvantage/machines/GrowthChamberPersistenceTest.java +++ b/src/test/java/zone/moddev/mc/baseelectric/machines/GrowthChamberPersistenceTest.java @@ -1,4 +1,4 @@ -package com.mcmoddev.electricadvantage.machines; +package zone.moddev.mc.baseelectric.machines; import net.minecraft.init.Bootstrap; import net.minecraft.init.Items; From 29f5a5d2d0faa8897bfc38c75917e8d786d1f907 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Thu, 5 Nov 2026 09:24:49 +0000 Subject: [PATCH 2/4] Build against the basePower crusher registry fix --- .github/workflows/ci.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- build.gradle | 4 ++-- gradle.properties | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 463aa12..0990318 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: repository: MinecraftModDevelopmentMods/basePower - ref: 7b375587dd9e6ca57ea51473fa9892531ac73c75 + ref: 2913aba3d3f4f3b40594dfad8fcdef6bf61f6bcb path: .ci-dependencies/PowerAdvantage - name: Check out pinned OreSpawn diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index acfc6ea..252c71f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: repository: MinecraftModDevelopmentMods/basePower - ref: 7b375587dd9e6ca57ea51473fa9892531ac73c75 + ref: 2913aba3d3f4f3b40594dfad8fcdef6bf61f6bcb path: .ci-dependencies/PowerAdvantage - name: Check out pinned OreSpawn diff --git a/build.gradle b/build.gradle index e947061..661724c 100644 --- a/build.gradle +++ b/build.gradle @@ -332,8 +332,8 @@ tasks.register('verifyReleaseConfiguration') { } if (project.poweradvantage_version != '2.4.4.112021' || project.poweradvantage_source_repository != 'MinecraftModDevelopmentMods/basePower' - || project.poweradvantage_source_ref != '7b375587dd9e6ca57ea51473fa9892531ac73c75' - || project.poweradvantage_deobf_sha256 != '66FBC92F8A14B54ED9A33482A99AF21B1FDA23CCFC9E817AF4D2BD8DE0EB0A78') { + || project.poweradvantage_source_ref != '2913aba3d3f4f3b40594dfad8fcdef6bf61f6bcb' + || project.poweradvantage_deobf_sha256 != '592469C64AA34BDDF7537FADD107639EEB604B570B2EAB080F711DD6CBB385F3') { throw new GradleException('Unexpected PowerAdvantage compile dependency identity') } ['.github/workflows/ci.yml', '.github/workflows/codeql-analysis.yml'].each { workflowPath -> diff --git a/gradle.properties b/gradle.properties index 9a0a19d..810a34b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -35,7 +35,7 @@ cf_versions=1.12.2 poweradvantage_version=2.4.4.112021 poweradvantage_source_repository=MinecraftModDevelopmentMods/basePower -poweradvantage_source_ref=7b375587dd9e6ca57ea51473fa9892531ac73c75 -poweradvantage_deobf_sha256=66FBC92F8A14B54ED9A33482A99AF21B1FDA23CCFC9E817AF4D2BD8DE0EB0A78 +poweradvantage_source_ref=2913aba3d3f4f3b40594dfad8fcdef6bf61f6bcb +poweradvantage_deobf_sha256=592469C64AA34BDDF7537FADD107639EEB604B570B2EAB080F711DD6CBB385F3 orespawn_version=4.1.3.112021 orespawn_deobf_sha256=E10D9D0409784F3D4260889186A2483E72D1EC838F2BEAD78BE69149B6975198 From 3154a8700e6272537edac3f725ea1f3c5c614916 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Thu, 5 Nov 2026 09:28:54 +0000 Subject: [PATCH 3/4] Use the guarded basePower migration build --- .github/workflows/ci.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- build.gradle | 4 ++-- gradle.properties | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0990318..76a5696 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: repository: MinecraftModDevelopmentMods/basePower - ref: 2913aba3d3f4f3b40594dfad8fcdef6bf61f6bcb + ref: 6da980e7ef3bba6d3c289e85c8dee3cc70474f71 path: .ci-dependencies/PowerAdvantage - name: Check out pinned OreSpawn diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 252c71f..43b1f0e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: repository: MinecraftModDevelopmentMods/basePower - ref: 2913aba3d3f4f3b40594dfad8fcdef6bf61f6bcb + ref: 6da980e7ef3bba6d3c289e85c8dee3cc70474f71 path: .ci-dependencies/PowerAdvantage - name: Check out pinned OreSpawn diff --git a/build.gradle b/build.gradle index 661724c..d9e9edd 100644 --- a/build.gradle +++ b/build.gradle @@ -332,8 +332,8 @@ tasks.register('verifyReleaseConfiguration') { } if (project.poweradvantage_version != '2.4.4.112021' || project.poweradvantage_source_repository != 'MinecraftModDevelopmentMods/basePower' - || project.poweradvantage_source_ref != '2913aba3d3f4f3b40594dfad8fcdef6bf61f6bcb' - || project.poweradvantage_deobf_sha256 != '592469C64AA34BDDF7537FADD107639EEB604B570B2EAB080F711DD6CBB385F3') { + || project.poweradvantage_source_ref != '6da980e7ef3bba6d3c289e85c8dee3cc70474f71' + || project.poweradvantage_deobf_sha256 != '3E46BBF2ADEC22C9B119F5E8FEA8CCA56B16969187850B3A067C7FC0C181700B') { throw new GradleException('Unexpected PowerAdvantage compile dependency identity') } ['.github/workflows/ci.yml', '.github/workflows/codeql-analysis.yml'].each { workflowPath -> diff --git a/gradle.properties b/gradle.properties index 810a34b..dd9300d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -35,7 +35,7 @@ cf_versions=1.12.2 poweradvantage_version=2.4.4.112021 poweradvantage_source_repository=MinecraftModDevelopmentMods/basePower -poweradvantage_source_ref=2913aba3d3f4f3b40594dfad8fcdef6bf61f6bcb -poweradvantage_deobf_sha256=592469C64AA34BDDF7537FADD107639EEB604B570B2EAB080F711DD6CBB385F3 +poweradvantage_source_ref=6da980e7ef3bba6d3c289e85c8dee3cc70474f71 +poweradvantage_deobf_sha256=3E46BBF2ADEC22C9B119F5E8FEA8CCA56B16969187850B3A067C7FC0C181700B orespawn_version=4.1.3.112021 orespawn_deobf_sha256=E10D9D0409784F3D4260889186A2483E72D1EC838F2BEAD78BE69149B6975198 From 62524c1b97223266be3ade270d3b1800ed8bc9e7 Mon Sep 17 00:00:00 2001 From: JohnBraham Date: Thu, 5 Nov 2026 10:15:28 +0000 Subject: [PATCH 4/4] Build baseElectric against the released basePower --- .github/workflows/ci.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- CHANGELOG.txt | 7 ++++--- README.md | 4 +++- build.gradle | 2 +- gradle.properties | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 76a5696..fc65e67 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: repository: MinecraftModDevelopmentMods/basePower - ref: 6da980e7ef3bba6d3c289e85c8dee3cc70474f71 + ref: 1fc2fb3a409a5cf86a4133ee4d313002a5b8611e path: .ci-dependencies/PowerAdvantage - name: Check out pinned OreSpawn diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 43b1f0e..0c46f14 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: repository: MinecraftModDevelopmentMods/basePower - ref: 6da980e7ef3bba6d3c289e85c8dee3cc70474f71 + ref: 1fc2fb3a409a5cf86a4133ee4d313002a5b8611e path: .ci-dependencies/PowerAdvantage - name: Check out pinned OreSpawn diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a4ab30e..ff9b685 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,8 +1,9 @@ 2.2.6.112021 - baseElectric for Minecraft 1.12.2 -- Continue Electric Advantage as baseElectric. Read 1.10.2 original and baseElectric tile IDs, including the older hydroelectric turbine names. -- Use OreSpawn 4 provider rules for sulfur and lithium while keeping existing player choices. -- Use matching basePower 1.12.2 and keep the earlier drill, battery, greenhouse and fluid-machine fixes. +- Build against the released basePower 2.4.4.112021. +- Bring baseElectric to Forge 1.12.2. Move worlds from Electric Advantage or baseElectric 1.10.2 and keep your machines, wiring and turbines. +- Move sulfur and lithium generation to OreSpawn 4 without replacing your saved choices. +- Keep the fixes for saved drill progress, turbine links, greenhouse growth and blocked fluid outputs. Earlier 1.12.2 test-coverage repairs diff --git a/README.md b/README.md index d706ca1..9759349 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,9 @@ baseElectric continues DrCyano's Electric Advantage, adding generators, batterie ## Upgrading a world -Replace the installed Advantage family together. baseElectric `2.2.6.112021` reads the original Electric Advantage and released baseElectric 1.10.2 tile and turbine identities. Back up the complete save and its configuration, then test a copy and check charge, fluid and machine state again after a full restart. +Install [basePower 2.4.4 for Forge 1.12.2](https://www.curseforge.com/minecraft/mc-mods/basepower/files/9452029) and Base Metals. Use the 1.12.2 builds of all mods in your workshop. + +baseElectric replaces Electric Advantage on 1.12.2 and can read worlds from Electric Advantage or baseElectric on 1.10.2. Back up your world and config, then replace the old Advantage mods together on a copy of the world. Check battery charge, machine contents and your turbines. Save, close Minecraft completely, and check again after reopening the copy. [World upgrade guide](https://github.com/MinecraftModDevelopmentMods/basePower/blob/master-1.12.2/docs/1.12-upgrade.md) | [CurseForge](https://www.curseforge.com/minecraft/mc-mods/baseelectric) diff --git a/build.gradle b/build.gradle index d9e9edd..f2e3fe5 100644 --- a/build.gradle +++ b/build.gradle @@ -332,7 +332,7 @@ tasks.register('verifyReleaseConfiguration') { } if (project.poweradvantage_version != '2.4.4.112021' || project.poweradvantage_source_repository != 'MinecraftModDevelopmentMods/basePower' - || project.poweradvantage_source_ref != '6da980e7ef3bba6d3c289e85c8dee3cc70474f71' + || project.poweradvantage_source_ref != '1fc2fb3a409a5cf86a4133ee4d313002a5b8611e' || project.poweradvantage_deobf_sha256 != '3E46BBF2ADEC22C9B119F5E8FEA8CCA56B16969187850B3A067C7FC0C181700B') { throw new GradleException('Unexpected PowerAdvantage compile dependency identity') } diff --git a/gradle.properties b/gradle.properties index dd9300d..0bc5c5b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -35,7 +35,7 @@ cf_versions=1.12.2 poweradvantage_version=2.4.4.112021 poweradvantage_source_repository=MinecraftModDevelopmentMods/basePower -poweradvantage_source_ref=6da980e7ef3bba6d3c289e85c8dee3cc70474f71 +poweradvantage_source_ref=1fc2fb3a409a5cf86a4133ee4d313002a5b8611e poweradvantage_deobf_sha256=3E46BBF2ADEC22C9B119F5E8FEA8CCA56B16969187850B3A067C7FC0C181700B orespawn_version=4.1.3.112021 orespawn_deobf_sha256=E10D9D0409784F3D4260889186A2483E72D1EC838F2BEAD78BE69149B6975198