Add Tesla Networks for wireless power and more

README.md

@@ -18,7 +18,9 @@ For any questions, please ask in the `#extended-industrialization` channel on [m
   - Processing Array
   - Universal Transformer
   - Waste Collector
-  - Wireless Charging Station
+  - Tesla Coil
+  - Tesla Receiver (and also a hatch)
+  - Tesla Tower
 - Generators
   - Solar Boiler
   - Solar Panel
@@ -29,6 +31,8 @@ For any questions, please ask in the `#extended-industrialization` channel on [m
   - Electric Drill & Chainsaw
   - Ultimate Laser Drill
   - Nano Suit
+  - Tesla Calibrator
+  - Tesla Handheld Receiver
 - Resources
   - Mulch
   - Manure

build.gradle

@@ -293,6 +293,7 @@ neoForge {
 	accessTransformers = [
 			"src/main/resources/${mod_id}.accesstransformer.cfg"
 	]
+	interfaceInjectionData.from "src/main/resources/interfaces.json"
 
 	parchment {
 		mappingsVersion = project.parchment_mappings_version

gradle.properties

@@ -2,7 +2,7 @@
 runtime_include_emi=true
 runtime_include_mi_tweaks=true
 runtime_include_accessories=false
-runtime_include_curios=false
+runtime_include_curios=true
 runtime_include_mystical_agriculture=false
 
 # Gradle Configuration
@@ -40,7 +40,7 @@ grandpower_version=3.0.0
 cloth_config_version=15.0.127
 emi_version=1.1.10+1.21
 emi_version_range=[1.1.10, 1.2-)
-tesseract_version=1.6.4-beta-1.21.1
+tesseract_version=1.6.5-beta-1.21.1
 tesseract_version_range=[1.6.4-beta-, 1.7-)
 mi_tweaks_version=1.6.3-beta-1.21.1
 mixinextras_version=0.3.5

src/generated/resources/assets/extended_industrialization/blockstates/aluminum_tesla_winding.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "extended_industrialization:block/aluminum_tesla_winding"
+    }
+  }
+}

src/generated/resources/assets/extended_industrialization/blockstates/annealed_copper_tesla_winding.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "extended_industrialization:block/annealed_copper_tesla_winding"
+    }
+  }
+}

src/generated/resources/assets/extended_industrialization/blockstates/copper_tesla_winding.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "extended_industrialization:block/copper_tesla_winding"
+    }
+  }
+}

src/generated/resources/assets/extended_industrialization/blockstates/electrum_tesla_winding.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "extended_industrialization:block/electrum_tesla_winding"
+    }
+  }
+}

src/generated/resources/assets/extended_industrialization/blockstates/ev_tesla_receiver_hatch.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "extended_industrialization:block/ev_tesla_receiver_hatch"
+    }
+  }
+}

src/generated/resources/assets/extended_industrialization/blockstates/hv_tesla_receiver_hatch.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "extended_industrialization:block/hv_tesla_receiver_hatch"
+    }
+  }
+}

src/generated/resources/assets/extended_industrialization/blockstates/lethal_tesla_coil.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "extended_industrialization:block/lethal_tesla_coil"
+    }
+  }
+}

src/generated/resources/assets/extended_industrialization/blockstates/lv_tesla_receiver_hatch.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "extended_industrialization:block/lv_tesla_receiver_hatch"
+    }
+  }
+}

src/generated/resources/assets/extended_industrialization/blockstates/mv_tesla_receiver_hatch.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "extended_industrialization:block/mv_tesla_receiver_hatch"
+    }
+  }
+}

src/generated/resources/assets/extended_industrialization/blockstates/polished_silver_machine_casing.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "extended_industrialization:block/polished_silver_machine_casing"
+    }
+  }
+}

src/generated/resources/assets/extended_industrialization/blockstates/superconductor_tesla_receiver_hatch.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "extended_industrialization:block/superconductor_tesla_receiver_hatch"
+    }
+  }
+}

src/generated/resources/assets/extended_industrialization/blockstates/superconductor_tesla_winding.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "extended_industrialization:block/superconductor_tesla_winding"
+    }
+  }
+}

