Add files via upload

Fixed passive energy void and active energy source to use EEI.

Author: Silari

changelog.txt

@@ -2,28 +2,28 @@
 Version: 1.8.1
 Date: 2023-02-22
   Changes:
-    - Added a recipe for the vanilla infinity chest. It can be configured to void items by checking the box, or to provide an infinite amount of items by setting the appropriate filters. Several items now use this kind of chest to avoid needing any scripting.
+    - Added a recipe for the vanilla infinity chest. It's use can replace creative chests, duplicating chests, and void chests with proper configuration and much lower UPS costs, as they'll be handled in engine rather than via LUA.
     - Removed belt immunity equipment. This is a vanilla item now, no need for a recipe. We don't have one for all the other regular items.
     - Removed fluid-unknown from fluid source recipes. It's not a real fluid and there's no need for it.
   Bugfixes:
     - Added script_raised_built and script_raised_destroy event handlers for creative mod items.
     - Updated the description for Heat Void to clarify it's always 0C, not room temp.
   Optimizations:
-    - Removed all scripting for fluid-source, fluid-void, super-radar, super-beacon, super-roboport, energy-void, passive-energy-source. They no longer require it. See details below.
+    - Removed all scripting for fluid-source, fluid-void, super-radar, super-beacon, super-roboport, energy-void, energy-source, passive-energy-void, passive-energy-source. They no longer require it. See details below.
     - Changed all creative entities requiring power to use a void energy source, rather than a burner source. Scripting is no longer required to keep these entities powered, and they're less apt to break if moved via script.
         - Removed fuel scripting for creative-lab, item-source, item-duplicator, item-void.
-    - Changed Heat Source and Heat void to use the Heat Interface prototype instead. 
+    - Changed Heat Source and Heat Void to use the Heat Interface prototype instead. 
         - Removed all on-tick scripting for Heat Source and Heat void. There is only a quick script ran on placement that sets the temperature.
         - These look different now due to the differences in how heat-interfaces work - they don't have separate connection sprites like heat pipes do, so they are locked into the 4 way sprite.
     - Changed creative-chest, creative-provider-chest, void chest, void storage chest, and void requester chest to use the vanilla infinity chest. No changes in usage should be present.
         - Removed all on-tick scripting for these entities. There is a quick script ran on placement that sets them up.
-        creative-chest and creative-provider-chest have two minor regressions: 
+        - creative-chest and creative-provider-chest have two minor regressions: 
             - Copy/paste no longer works since the base game considers them non-operable. As it appears this only set the group number, and not the filters, this is fairly minor.
             - The inventory display mode also doesn't do anything for them, since infinity chests sort their contents. Technically it DOES have a slight change in how the filters are set, but as those are only viewable in the editor this isn't particularly useful.
     - Energy void no longer produces an item. Removed scripting related to the item.
         - The scripting to remove it's energy was also removed as it did nothing - it'll always run constantly and drain power as long as there is a supply.
-    - Passive energy source is now an electric interface and requires no LUA scripting to function.
-        - It no longer has a circuit connection due to this change.
+    - Active and Passive Energy Sources and Passive Energy Void are now electric interfaces and require no LUA scripting to function.
+        - They no longer have a circuit connection due to this change.
 ---------------------------------------------------------------------------------------------------
 Version: 1.8.0
 Date: 2022-08-03

control.lua

@@ -13,7 +13,6 @@ require("scripts.duplicating-chest")
 require("scripts.duplicating-chest-util")
 require("scripts.duplicating-provider-chest")
 require("scripts.duplicator")
-require("scripts.energy-source")
 require("scripts.equipments")
 require("scripts.events")
 require("scripts.fluid-providers-util")
@@ -32,7 +31,6 @@ require("scripts.magic-wand-creator")
 require("scripts.magic-wand-healer")
 require("scripts.magic-wand-modifier")
 require("scripts.mod-compatibler")
-require("scripts.passive-energy-void")
 require("scripts.random-item-source")
 require("scripts.remote-interface")
 require("scripts.rights")

prototypes/entity.lua

