diff --git a/TEXTURE_CREDITS.txt b/TEXTURE_CREDITS.txt new file mode 100644 index 0000000..3980a77 --- /dev/null +++ b/TEXTURE_CREDITS.txt @@ -0,0 +1,153 @@ + +Vanilla-style 16x assets for Electric Advantage + +============================================================================== +LICENSE +============================================================================== + +This mod does NOT have a single license. Different files are under different +terms: + +1. futureazoo-derived files ONLY - CC BY-NC-SA 4.0 + The files listed under "[A] Used directly" below contain futureazoo's + textures (unchanged or modified). Those files, and ONLY those files, are + licensed under Creative Commons Attribution-NonCommercial-ShareAlike 4.0 + International (CC BY-NC-SA 4.0), as futureazoo's license requires: + https://creativecommons.org/licenses/by-nc-sa/4.0/ + +2. Code and the group's own textures - LGPL 2.1 + The mod's code and the textures drawn for this pack are licensed under + the GNU Lesser General Public License, version 2.1 (LGPL 2.1): + https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html + These textures belong to Minecraft Mod Development group. This includes + the textures under "[B]": they were drawn for this pack and contain none + of futureazoo's artwork, so they fall under this point, not point 1. + The files in point 1 stay CC BY-NC-SA 4.0 and are NOT LGPL 2.1. + +3. Not covered by either license + Minecraft assets and anything derived from them remain the property of + Mojang Studios. + +============================================================================== +FUTUREAZOO - ATTRIBUTION +============================================================================== + +Artist: futureazoo +Source: TextureRepository, https://github.com/Futureazoo/TextureRepository + (folder: futureazoo/) +License: CC BY-NC-SA 4.0 + +futureazoo's work is used in two ways in this pack: + [A] used directly: the texture appears in the pack, unchanged or modified + as noted. These files are CC BY-NC-SA 4.0. + [B] palette and style: colours were sampled from futureazoo's textures and + used in textures drawn for this pack. Credited as thanks; these files + contain none of futureazoo's artwork and are LGPL 2.1, not CC BY-NC-SA. + +------------------------------------------------------------------------------ +[A] Used directly - Electric Advantage (assets/electricadvantage/textures/) +------------------------------------------------------------------------------ + +Unchanged: + block/machine_side.png <- blocks/tech/iron_furnace_side + block/machine_top.png <- blocks/tech/iron_furnace_top + block/materials/machine_case.png <- blocks/tech/iron_furnace_top + block/machine_back.png <- blocks/tech/iron_noteblock_side + block/electric_furnace_off.png <- blocks/tech/iron_furnace_front_off + block/electric_crusher_off.png <- blocks/tech/iron_macerator_front_off + block/electric_oven_off.png <- blocks/tech/iron_blastfurnace_front_off + block/electric_still_off.png <- blocks/tech/durasteel_eblastfurnace_front_off + block/plastic_refinery_off.png <- blocks/tech/durasteel_furnace_front_off + block/electric_pump_off.png <- blocks/tech/iron_compressor_front + item/alkaline_battery.png <- items/tech/battery_large + item/lithium_battery.png <- items/tech/battery_lithium_ion + item/blank_circuit_board.png <- items/tech/chipset_copper + item/integrated_circuit.png <- items/tech/integrated_circuit + item/psu.png <- items/tech/motor + item/petrolplastic_ingot.png <- items/tech/plastic_bar + item/solder.png <- spritesheets/Tech1.png, sprite at x=144 y=176 + item/control_circuit.png <- spritesheets/Tech1.png, sprite at x=384 y=320 + +Modified - green power-indicator LED added (2px, top centre): + block/electric_furnace_powered.png <- iron_furnace_front_off + block/electric_oven_powered.png <- iron_blastfurnace_front_off + block/electric_oven_on.png <- iron_blastfurnace_front_on + block/electric_still_powered.png <- durasteel_eblastfurnace_front_off + block/plastic_refinery_on.png <- durasteel_furnace_front_on + block/electric_pump_on.png <- iron_compressor_front + +Modified - LED added, plus other changes: + block/electric_crusher_powered.png <- iron_macerator_front_off + block/electric_crusher_on.png <- iron_macerator_front_off, with + hand-drawn grinding sparks in the slot, + animated (3 frames) + block/electric_furnace_on.png <- iron_furnace_front_on, with hand-drawn + heat glowing in the top window + block/electric_still_on.png <- durasteel_eblastfurnace_front_on, with + the cyan core pulsing, animated (8 frames) + +Modified - recoloured / composited: + block/electric_fabricator_off.png, _powered.png, _on.png + <- blocks/tech/crafting_interface_light; cyan screen dimmed for the + off and powered states; LED added to powered and on; on is + animated (4 frames) with coloured grid lights following the + original mod's fabricator animation + block/electric_battery_array.png + <- blocks/tech/durasteel_anvil_top_0 layered over iron_furnace_top + block/electric_switch_off.png + <- blocks/tech/durasteel_anvil_top_5 layered over iron_furnace_top + block/electric_switch_on.png + <- blocks/tech/durasteel_anvil_top_2 layered over iron_furnace_top + block/electric_drill_off.png, _on.png + <- blocks/tech/durasteel_eblastfurnace_top; hand-drawn cyan core + added to on + block/laser_drill_optic.png, _on.png + <- blocks/tech/durasteel_eblastfurnace_bottom with a hand-drawn + lens (dark when off, red when on) + block/hydroelectric_generator_off.png, _on.png + <- blocks/tech/iron_blastfurnace_top; hand-drawn water at the hub + when on, swirling, animated (6 frames) + block/steam_powered_generator_off.png, _on.png + <- blocks/tech/iron_furnace_top with a hand-drawn turbine disc, gauge + and steam pipe after the original mod's design; on has the LED and + is animated (6 frames: turbine turns, needle sweeps) + block/growth_chamber_off.png, _powered.png, _on.png, + block/growth_chamber_controller.png + <- blocks/tech/iron_furnace_top with a hand-drawn green window + (sprouts when on, a leaf on the controller); LED on powered/on + +------------------------------------------------------------------------------ +[B] Palette and style +------------------------------------------------------------------------------ + +Iron and durasteel - the iron ramp (353535 to e5e5e5) and the bluish +durasteel ramp (525660 to e9eaec) were sampled from futureazoo's iron and +durasteel machine sets. Used in block/laser_turret_base.png (durasteel +plate). + +Cable - the rubber and copper colours of block/electric_conduit.png come +from futureazoo's insulated_cable_copper. + +============================================================================== +OTHER MATERIAL +============================================================================== + +Drawn for this pack (Minecraft Mod Development group; LGPL 2.1): the solar +panel, conduit, LED bar, lead-acid and nickel-metal-hydride batteries, laser +turret base and silicon ingot (item/silicon_ingot.png, redrawn on the outline +of the original mod's silicon ingot). +(Hand-drawn overlays inside the [A] files are part of those files, so those +files as a whole are CC BY-NC-SA 4.0.) + +Minecraft (Mojang Studios) - not covered by this pack's license: + - Lithium and sulfur ore use the vanilla iron ore texture with the ore + pixels recoloured. + - The lithium ingot, nugget and powder, silicon mix, solder mix and sulfur + powder follow vanilla item shapes (iron ingot, iron nugget, glowstone + dust) with new colours. + - Many colours elsewhere were sampled from vanilla textures. + +Electric Advantage is a mod by DrCyano. + +This pack is not affiliated with or endorsed by Mojang Studios, Microsoft, +DrCyano or futureazoo. diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_battery_array.png b/src/main/resources/assets/electricadvantage/textures/block/electric_battery_array.png index a8300b6..7621fb5 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_battery_array.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_battery_array.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_conduit.png b/src/main/resources/assets/electricadvantage/textures/block/electric_conduit.png index 8404a3b..66912f3 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_conduit.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_conduit.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_crusher_off.png b/src/main/resources/assets/electricadvantage/textures/block/electric_crusher_off.png index 41fe2d4..a68dca9 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_crusher_off.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_crusher_off.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_crusher_on.png b/src/main/resources/assets/electricadvantage/textures/block/electric_crusher_on.png index 01b2ab2..eb6c314 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_crusher_on.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_crusher_on.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_crusher_on.png.mcmeta b/src/main/resources/assets/electricadvantage/textures/block/electric_crusher_on.png.mcmeta new file mode 100644 index 0000000..7e77c64 --- /dev/null +++ b/src/main/resources/assets/electricadvantage/textures/block/electric_crusher_on.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_crusher_powered.png b/src/main/resources/assets/electricadvantage/textures/block/electric_crusher_powered.png index 6b246ae..0b4bd0b 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_crusher_powered.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_crusher_powered.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_drill_off.png b/src/main/resources/assets/electricadvantage/textures/block/electric_drill_off.png index 741fafb..7bef717 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_drill_off.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_drill_off.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_drill_on.png b/src/main/resources/assets/electricadvantage/textures/block/electric_drill_on.png index 906c8bf..872ae1b 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_drill_on.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_drill_on.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_fabricator_off.png b/src/main/resources/assets/electricadvantage/textures/block/electric_fabricator_off.png index 5e0426c..643ae25 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_fabricator_off.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_fabricator_off.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_fabricator_on.png b/src/main/resources/assets/electricadvantage/textures/block/electric_fabricator_on.png index d837562..1196ccf 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_fabricator_on.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_fabricator_on.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_fabricator_on.png.mcmeta b/src/main/resources/assets/electricadvantage/textures/block/electric_fabricator_on.png.mcmeta new file mode 100644 index 0000000..7fbc88a --- /dev/null +++ b/src/main/resources/assets/electricadvantage/textures/block/electric_fabricator_on.png.mcmeta @@ -0,0 +1,16 @@ +{ + "animation": { + "frametime": 24, + "interpolate": false, + "frames": [ + 0, + 1, + 3, + 2, + 1, + 3, + 0, + 2 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_fabricator_powered.png b/src/main/resources/assets/electricadvantage/textures/block/electric_fabricator_powered.png index 29b7347..ea95056 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_fabricator_powered.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_fabricator_powered.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_furnace_off.png b/src/main/resources/assets/electricadvantage/textures/block/electric_furnace_off.png index 5c09be8..6e122c5 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_furnace_off.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_furnace_off.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_furnace_on.png b/src/main/resources/assets/electricadvantage/textures/block/electric_furnace_on.png index eaf22d6..9986c65 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_furnace_on.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_furnace_on.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_furnace_powered.png b/src/main/resources/assets/electricadvantage/textures/block/electric_furnace_powered.png index d6cbbee..5613d1a 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_furnace_powered.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_furnace_powered.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_oven_off.png b/src/main/resources/assets/electricadvantage/textures/block/electric_oven_off.png index 6570b90..201811c 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_oven_off.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_oven_off.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_oven_on.png b/src/main/resources/assets/electricadvantage/textures/block/electric_oven_on.png index 39e264c..c72a849 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_oven_on.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_oven_on.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_oven_powered.png b/src/main/resources/assets/electricadvantage/textures/block/electric_oven_powered.png index a5822c8..e15db20 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_oven_powered.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_oven_powered.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_pump_off.png b/src/main/resources/assets/electricadvantage/textures/block/electric_pump_off.png index bf244ff..a8dcd35 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_pump_off.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_pump_off.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_pump_on.png b/src/main/resources/assets/electricadvantage/textures/block/electric_pump_on.png index 13a926f..f3676ab 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_pump_on.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_pump_on.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_still_off.png b/src/main/resources/assets/electricadvantage/textures/block/electric_still_off.png index f5bc01f..95f6457 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_still_off.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_still_off.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_still_on.png b/src/main/resources/assets/electricadvantage/textures/block/electric_still_on.png index 06b664a..04f7b74 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_still_on.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_still_on.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_still_on.png.mcmeta b/src/main/resources/assets/electricadvantage/textures/block/electric_still_on.png.mcmeta new file mode 100644 index 0000000..7e77c64 --- /dev/null +++ b/src/main/resources/assets/electricadvantage/textures/block/electric_still_on.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_still_powered.png b/src/main/resources/assets/electricadvantage/textures/block/electric_still_powered.png index ed2621b..f76571f 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_still_powered.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_still_powered.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_switch_off.png b/src/main/resources/assets/electricadvantage/textures/block/electric_switch_off.png index 43e776d..219508e 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_switch_off.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_switch_off.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/electric_switch_on.png b/src/main/resources/assets/electricadvantage/textures/block/electric_switch_on.png index 04b0b96..97c50e9 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/electric_switch_on.png and b/src/main/resources/assets/electricadvantage/textures/block/electric_switch_on.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/growth_chamber_controller.png b/src/main/resources/assets/electricadvantage/textures/block/growth_chamber_controller.png index 51bcf1e..c364815 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/growth_chamber_controller.png and b/src/main/resources/assets/electricadvantage/textures/block/growth_chamber_controller.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/growth_chamber_off.png b/src/main/resources/assets/electricadvantage/textures/block/growth_chamber_off.png index dfb775a..56a7b97 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/growth_chamber_off.png and b/src/main/resources/assets/electricadvantage/textures/block/growth_chamber_off.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/growth_chamber_on.png b/src/main/resources/assets/electricadvantage/textures/block/growth_chamber_on.png index ce03f17..386af8c 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/growth_chamber_on.png and b/src/main/resources/assets/electricadvantage/textures/block/growth_chamber_on.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/growth_chamber_powered.png b/src/main/resources/assets/electricadvantage/textures/block/growth_chamber_powered.png index 3e2e921..d1c1d7a 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/growth_chamber_powered.png and b/src/main/resources/assets/electricadvantage/textures/block/growth_chamber_powered.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/hydroelectric_generator_off.png b/src/main/resources/assets/electricadvantage/textures/block/hydroelectric_generator_off.png index 27c1eb2..dad6f68 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/hydroelectric_generator_off.png and b/src/main/resources/assets/electricadvantage/textures/block/hydroelectric_generator_off.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/hydroelectric_generator_on.png b/src/main/resources/assets/electricadvantage/textures/block/hydroelectric_generator_on.png index a780df0..f7ba2c7 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/hydroelectric_generator_on.png and b/src/main/resources/assets/electricadvantage/textures/block/hydroelectric_generator_on.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/hydroelectric_generator_on.png.mcmeta b/src/main/resources/assets/electricadvantage/textures/block/hydroelectric_generator_on.png.mcmeta new file mode 100644 index 0000000..7e77c64 --- /dev/null +++ b/src/main/resources/assets/electricadvantage/textures/block/hydroelectric_generator_on.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/textures/block/laser_drill_optic.png b/src/main/resources/assets/electricadvantage/textures/block/laser_drill_optic.png index 6a4a326..99e5c79 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/laser_drill_optic.png and b/src/main/resources/assets/electricadvantage/textures/block/laser_drill_optic.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/laser_drill_optic_on.png b/src/main/resources/assets/electricadvantage/textures/block/laser_drill_optic_on.png index 1e93225..b168768 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/laser_drill_optic_on.png and b/src/main/resources/assets/electricadvantage/textures/block/laser_drill_optic_on.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/laser_turret_base.png b/src/main/resources/assets/electricadvantage/textures/block/laser_turret_base.png index 21cf9ec..c146afb 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/laser_turret_base.png and b/src/main/resources/assets/electricadvantage/textures/block/laser_turret_base.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/led_bar_off.png b/src/main/resources/assets/electricadvantage/textures/block/led_bar_off.png index 4896cfe..464f070 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/led_bar_off.png and b/src/main/resources/assets/electricadvantage/textures/block/led_bar_off.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/led_bar_on.png b/src/main/resources/assets/electricadvantage/textures/block/led_bar_on.png index b719a33..39505e4 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/led_bar_on.png and b/src/main/resources/assets/electricadvantage/textures/block/led_bar_on.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/lithium_ore.png b/src/main/resources/assets/electricadvantage/textures/block/lithium_ore.png index 6283e67..c64b9b2 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/lithium_ore.png and b/src/main/resources/assets/electricadvantage/textures/block/lithium_ore.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/machine_back.png b/src/main/resources/assets/electricadvantage/textures/block/machine_back.png index a2c7dd4..00510ce 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/machine_back.png and b/src/main/resources/assets/electricadvantage/textures/block/machine_back.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/machine_side.png b/src/main/resources/assets/electricadvantage/textures/block/machine_side.png index 34e60fd..22d5142 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/machine_side.png and b/src/main/resources/assets/electricadvantage/textures/block/machine_side.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/machine_top.png b/src/main/resources/assets/electricadvantage/textures/block/machine_top.png index dbefc2c..e5df062 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/machine_top.png and b/src/main/resources/assets/electricadvantage/textures/block/machine_top.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/materials/machine_case.png b/src/main/resources/assets/electricadvantage/textures/block/materials/machine_case.png index dbefc2c..e5df062 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/materials/machine_case.png and b/src/main/resources/assets/electricadvantage/textures/block/materials/machine_case.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/photovoltaic_cell.png b/src/main/resources/assets/electricadvantage/textures/block/photovoltaic_cell.png index 8d310ae..d45238a 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/photovoltaic_cell.png and b/src/main/resources/assets/electricadvantage/textures/block/photovoltaic_cell.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/plastic_refinery_off.png b/src/main/resources/assets/electricadvantage/textures/block/plastic_refinery_off.png index ae0353d..ae33282 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/plastic_refinery_off.png and b/src/main/resources/assets/electricadvantage/textures/block/plastic_refinery_off.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/plastic_refinery_on.png b/src/main/resources/assets/electricadvantage/textures/block/plastic_refinery_on.png index 629ba27..46b3010 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/plastic_refinery_on.png and b/src/main/resources/assets/electricadvantage/textures/block/plastic_refinery_on.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/steam_powered_generator_off.png b/src/main/resources/assets/electricadvantage/textures/block/steam_powered_generator_off.png index b7fcd26..e15cf76 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/steam_powered_generator_off.png and b/src/main/resources/assets/electricadvantage/textures/block/steam_powered_generator_off.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/steam_powered_generator_on.png b/src/main/resources/assets/electricadvantage/textures/block/steam_powered_generator_on.png index 511297b..2b51ec5 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/steam_powered_generator_on.png and b/src/main/resources/assets/electricadvantage/textures/block/steam_powered_generator_on.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/block/steam_powered_generator_on.png.mcmeta b/src/main/resources/assets/electricadvantage/textures/block/steam_powered_generator_on.png.mcmeta new file mode 100644 index 0000000..034019f --- /dev/null +++ b/src/main/resources/assets/electricadvantage/textures/block/steam_powered_generator_on.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/electricadvantage/textures/block/sulfur_ore.png b/src/main/resources/assets/electricadvantage/textures/block/sulfur_ore.png index d083aa2..a3af2e4 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/block/sulfur_ore.png and b/src/main/resources/assets/electricadvantage/textures/block/sulfur_ore.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/item/alkaline_battery.png b/src/main/resources/assets/electricadvantage/textures/item/alkaline_battery.png index 0212351..4829983 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/item/alkaline_battery.png and b/src/main/resources/assets/electricadvantage/textures/item/alkaline_battery.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/item/blank_circuit_board.png b/src/main/resources/assets/electricadvantage/textures/item/blank_circuit_board.png index 3800d98..1d61ae8 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/item/blank_circuit_board.png and b/src/main/resources/assets/electricadvantage/textures/item/blank_circuit_board.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/item/control_circuit.png b/src/main/resources/assets/electricadvantage/textures/item/control_circuit.png index 0c9d63b..921bd30 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/item/control_circuit.png and b/src/main/resources/assets/electricadvantage/textures/item/control_circuit.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/item/integrated_circuit.png b/src/main/resources/assets/electricadvantage/textures/item/integrated_circuit.png index 80500b2..31b144e 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/item/integrated_circuit.png and b/src/main/resources/assets/electricadvantage/textures/item/integrated_circuit.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/item/lead_acid_battery.png b/src/main/resources/assets/electricadvantage/textures/item/lead_acid_battery.png index dd9387d..8f76e39 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/item/lead_acid_battery.png and b/src/main/resources/assets/electricadvantage/textures/item/lead_acid_battery.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/item/lithium_battery.png b/src/main/resources/assets/electricadvantage/textures/item/lithium_battery.png index 00a8a3a..5f52b69 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/item/lithium_battery.png and b/src/main/resources/assets/electricadvantage/textures/item/lithium_battery.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/item/lithium_dust.png b/src/main/resources/assets/electricadvantage/textures/item/lithium_dust.png index f346ac6..7bb5f04 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/item/lithium_dust.png and b/src/main/resources/assets/electricadvantage/textures/item/lithium_dust.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/item/lithium_ingot.png b/src/main/resources/assets/electricadvantage/textures/item/lithium_ingot.png index 3c857fb..4820d9a 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/item/lithium_ingot.png and b/src/main/resources/assets/electricadvantage/textures/item/lithium_ingot.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/item/lithium_nugget.png b/src/main/resources/assets/electricadvantage/textures/item/lithium_nugget.png index 3064eed..818f2f1 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/item/lithium_nugget.png and b/src/main/resources/assets/electricadvantage/textures/item/lithium_nugget.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/item/nickel_hydride_battery.png b/src/main/resources/assets/electricadvantage/textures/item/nickel_hydride_battery.png index 8512366..e5e72c5 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/item/nickel_hydride_battery.png and b/src/main/resources/assets/electricadvantage/textures/item/nickel_hydride_battery.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/item/petrolplastic_ingot.png b/src/main/resources/assets/electricadvantage/textures/item/petrolplastic_ingot.png index c71d52a..63b4566 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/item/petrolplastic_ingot.png and b/src/main/resources/assets/electricadvantage/textures/item/petrolplastic_ingot.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/item/psu.png b/src/main/resources/assets/electricadvantage/textures/item/psu.png index 565c7d0..61fddca 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/item/psu.png and b/src/main/resources/assets/electricadvantage/textures/item/psu.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/item/silicon_ingot.png b/src/main/resources/assets/electricadvantage/textures/item/silicon_ingot.png index cc421c5..8599d2e 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/item/silicon_ingot.png and b/src/main/resources/assets/electricadvantage/textures/item/silicon_ingot.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/item/silicon_mix.png b/src/main/resources/assets/electricadvantage/textures/item/silicon_mix.png index f8ef4fd..0a8728d 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/item/silicon_mix.png and b/src/main/resources/assets/electricadvantage/textures/item/silicon_mix.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/item/solder.png b/src/main/resources/assets/electricadvantage/textures/item/solder.png index 2169514..c573d70 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/item/solder.png and b/src/main/resources/assets/electricadvantage/textures/item/solder.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/item/solder_mix.png b/src/main/resources/assets/electricadvantage/textures/item/solder_mix.png index d515139..8b5cc72 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/item/solder_mix.png and b/src/main/resources/assets/electricadvantage/textures/item/solder_mix.png differ diff --git a/src/main/resources/assets/electricadvantage/textures/item/sulfur_dust.png b/src/main/resources/assets/electricadvantage/textures/item/sulfur_dust.png index 4738e89..dbc99fe 100644 Binary files a/src/main/resources/assets/electricadvantage/textures/item/sulfur_dust.png and b/src/main/resources/assets/electricadvantage/textures/item/sulfur_dust.png differ