diff --git a/TEXTURE_CREDITS.txt b/TEXTURE_CREDITS.txt new file mode 100644 index 0000000..eed7513 --- /dev/null +++ b/TEXTURE_CREDITS.txt @@ -0,0 +1,69 @@ + +Vanilla-style 16x assets for Power Advantage + +============================================================================== +LICENSE +============================================================================== + +This mod does NOT have a single license: + + - 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. No file in + this pack contains futureazoo's artwork. + - NOT covered by LGPL 2.1: three textures are unchanged Minecraft + textures and remain the property of Mojang Studios, as do textures based + on vanilla shapes (see "Other material"). + +============================================================================== +FUTUREAZOO - ACKNOWLEDGEMENT (palette and style only) +============================================================================== + +Artist: futureazoo +Source: TextureRepository, https://github.com/Futureazoo/TextureRepository + (folder: futureazoo/) + +Colours and style in this pack were taken from futureazoo's work: + - Iron ramp (353535 to e5e5e5), sampled from futureazoo's iron machine set. + - Durasteel ramp (525660 to e9eaec), sampled from the durasteel set. + - Brass ramp (6b4e00 to f3d174), sampled from the bronze machine set. + - The plate style - dark 1px outline, top-left highlight, brushed rows, + corner rivets - follows futureazoo's machine plates. + +Used in every texture in this pack except block/materials/plastic, block/materials/stone, +block/materials/stone_brick, block/materials/wood, the infinite sources and the +items: the machine panels, +item filters, fluid drain, discharge, tank, pipe and valve, conveyor, steel +frame, TechReborn converter, and the steel, steel_dark, iron, invar, brass, +copper and metal_panel materials. + +This is a thank-you credit. These textures were drawn for this pack and +contain none of futureazoo's artwork, so futureazoo's CC BY-NC-SA 4.0 license +does not apply to them; they are LGPL 2.1 like the rest of this pack. + +============================================================================== +OTHER MATERIAL +============================================================================== + +Minecraft (Mojang Studios) - not Minecraft Mod Development group's: + - block/materials/stone.png, block/materials/stone_brick.png and block/materials/wood.png are + the vanilla stone, stone_bricks and oak_planks textures, unchanged. + - item/bucket_crude_oil.png and item/bucket_refined_oil.png use the vanilla + lava bucket's pixel layout with new colours. + - item/bioplastic_ingot.png uses the vanilla iron ingot shape with new + colours. + - item/starch.png follows the shape of vanilla sugar. + - Some colours were sampled from vanilla textures. + +Drawn for this pack (Minecraft Mod Development group; LGPL 2.1), besides the +textures above: block/infinite_power.png, block/infinite_steam.png and +block/infinite_quantum.png (sandbox-style purple sources), and the conveyor belt +(block/item_conveyor_top.png). The infinite_electricity, infinite_steam and +infinite_quantum block models were changed to use the new infinite textures. + +Power Advantage is a mod by DrCyano. The sprocket item is the mod's original +texture and is not included in this pack. + +This pack is not affiliated with or endorsed by Mojang Studios, Microsoft, +DrCyano or futureazoo. diff --git a/src/main/resources/assets/poweradvantage/models/block/infinite_electricity.json b/src/main/resources/assets/poweradvantage/models/block/infinite_electricity.json index 0372e84..5524189 100644 --- a/src/main/resources/assets/poweradvantage/models/block/infinite_electricity.json +++ b/src/main/resources/assets/poweradvantage/models/block/infinite_electricity.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "poweradvantage:block/materials/metal_panel" - } +{ + "parent": "block/cube_all", + "textures": { + "all": "poweradvantage:block/infinite_power" + } } \ No newline at end of file diff --git a/src/main/resources/assets/poweradvantage/models/block/infinite_quantum.json b/src/main/resources/assets/poweradvantage/models/block/infinite_quantum.json index 0372e84..dbf8a7b 100644 --- a/src/main/resources/assets/poweradvantage/models/block/infinite_quantum.json +++ b/src/main/resources/assets/poweradvantage/models/block/infinite_quantum.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "poweradvantage:block/materials/metal_panel" - } +{ + "parent": "block/cube_all", + "textures": { + "all": "poweradvantage:block/infinite_quantum" + } } \ No newline at end of file diff --git a/src/main/resources/assets/poweradvantage/models/block/infinite_steam.json b/src/main/resources/assets/poweradvantage/models/block/infinite_steam.json index 0372e84..1c0c63a 100644 --- a/src/main/resources/assets/poweradvantage/models/block/infinite_steam.json +++ b/src/main/resources/assets/poweradvantage/models/block/infinite_steam.json @@ -1,6 +1,6 @@ -{ - "parent": "block/cube_all", - "textures": { - "all": "poweradvantage:block/materials/metal_panel" - } +{ + "parent": "block/cube_all", + "textures": { + "all": "poweradvantage:block/infinite_steam" + } } \ No newline at end of file diff --git a/src/main/resources/assets/poweradvantage/textures/block/filter_bottom.png b/src/main/resources/assets/poweradvantage/textures/block/filter_bottom.png index c3ef457..29e89e5 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/filter_bottom.png and b/src/main/resources/assets/poweradvantage/textures/block/filter_bottom.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/filter_side_block.png b/src/main/resources/assets/poweradvantage/textures/block/filter_side_block.png index cc0f60d..0daff6e 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/filter_side_block.png and b/src/main/resources/assets/poweradvantage/textures/block/filter_side_block.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/filter_side_food.png b/src/main/resources/assets/poweradvantage/textures/block/filter_side_food.png index 9a98da3..56a7de5 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/filter_side_food.png and b/src/main/resources/assets/poweradvantage/textures/block/filter_side_food.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/filter_side_fuel.png b/src/main/resources/assets/poweradvantage/textures/block/filter_side_fuel.png index b71fb85..b210ce6 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/filter_side_fuel.png and b/src/main/resources/assets/poweradvantage/textures/block/filter_side_fuel.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/filter_side_inventory.png b/src/main/resources/assets/poweradvantage/textures/block/filter_side_inventory.png index db54b07..3e26163 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/filter_side_inventory.png and b/src/main/resources/assets/poweradvantage/textures/block/filter_side_inventory.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/filter_side_ore.png b/src/main/resources/assets/poweradvantage/textures/block/filter_side_ore.png index ada3c17..7699801 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/filter_side_ore.png and b/src/main/resources/assets/poweradvantage/textures/block/filter_side_ore.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/filter_side_overflow.png b/src/main/resources/assets/poweradvantage/textures/block/filter_side_overflow.png index ab66c67..a21b306 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/filter_side_overflow.png and b/src/main/resources/assets/poweradvantage/textures/block/filter_side_overflow.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/filter_side_plantable.png b/src/main/resources/assets/poweradvantage/textures/block/filter_side_plantable.png index abf8c9d..6a43738 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/filter_side_plantable.png and b/src/main/resources/assets/poweradvantage/textures/block/filter_side_plantable.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/filter_side_smeltable.png b/src/main/resources/assets/poweradvantage/textures/block/filter_side_smeltable.png index 5ceae50..e34e802 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/filter_side_smeltable.png and b/src/main/resources/assets/poweradvantage/textures/block/filter_side_smeltable.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/fluid_discharge_face.png b/src/main/resources/assets/poweradvantage/textures/block/fluid_discharge_face.png index f7b2278..ed7aac4 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/fluid_discharge_face.png and b/src/main/resources/assets/poweradvantage/textures/block/fluid_discharge_face.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/fluid_discharge_side.png b/src/main/resources/assets/poweradvantage/textures/block/fluid_discharge_side.png index 2c4ff04..9d97736 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/fluid_discharge_side.png and b/src/main/resources/assets/poweradvantage/textures/block/fluid_discharge_side.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/fluid_drain_face.png b/src/main/resources/assets/poweradvantage/textures/block/fluid_drain_face.png index 32a551f..8b489cd 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/fluid_drain_face.png and b/src/main/resources/assets/poweradvantage/textures/block/fluid_drain_face.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/fluid_drain_side.png b/src/main/resources/assets/poweradvantage/textures/block/fluid_drain_side.png index e156264..9d97736 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/fluid_drain_side.png and b/src/main/resources/assets/poweradvantage/textures/block/fluid_drain_side.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/fluid_metal_tank_side.png b/src/main/resources/assets/poweradvantage/textures/block/fluid_metal_tank_side.png index ba016f2..573f2d9 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/fluid_metal_tank_side.png and b/src/main/resources/assets/poweradvantage/textures/block/fluid_metal_tank_side.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/fluid_metal_tank_top.png b/src/main/resources/assets/poweradvantage/textures/block/fluid_metal_tank_top.png index 45084d5..9b072bd 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/fluid_metal_tank_top.png and b/src/main/resources/assets/poweradvantage/textures/block/fluid_metal_tank_top.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/fluid_pipe.png b/src/main/resources/assets/poweradvantage/textures/block/fluid_pipe.png index 7161c8a..d8a6086 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/fluid_pipe.png and b/src/main/resources/assets/poweradvantage/textures/block/fluid_pipe.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/fluid_switch_off.png b/src/main/resources/assets/poweradvantage/textures/block/fluid_switch_off.png index 1d37e80..2b30603 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/fluid_switch_off.png and b/src/main/resources/assets/poweradvantage/textures/block/fluid_switch_off.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/fluid_switch_on.png b/src/main/resources/assets/poweradvantage/textures/block/fluid_switch_on.png index 8229838..50dd8f4 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/fluid_switch_on.png and b/src/main/resources/assets/poweradvantage/textures/block/fluid_switch_on.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/infinite_power.png b/src/main/resources/assets/poweradvantage/textures/block/infinite_power.png new file mode 100644 index 0000000..acb36f5 Binary files /dev/null and b/src/main/resources/assets/poweradvantage/textures/block/infinite_power.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/infinite_quantum.png b/src/main/resources/assets/poweradvantage/textures/block/infinite_quantum.png new file mode 100644 index 0000000..bf37f47 Binary files /dev/null and b/src/main/resources/assets/poweradvantage/textures/block/infinite_quantum.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/infinite_steam.png b/src/main/resources/assets/poweradvantage/textures/block/infinite_steam.png new file mode 100644 index 0000000..5fe7fab Binary files /dev/null and b/src/main/resources/assets/poweradvantage/textures/block/infinite_steam.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/item_conveyor_end.png b/src/main/resources/assets/poweradvantage/textures/block/item_conveyor_end.png index b33edba..bdbacfb 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/item_conveyor_end.png and b/src/main/resources/assets/poweradvantage/textures/block/item_conveyor_end.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/item_conveyor_side.png b/src/main/resources/assets/poweradvantage/textures/block/item_conveyor_side.png index 02f481e..91f659d 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/item_conveyor_side.png and b/src/main/resources/assets/poweradvantage/textures/block/item_conveyor_side.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/item_conveyor_top.png b/src/main/resources/assets/poweradvantage/textures/block/item_conveyor_top.png index 99ab4c8..7b34382 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/item_conveyor_top.png and b/src/main/resources/assets/poweradvantage/textures/block/item_conveyor_top.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/materials/brass.png b/src/main/resources/assets/poweradvantage/textures/block/materials/brass.png index 03fe424..7b22be0 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/materials/brass.png and b/src/main/resources/assets/poweradvantage/textures/block/materials/brass.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/materials/copper.png b/src/main/resources/assets/poweradvantage/textures/block/materials/copper.png index f9a1e05..540b32c 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/materials/copper.png and b/src/main/resources/assets/poweradvantage/textures/block/materials/copper.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/materials/invar.png b/src/main/resources/assets/poweradvantage/textures/block/materials/invar.png index a8cc842..0d1bdcd 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/materials/invar.png and b/src/main/resources/assets/poweradvantage/textures/block/materials/invar.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/materials/iron.png b/src/main/resources/assets/poweradvantage/textures/block/materials/iron.png index 5e32d08..5854c5f 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/materials/iron.png and b/src/main/resources/assets/poweradvantage/textures/block/materials/iron.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/materials/metal_panel.png b/src/main/resources/assets/poweradvantage/textures/block/materials/metal_panel.png index 99ab4c8..9d97736 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/materials/metal_panel.png and b/src/main/resources/assets/poweradvantage/textures/block/materials/metal_panel.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/materials/plastic.png b/src/main/resources/assets/poweradvantage/textures/block/materials/plastic.png index 8912377..26b630f 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/materials/plastic.png and b/src/main/resources/assets/poweradvantage/textures/block/materials/plastic.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/materials/steel.png b/src/main/resources/assets/poweradvantage/textures/block/materials/steel.png index f9337ac..51a0083 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/materials/steel.png and b/src/main/resources/assets/poweradvantage/textures/block/materials/steel.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/materials/steel_dark.png b/src/main/resources/assets/poweradvantage/textures/block/materials/steel_dark.png index 91b6990..9fc215c 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/materials/steel_dark.png and b/src/main/resources/assets/poweradvantage/textures/block/materials/steel_dark.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/materials/stone.png b/src/main/resources/assets/poweradvantage/textures/block/materials/stone.png index f8b2c6e..c0d65be 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/materials/stone.png and b/src/main/resources/assets/poweradvantage/textures/block/materials/stone.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/materials/stone_brick.png b/src/main/resources/assets/poweradvantage/textures/block/materials/stone_brick.png index be68854..1c6bfa3 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/materials/stone_brick.png and b/src/main/resources/assets/poweradvantage/textures/block/materials/stone_brick.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/materials/wood.png b/src/main/resources/assets/poweradvantage/textures/block/materials/wood.png index 2c0e79b..d10cc84 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/materials/wood.png and b/src/main/resources/assets/poweradvantage/textures/block/materials/wood.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/metal_panel.png b/src/main/resources/assets/poweradvantage/textures/block/metal_panel.png index 99ab4c8..9d97736 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/metal_panel.png and b/src/main/resources/assets/poweradvantage/textures/block/metal_panel.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/steel_frame.png b/src/main/resources/assets/poweradvantage/textures/block/steel_frame.png index 7865ad0..8281b28 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/steel_frame.png and b/src/main/resources/assets/poweradvantage/textures/block/steel_frame.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/block/techreborn_converter.png b/src/main/resources/assets/poweradvantage/textures/block/techreborn_converter.png index 0cd9c2b..f360249 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/block/techreborn_converter.png and b/src/main/resources/assets/poweradvantage/textures/block/techreborn_converter.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/item/bioplastic_ingot.png b/src/main/resources/assets/poweradvantage/textures/item/bioplastic_ingot.png index 94f0a97..65e1106 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/item/bioplastic_ingot.png and b/src/main/resources/assets/poweradvantage/textures/item/bioplastic_ingot.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/item/bucket_crude_oil.png b/src/main/resources/assets/poweradvantage/textures/item/bucket_crude_oil.png index 0464fc5..e346967 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/item/bucket_crude_oil.png and b/src/main/resources/assets/poweradvantage/textures/item/bucket_crude_oil.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/item/bucket_refined_oil.png b/src/main/resources/assets/poweradvantage/textures/item/bucket_refined_oil.png index 7ed010e..81e393e 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/item/bucket_refined_oil.png and b/src/main/resources/assets/poweradvantage/textures/item/bucket_refined_oil.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/item/rotator_tool.png b/src/main/resources/assets/poweradvantage/textures/item/rotator_tool.png index 100b832..23fc261 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/item/rotator_tool.png and b/src/main/resources/assets/poweradvantage/textures/item/rotator_tool.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/item/sprocket.png b/src/main/resources/assets/poweradvantage/textures/item/sprocket.png index 28e816d..5456691 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/item/sprocket.png and b/src/main/resources/assets/poweradvantage/textures/item/sprocket.png differ diff --git a/src/main/resources/assets/poweradvantage/textures/item/starch.png b/src/main/resources/assets/poweradvantage/textures/item/starch.png index 7655d1e..fc2f211 100644 Binary files a/src/main/resources/assets/poweradvantage/textures/item/starch.png and b/src/main/resources/assets/poweradvantage/textures/item/starch.png differ