@@ -1980,7 +1980,7 @@ data:extend({
                                      creative_mode_defines.names.entities.passive_electric_energy_interface}),
 -- Energy Source
 {
-    type = "generator",
+    type = "electric-energy-interface",
     enable_gui = true,
     name = creative_mode_defines.names.entities.energy_source,
     icon_size = 32,
@@ -1995,46 +1995,55 @@ data:extend({
     fast_replaceable_group = creative_mode_defines.names.fast_replaceable_groups.energy_source_void,
     collision_box = {{-0.9, -0.9}, {0.9, 0.9}},
     selection_box = {{-1, -1}, {1, 1}},
-    vehicle_impact_sound = {
-        filename = "__base__/sound/car-metal-impact.ogg",
-        volume = 0.65
-    },
-    effectivity = 1,
-    fluid_usage_per_tick = 1000000000, -- This value affects the maximum energy output. Currently it is 5.4PW (GUI shows 5.1PW)
-    maximum_temperature = 500,
-    fluid_box = {
-        base_area = 1,
-        filter = "water",
-        pipe_connections = {}
-    },
-    fluid_input = {
-        name = "water",
-        amount = 0.0,
-        minimum_temperature = 0
-    },
     energy_source = {
         type = "electric",
-        usage_priority = "primary-output"
+        buffer_capacity = "5.4PW",
+        usage_priority = "primary-output",
+        input_flow_limit = "0W",
+        output_flow_limit = "5.4PW"
     },
-    min_perceived_performance = 1,
-    performance_to_sound_speedup = 0.5,
-    horizontal_animation = {
+    energy_production = "5.4PW",
+    picture = {
         filename = creative_mode_defines.mod_directory .. "/graphics/entity/energy-source.png",
+        priority = "extra-high",
         width = 124,
         height = 103,
         frame_count = 1,
         line_length = 1,
         shift = {0.6875, -0.203125}
     },
-    vertical_animation = {
+    charge_animation = {
+        filename = creative_mode_defines.mod_directory .. "/graphics/entity/energy-source.png",
+        width = 124,
+        height = 103,
+        frame_count = 1,
+        line_length = 1,
+        shift = {0.6875, -0.203125},
+        animation_speed = 0.5
+    },
+    charge_cooldown = 30,
+    charge_light = {
+        intensity = 0.3,
+        size = 7
+    },
+    discharge_animation = {
         filename = creative_mode_defines.mod_directory .. "/graphics/entity/energy-source.png",
         width = 124,
         height = 103,
         frame_count = 1,
         line_length = 1,
-        shift = {0.6875, -0.203125}
+        shift = {0.6875, -0.203125},
+        animation_speed = 0.5
+    },
+    discharge_cooldown = 60,
+    discharge_light = {
+        intensity = 0.7,
+        size = 7
+    },
+    vehicle_impact_sound = {
+        filename = "__base__/sound/car-metal-impact.ogg",
+        volume = 0.65
     },
-    smoke = {},
     working_sound = {
         sound = {
             filename = "__base__/sound/accumulator-working.ogg",
@@ -2123,25 +2132,8 @@ data:extend({
         },
         max_sounds_per_type = 5
     },
-    circuit_wire_connection_point = {
-        shadow = {
-            red = {0.984375, 1.10938},
-            green = {0.890625, 1.10938}
-        },
-        wire = {
-            red = {0.6875, 0.59375},
-            green = {0.6875, 0.71875}
-        }
-    },
-    circuit_connector_sprites = circuit_connector_definitions[creative_mode_defines.names.entities.passive_energy_source]
-        .sprites,
-    circuit_wire_max_distance = 1000,
-    default_output_signal = {
-        type = "virtual",
-        name = "signal-A"
-    }
 },
--- Energy Void
+-- Energy void
 {
     type = "assembling-machine",
     name = creative_mode_defines.names.entities.energy_void,
@@ -2202,8 +2194,10 @@ data:extend({
     ingredient_count = 0,
     module_specification = {},
     allowed_effects = {"pollution"}
-}, {
-    type = "accumulator",
+}, 
+-- Passive energy void
+{
+    type = "assembling-machine",
     name = creative_mode_defines.names.entities.passive_energy_void,
     icon_size = 32,
     icon = creative_mode_defines.mod_directory .. "/graphics/icons/passive-energy-void.png",
@@ -2218,35 +2212,8 @@ data:extend({
     fast_replaceable_group = creative_mode_defines.names.fast_replaceable_groups.energy_source_void,
     collision_box = {{-0.9, -0.9}, {0.9, 0.9}},
     selection_box = {{-1, -1}, {1, 1}},
-    energy_source = {
-        type = "electric",
-        buffer_capacity = "5.4PW",
-        usage_priority = "tertiary",
-        input_flow_limit = "5.4PW",
-        output_flow_limit = "0W"
-    },
-    picture = {
-        filename = creative_mode_defines.mod_directory .. "/graphics/entity/passive-energy-void.png",
-        priority = "extra-high",
-        width = 124,
-        height = 103,
-        shift = {0.6875, -0.203125}
-    },
-    charge_animation = {
-        filename = creative_mode_defines.mod_directory .. "/graphics/entity/passive-energy-void-working.png",
-        width = 147,
-        height = 128,
-        line_length = 8,
-        frame_count = 24,
-        shift = {0.390625, -0.53125},
-        animation_speed = 0.5
-    },
-    charge_cooldown = 30,
-    charge_light = {
-        intensity = 0.3,
-        size = 7
-    },
-    discharge_animation = {
+    fluid_boxes = {},
+    animation = {
         filename = creative_mode_defines.mod_directory .. "/graphics/entity/passive-energy-void-working.png",
         width = 147,
         height = 128,
@@ -2255,15 +2222,18 @@ data:extend({
         shift = {0.390625, -0.53125},
         animation_speed = 0.5
     },
-    discharge_cooldown = 60,
-    discharge_light = {
-        intensity = 0.7,
-        size = 7
-    },
     vehicle_impact_sound = {
         filename = "__base__/sound/car-metal-impact.ogg",
         volume = 0.65
     },
+    open_sound = {
+        filename = "__base__/sound/machine-open.ogg",
+        volume = 0.85
+    },
+    close_sound = {
+        filename = "__base__/sound/machine-close.ogg",
+        volume = 0.75
+    },
     working_sound = {
         sound = {
             filename = "__base__/sound/accumulator-working.ogg",
@@ -2273,26 +2243,23 @@ data:extend({
             filename = "__base__/sound/accumulator-idle.ogg",
             volume = 0.4
         },
-        max_sounds_per_type = 5
+        apparent_volume = 1.5
     },
-    circuit_wire_connection_point = {
-        shadow = {
-            red = {0.984375, 1.10938},
-            green = {0.890625, 1.10938}
-        },
-        wire = {
-            red = {0.6875, 0.59375},
-            green = {0.6875, 0.71875}
-        }
+    crafting_categories = {creative_mode_defines.names.recipe_categories.energy_absorption},
+    fixed_recipe = creative_mode_defines.names.recipes.energy_absorption,
+    crafting_speed = 0.01,
+    energy_source = {
+        type = "electric",
+        usage_priority = "tertiary",
+        emissions_per_minute = 0
     },
-    circuit_connector_sprites = circuit_connector_definitions[creative_mode_defines.names.entities.passive_energy_void]
-        .sprites,
-    circuit_wire_max_distance = 1000,
-    default_output_signal = {
-        type = "virtual",
-        name = "signal-A"
-    }
-}, {
+    energy_usage = "5.4PW",
+    ingredient_count = 0,
+    module_specification = {},
+    allowed_effects = {"pollution"}
+},
+-- Super electric pole
+{
     type = "electric-pole",
     name = creative_mode_defines.names.entities.super_electric_pole,
     icon_size = 32,
@@ -2376,7 +2343,9 @@ data:extend({
         height = 12,
         priority = "extra-high-no-scale"
     }
-}, {
+},
+-- Super substation
+{
     type = "electric-pole",
     name = creative_mode_defines.names.entities.super_substation,
     icon_size = 32,
@@ -2476,7 +2445,9 @@ data:extend({
     g = 0,
     b = 1,
     a = 0.4
-}), radar(creative_mode_defines.names.entities.super_radar, creative_mode_defines.names.items.super_radar,
+}), 
+-- Super radar
+radar(creative_mode_defines.names.entities.super_radar, creative_mode_defines.names.items.super_radar,
     "super-radar.png", "super-radar.png", 14),
 -- Super radar MK2
              radar(creative_mode_defines.names.entities.super_radar_2, creative_mode_defines.names.items.super_radar_2,
@@ -2548,4 +2519,5 @@ data:extend({
         module_info_multi_row_initial_height_modifier = -0.3
     }
 }
+
 })

scripts/events.lua

@@ -119,7 +119,9 @@ function events.on_configuration_changed(data)
                 global.creative_mode.super_radar = nil
                 global.creative_mode.super_beacon = nil
                 global.creative_mode.energy_void = nil
+                global.creative_mode.passive_energy_void = nil
                 global.creative_mode.passive_energy_source = nil
+                global.creative_mode.energy_source = nil
                 -- Ensure the tables for the new creative/providers chests exist.
                 if not global.creative_mode.new_creative_chest then
                     global.creative_mode.new_creative_chests = {}
@@ -320,8 +322,6 @@ function events.on_tick()
     duplicator.tick()
     item_void.tick()
     random_item_source.tick()
-    --energy_source.tick()
-    --passive_energy_void.tick()
     equipments.tick()
 end
 

scripts/global-util.lua

@@ -99,12 +99,6 @@ function global_util.initialize_or_update_global()
     if not global.creative_mode.creative_lab_next_update_index then
         global.creative_mode.creative_lab_next_update_index = 1
     end
-    if not global.creative_mode.energy_source then
-        global.creative_mode.energy_source = {}
-    end
-    if not global.creative_mode.passive_energy_void then
-        global.creative_mode.passive_energy_void = {}
-    end
 
     -- Table for storing the equipments that need to be refilled with energy.
     if not global.energy_refill_equipments then
@@ -792,12 +786,6 @@ local register_entity_look_up_functions = {
     [creative_mode_defines.names.entities.void_lab] = function(entity)
         table.insert(global.creative_mode.void_lab, entity)
     end,
-    [creative_mode_defines.names.entities.energy_source] = function(entity)
-        table.insert(global.creative_mode.energy_source, entity)
-    end,
-    [creative_mode_defines.names.entities.passive_energy_void] = function(entity)
-        table.insert(global.creative_mode.passive_energy_void, entity)
-    end,
     [creative_mode_defines.names.entities.alien_attractor_proxy_small] = function(entity)
         entity.surface.build_enemy_base(entity.position, 5)
     end,