src/generated/resources/assets/extended_industrialization/blockstates/tesla_coil.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "extended_industrialization:block/tesla_coil"
+    }
+  }
+}

src/generated/resources/assets/extended_industrialization/blockstates/tesla_receiver.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "extended_industrialization:block/tesla_receiver"
+    }
+  }
+}

src/generated/resources/assets/extended_industrialization/blockstates/tesla_tower.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "extended_industrialization:block/tesla_tower"
+    }
+  }
+}

src/generated/resources/assets/extended_industrialization/lang/en_us.json

@@ -1,10 +1,13 @@
 {
+  "block.extended_industrialization.aluminum_tesla_winding": "Aluminum Tesla Winding",
+  "block.extended_industrialization.annealed_copper_tesla_winding": "Annealed Copper Tesla Winding",
   "block.extended_industrialization.blazing_essence": "Blazing Essence",
   "block.extended_industrialization.bronze_bending_machine": "Bronze Bending Machine",
   "block.extended_industrialization.bronze_composter": "Bronze Composter",
   "block.extended_industrialization.bronze_solar_boiler": "Bronze Solar Boiler",
   "block.extended_industrialization.bronze_waste_collector": "Bronze Waste Collector",
   "block.extended_industrialization.composted_manure": "Composted Manure",
+  "block.extended_industrialization.copper_tesla_winding": "Copper Tesla Winding",
   "block.extended_industrialization.distilled_water": "Distilled Water",
   "block.extended_industrialization.electric_alloy_smelter": "Electric Alloy Smelter",
   "block.extended_industrialization.electric_bending_machine": "Electric Bending Machine",
@@ -14,23 +17,27 @@
   "block.extended_industrialization.electric_farmer": "Electric Farmer",
   "block.extended_industrialization.electric_honey_extractor": "Electric Honey Extractor",
   "block.extended_industrialization.electric_waste_collector": "Electric Waste Collector",
-  "block.extended_industrialization.global_wireless_charging_station": "Global Wireless Charging Station",
+  "block.extended_industrialization.electrum_tesla_winding": "Electrum Tesla Winding",
+  "block.extended_industrialization.ev_tesla_receiver_hatch": "EV Tesla Receiver Hatch",
   "block.extended_industrialization.honey": "Honey",
   "block.extended_industrialization.hv_solar_panel": "HV Solar Panel",
-  "block.extended_industrialization.interdimensional_wireless_charging_station": "Interdimensional Wireless Charging Station",
+  "block.extended_industrialization.hv_tesla_receiver_hatch": "HV Tesla Receiver Hatch",
   "block.extended_industrialization.large_configurable_chest": "Large Configurable Chest",
   "block.extended_industrialization.large_electric_furnace": "Large Electric Furnace",
   "block.extended_industrialization.large_electric_macerator": "Large Electric Macerator",
   "block.extended_industrialization.large_steam_furnace": "Large Steam Furnace",
   "block.extended_industrialization.large_steam_macerator": "Large Steam Macerator",
-  "block.extended_industrialization.local_wireless_charging_station": "Local Wireless Charging Station",
+  "block.extended_industrialization.lethal_tesla_coil": "Lethal Tesla Coil",
   "block.extended_industrialization.lv_solar_panel": "LV Solar Panel",
+  "block.extended_industrialization.lv_tesla_receiver_hatch": "LV Tesla Receiver Hatch",
   "block.extended_industrialization.machine_chainer": "Machine Chainer",
   "block.extended_industrialization.machine_chainer_relay": "Machine Chainer Relay",
   "block.extended_industrialization.manure": "Manure",
   "block.extended_industrialization.mv_solar_panel": "MV Solar Panel",
+  "block.extended_industrialization.mv_tesla_receiver_hatch": "MV Tesla Receiver Hatch",
   "block.extended_industrialization.npk_fertilizer": "NPK Fertilizer",
   "block.extended_industrialization.phosphoric_acid": "Phosphoric Acid",
+  "block.extended_industrialization.polished_silver_machine_casing": "Polished Silver Machine Casing",
   "block.extended_industrialization.potassium_chloride": "Potassium Chloride",
   "block.extended_industrialization.potassium_hydroxide": "Potassium Hydroxide",
   "block.extended_industrialization.processing_array": "Processing Array",
@@ -44,7 +51,13 @@
   "block.extended_industrialization.steel_plated_bricks": "Steel Plated Bricks",
   "block.extended_industrialization.steel_solar_boiler": "Steel Solar Boiler",
   "block.extended_industrialization.steel_waste_collector": "Steel Waste Collector",
+  "block.extended_industrialization.superconductor_tesla_receiver_hatch": "SV Tesla Receiver Hatch",
+  "block.extended_industrialization.superconductor_tesla_winding": "Superconductor Tesla Winding",
+  "block.extended_industrialization.tesla_coil": "Tesla Coil",
+  "block.extended_industrialization.tesla_receiver": "Tesla Receiver",
+  "block.extended_industrialization.tesla_tower": "Tesla Tower",
   "block.extended_industrialization.universal_transformer": "Universal Transformer",
+  "death.attack.extended_industrialization.tesla": "%1$s was electrocuted to death",
   "item.extended_industrialization.blazing_essence_bucket": "Blazing Essence Bucket",
   "item.extended_industrialization.canned_food": "Canned Food",
   "item.extended_industrialization.composted_manure_bucket": "Composted Manure Bucket",
@@ -71,8 +84,13 @@
   "item.extended_industrialization.phosphoric_acid_bucket": "Phosphoric Acid Bucket",
   "item.extended_industrialization.potassium_chloride_bucket": "Potassium Chloride Bucket",
   "item.extended_industrialization.potassium_hydroxide_bucket": "Potassium Hydroxide Bucket",
+  "item.extended_industrialization.silver_curved_plate": "Silver Curved Plate",
+  "item.extended_industrialization.silver_tesla_top_load": "Silver Tesla Top Load",
   "item.extended_industrialization.steam_chainsaw": "Steam Chainsaw",
   "item.extended_industrialization.steel_combine": "Steel Combine",
+  "item.extended_industrialization.tesla_calibrator": "Tesla Calibrator",
+  "item.extended_industrialization.tesla_handheld_receiver": "Tesla Handheld Receiver",
+  "item.extended_industrialization.tesla_interdimensional_upgrade": "Tesla Interdimensional Upgrade",
   "item.extended_industrialization.tin_can": "Tin Can",
   "item.extended_industrialization.ultimate_laser_drill": "Ultimate Laser Drill",
   "itemGroup.extended_industrialization.extended_industrialization": "Extended Industrialization",
@@ -98,14 +116,26 @@
   "tag.item.extended_industrialization.farmer_voidable": "Farmer Voidable",
   "tag.item.extended_industrialization.photovoltaic_cell": "Photovoltaic Cells",
   "tag.item.extended_industrialization.rainbow_dyeable": "Rainbow Dyeable",
+  "teslatower_tier.extended_industrialization.extended_industrialization.aluminum_tesla_winding": "Aluminum",
+  "teslatower_tier.extended_industrialization.extended_industrialization.annealed_copper_tesla_winding": "Annealed Copper",
+  "teslatower_tier.extended_industrialization.extended_industrialization.copper_tesla_winding": "Copper",
+  "teslatower_tier.extended_industrialization.extended_industrialization.electrum_tesla_winding": "Electrum",
+  "teslatower_tier.extended_industrialization.extended_industrialization.superconductor_tesla_winding": "Superconductor",
   "text.extended_industrialization.activated": "Activated",
   "text.extended_industrialization.brewery_brews_multiple": "Brews %s potions at a time.",
   "text.extended_industrialization.brewery_requires_blazing_essence": "Requires %s to brew potions.",
   "text.extended_industrialization.calcification_percentage": "Calcification: %d %%",
-  "text.extended_industrialization.charging_station_global": "Charges items in your inventory while within the same dimension.",
-  "text.extended_industrialization.charging_station_interdimensional": "Charges items in your inventory while in any dimension.",
-  "text.extended_industrialization.charging_station_ranged": "Charges items in your inventory while within %d blocks.",
   "text.extended_industrialization.coils_lef_tier": "Runs LEF in batches of up to %d at %s the EU cost.",
+  "text.extended_industrialization.command_tesla_network_dump_cant_have_network": "The block at %s is not a network part.",
+  "text.extended_industrialization.command_tesla_network_dump_chunk_not_loaded": "Chunk at %s is not loaded.",
+  "text.extended_industrialization.command_tesla_network_dump_no_network": "No existing network could be found for %s.",
+  "text.extended_industrialization.command_tesla_network_dump_result_1": "Dumping data on network of %s:",
+  "text.extended_industrialization.command_tesla_network_dump_result_2": "* Key: %s",
+  "text.extended_industrialization.command_tesla_network_dump_result_3": "* Transmitter: %s",
+  "text.extended_industrialization.command_tesla_network_dump_result_4": "* Receiver Count: %d / %d (linked / loaded)",
+  "text.extended_industrialization.command_tesla_network_dump_result_no_transmitter": "Not loaded",
+  "text.extended_industrialization.command_tesla_network_dump_result_yes_transmitter": "%s\n  * Ticking: %s\n  * Voltage: %s",
+  "text.extended_industrialization.damage": "%d ❤",
   "text.extended_industrialization.deactivated": "Deactivated",
   "text.extended_industrialization.dyeable_and_trimmable_help": "- Can be dyed and trimmed!",
   "text.extended_industrialization.dyeable_help": "- Can be dyed!",
@@ -194,7 +224,48 @@
   "text.extended_industrialization.steam_chainsaw_1": "- Press %s on still or flowing water to fill.",
   "text.extended_industrialization.steam_chainsaw_2": "- Place fuel inside the chainsaw using %s.",
   "text.extended_industrialization.steam_chainsaw_3": "- Toggle Silk Touch with %s + %s.",
+  "text.extended_industrialization.tesla_calibrator_clear": "Cleared selection from tesla calibrator.",
+  "text.extended_industrialization.tesla_calibrator_help_1": "- Press %s + %s on a transmitter to save its position in the calibrator.",
+  "text.extended_industrialization.tesla_calibrator_help_2": "- Use %s on a Tesla Receiver to link it to the selected transmitter.",
+  "text.extended_industrialization.tesla_calibrator_help_3": "- (Optional) Hold in off-hand when placing receivers to automatically link.",
+  "text.extended_industrialization.tesla_calibrator_help_4": "- Clear using %s + %s on air.",
+  "text.extended_industrialization.tesla_calibrator_link_failed_no_selection": "Failed to link receiver because no transmitter is selected.",
+  "text.extended_industrialization.tesla_calibrator_link_success": "Linked receiver to selected transmitter.",
+  "text.extended_industrialization.tesla_calibrator_linked": "Linked to %s",
+  "text.extended_industrialization.tesla_calibrator_selected": "Selected transmitter for calibration.",
+  "text.extended_industrialization.tesla_coil_help_1": "Wirelessly transmits energy to linked receivers within %d blocks.",
+  "text.extended_industrialization.tesla_coil_help_2": "Voltage of energy transmitted is set by the hull provided. Higher voltages have an increased passive drain.",
+  "text.extended_industrialization.tesla_handheld_clear": "Cleared selected transmitter.",
+  "text.extended_industrialization.tesla_handheld_help_1": "Receives energy from a linked transmitter within range and charges items while in your inventory.",
+  "text.extended_industrialization.tesla_handheld_help_2": "Tesla Calibration:",
+  "text.extended_industrialization.tesla_handheld_help_3": "- Press %s on a transmitter to link the receiver to it.",
+  "text.extended_industrialization.tesla_handheld_help_4": "- Clear using %s + %s on air.",
+  "text.extended_industrialization.tesla_handheld_linked": "Linked to %s",
+  "text.extended_industrialization.tesla_handheld_selected": "Selected transmitter for receiving.",
+  "text.extended_industrialization.tesla_interdimensional_upgrade_help": "Removes the range limitation on a Tesla Tower and allows it to transmit energy across dimensions.",
+  "text.extended_industrialization.tesla_lethal_coil_help_1": "Deals damage to entities within %s blocks while powered.",
+  "text.extended_industrialization.tesla_lethal_coil_values": "Voltage determines the amount of damage dealt and energy required:",
+  "text.extended_industrialization.tesla_lethal_coil_voltage_value": "  - %s: %s for %s",
+  "text.extended_industrialization.tesla_network_receiver_linked": "Linked to %s",
+  "text.extended_industrialization.tesla_network_receiver_mismatching_voltage": "Cannot receive %s power",
+  "text.extended_industrialization.tesla_network_receiver_no_link": "Not linked to any transmitter",
+  "text.extended_industrialization.tesla_network_receiver_too_far": "Transmitter is too far",
+  "text.extended_industrialization.tesla_network_receiver_unloaded": "Transmitter is not loaded",
+  "text.extended_industrialization.tesla_network_singing_note": "Note: %s",
+  "text.extended_industrialization.tesla_network_transmitter_consuming": "Consuming: %s",
+  "text.extended_industrialization.tesla_network_transmitter_drain": "Drain: %s",
+  "text.extended_industrialization.tesla_network_transmitter_receivers": "Receivers: %d",
+  "text.extended_industrialization.tesla_network_transmitter_transmitting": "Transmitting: %s (%s)",
+  "text.extended_industrialization.tesla_receiver_help_1": "Can receive energy from a linked transmitter.",
+  "text.extended_industrialization.tesla_receiver_help_2": "Must accept energy of the same voltage as the linked transmitter.",
+  "text.extended_industrialization.tesla_tower_help_1": "Wirelessly transmits energy to linked receivers within range.",
+  "text.extended_industrialization.tesla_tower_help_2": "Energy transfer rate, range, and passive drain is determined by the windings used.",
+  "text.extended_industrialization.tesla_tower_help_3": "Voltage of energy transmitted is set by the energy hatches. All hatches must be the same tier.",
+  "text.extended_industrialization.tesla_tower_mismatching_hatches": "All energy hatches must be of the same voltage.",
+  "text.extended_industrialization.tesla_tower_no_energy_hatches": "No energy hatches provided",
+  "text.extended_industrialization.tesla_tower_upgrade": "Add tesla upgrades to increase maximum range.",
   "text.extended_industrialization.universal_transformer_from_tier_input": "Hull for cable tier to convert from (LV by default).",
   "text.extended_industrialization.universal_transformer_to_tier_input": "Hull for cable tier to convert to (LV by default).",
-  "text.extended_industrialization.waste_collector_help": "When placed underneath animals, manure will be collected."
+  "text.extended_industrialization.waste_collector_help": "When placed underneath animals, manure will be collected.",
+  "text.extended_industrialization.windings_tesla_tower_tier": "Allows the Tesla Tower to transmit up to %s within %s blocks with a passive drain of %s."
 }

src/generated/resources/assets/extended_industrialization/models/block/aluminum_tesla_winding.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column",
+  "textures": {
+    "end": "extended_industrialization:block/aluminum_tesla_winding_end",
+    "side": "extended_industrialization:block/aluminum_tesla_winding_side"
+  }
+}

src/generated/resources/assets/extended_industrialization/models/block/annealed_copper_tesla_winding.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column",
+  "textures": {
+    "end": "extended_industrialization:block/annealed_copper_tesla_winding_end",
+    "side": "extended_industrialization:block/annealed_copper_tesla_winding_side"
+  }
+}

src/generated/resources/assets/extended_industrialization/models/block/copper_tesla_winding.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column",
+  "textures": {
+    "end": "extended_industrialization:block/copper_tesla_winding_end",
+    "side": "extended_industrialization:block/copper_tesla_winding_side"
+  }
+}

src/generated/resources/assets/extended_industrialization/models/block/electrum_tesla_winding.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column",
+  "textures": {
+    "end": "extended_industrialization:block/electrum_tesla_winding_end",
+    "side": "extended_industrialization:block/electrum_tesla_winding_side"
+  }
+}