From e83429e1bb8de4e5bfe542157595729b5bd88ccb Mon Sep 17 00:00:00 2001 From: yueh Date: Fri, 12 Jun 2020 19:05:29 +0200 Subject: [PATCH] Updated ids to better match vanilla conventions (#4412) Also changed related textures, models and recipes. --- .../java/appeng/api/definitions/IParts.java | 2 - .../render/crafting/CraftingCubeModel.java | 8 +-- .../core/api/definitions/ApiBlocks.java | 8 +-- .../appeng/core/api/definitions/ApiItems.java | 26 +++---- .../core/api/definitions/ApiMaterials.java | 22 +++--- .../appeng/core/api/definitions/ApiParts.java | 8 --- .../fluids/items/BasicFluidStorageCell.java | 8 +-- .../appeng/items/materials/ItemMaterial.java | 16 ++--- .../appeng/items/materials/MaterialType.java | 30 ++++---- .../items/storage/BasicItemStorageCell.java | 8 +-- ...age_16k.json => 16k_crafting_storage.json} | 0 ...orage_1k.json => 1k_crafting_storage.json} | 0 ...orage_4k.json => 4k_crafting_storage.json} | 0 ...age_64k.json => 64k_crafting_storage.json} | 0 .../appliedenergistics2/lang/cs_cz.json | 48 ++++++------- .../appliedenergistics2/lang/de_de.json | 48 ++++++------- .../appliedenergistics2/lang/en_us.json | 64 +++++++++--------- .../appliedenergistics2/lang/es_es.json | 48 ++++++------- .../appliedenergistics2/lang/fr_fr.json | 48 ++++++------- .../appliedenergistics2/lang/it_it.json | 48 ++++++------- .../appliedenergistics2/lang/ko_kr.json | 64 +++++++++--------- .../appliedenergistics2/lang/pt_br.json | 64 +++++++++--------- .../appliedenergistics2/lang/ro_ro.json | 40 +++++------ .../appliedenergistics2/lang/ru_ru.json | 48 ++++++------- .../appliedenergistics2/lang/zh_cn.json | 64 +++++++++--------- .../appliedenergistics2/lang/zh_tw.json | 46 ++++++------- .../models/block/crafting/16k_storage.json | 6 ++ ...6k_formed.json => 16k_storage_formed.json} | 2 +- .../models/block/crafting/1k_storage.json | 6 ++ ..._4k_formed.json => 1k_storage_formed.json} | 2 +- .../models/block/crafting/4k_storage.json | 6 ++ ..._1k_formed.json => 4k_storage_formed.json} | 2 +- .../models/block/crafting/64k_storage.json | 6 ++ ...4k_formed.json => 64k_storage_formed.json} | 2 +- .../models/block/crafting/storage_16k.json | 6 -- .../models/block/crafting/storage_1k.json | 6 -- .../models/block/crafting/storage_4k.json | 6 -- .../models/block/crafting/storage_64k.json | 6 -- .../128_cubed_spatial_cell_component.json | 6 ++ .../item/128_cubed_spatial_storage_cell.json | 6 ++ .../item/16_cubed_spatial_cell_component.json | 6 ++ .../item/16_cubed_spatial_storage_cell.json | 6 ++ .../models/item/16k_cell_component.json | 6 ++ .../models/item/16k_crafting_storage.json | 3 + .../models/item/16k_fluid_cell_component.json | 6 ++ .../models/item/16k_fluid_storage_cell.json | 6 ++ .../models/item/16k_storage_cell.json | 6 ++ .../models/item/1k_cell_component.json | 6 ++ .../models/item/1k_crafting_storage.json | 3 + .../models/item/1k_fluid_cell_component.json | 6 ++ .../models/item/1k_fluid_storage_cell.json | 6 ++ .../models/item/1k_storage_cell.json | 6 ++ .../item/2_cubed_spatial_cell_component.json | 6 ++ .../item/2_cubed_spatial_storage_cell.json | 6 ++ .../models/item/4k_cell_component.json | 6 ++ .../models/item/4k_crafting_storage.json | 3 + .../models/item/4k_fluid_cell_component.json | 6 ++ .../models/item/4k_fluid_storage_cell.json | 6 ++ .../models/item/4k_storage_cell.json | 6 ++ .../models/item/64k_cell_component.json | 6 ++ .../models/item/64k_crafting_storage.json | 3 + .../models/item/64k_fluid_cell_component.json | 6 ++ .../models/item/64k_fluid_storage_cell.json | 6 ++ .../models/item/64k_storage_cell.json | 6 ++ .../models/item/advanced_card.json | 2 +- .../models/item/annihilation_core.json | 2 +- .../models/item/basic_card.json | 2 +- .../models/item/blank_pattern.json | 2 +- .../models/item/calculation_processor.json | 2 +- .../item/calculation_processor_press.json | 2 +- .../item/calculation_processor_print.json | 6 -- .../models/item/capacity_card.json | 2 +- .../models/item/cell16k_part.json | 6 -- .../models/item/cell1k_part.json | 6 -- .../models/item/cell4k_part.json | 6 -- .../models/item/cell64k_part.json | 6 -- .../models/item/certus_quartz_crystal.json | 2 +- .../models/item/certus_quartz_dust.json | 2 +- .../models/item/certus_quartz_shovel.json | 6 ++ .../models/item/certus_quartz_spade.json | 6 -- .../item/charged_certus_quartz_crystal.json | 2 +- .../models/item/crafting_card.json | 2 +- .../models/item/crafting_storage_16k.json | 3 - .../models/item/crafting_storage_1k.json | 3 - .../models/item/crafting_storage_4k.json | 3 - .../models/item/crafting_storage_64k.json | 3 - .../models/item/empty_storage_cell.json | 2 +- .../models/item/ender_dust.json | 2 +- .../models/item/engineering_processor.json | 2 +- .../item/engineering_processor_press.json | 2 +- .../item/engineering_processor_print.json | 6 -- .../models/item/flour.json | 2 +- .../models/item/fluid_cell16k_part.json | 6 -- .../models/item/fluid_cell1k_part.json | 6 -- .../models/item/fluid_cell4k_part.json | 6 -- .../models/item/fluid_cell64k_part.json | 6 -- .../models/item/fluid_storage_cell_16k.json | 6 -- .../models/item/fluid_storage_cell_1k.json | 6 -- .../models/item/fluid_storage_cell_4k.json | 6 -- .../models/item/fluid_storage_cell_64k.json | 6 -- .../models/item/fluix_crystal.json | 2 +- .../models/item/fluix_dust.json | 2 +- .../models/item/fluix_pearl.json | 2 +- .../models/item/formation_core.json | 2 +- .../models/item/fuzzy_card.json | 2 +- .../models/item/gold_dust.json | 2 +- .../models/item/inverter_card.json | 2 +- .../models/item/iron_dust.json | 2 +- .../models/item/logic_processor.json | 2 +- .../models/item/logic_processor_press.json | 2 +- .../models/item/logic_processor_print.json | 6 -- .../models/item/matter_ball.json | 2 +- .../models/item/name_press.json | 2 +- .../models/item/nether_quartz_dust.json | 2 +- .../models/item/nether_quartz_shovel.json | 6 ++ .../models/item/nether_quartz_spade.json | 6 -- .../item/printed_calculation_processor.json | 6 ++ .../item/printed_engineering_processor.json | 6 ++ .../models/item/printed_logic_processor.json | 6 ++ .../models/item/printed_silicon.json | 6 ++ .../item/purified_certus_quartz_crystal.json | 2 +- .../models/item/purified_fluix_crystal.json | 2 +- .../item/purified_nether_quartz_crystal.json | 2 +- .../item/quantum_entangled_singularity.json | 2 +- .../models/item/redstone_card.json | 2 +- .../models/item/silicon.json | 2 +- .../models/item/silicon_press.json | 2 +- .../models/item/silicon_print.json | 6 -- .../models/item/singularity.json | 2 +- .../models/item/sky_dust.json | 2 +- .../models/item/spatial_cell128_part.json | 6 -- .../models/item/spatial_cell16_part.json | 6 -- .../models/item/spatial_cell2_part.json | 6 -- .../item/spatial_storage_cell_128_cubed.json | 6 -- .../item/spatial_storage_cell_16_cubed.json | 6 -- .../item/spatial_storage_cell_2_cubed.json | 6 -- .../models/item/speed_card.json | 2 +- .../models/item/storage_cell_16k.json | 6 -- .../models/item/storage_cell_1k.json | 6 -- .../models/item/storage_cell_4k.json | 6 -- .../models/item/storage_cell_64k.json | 6 -- .../models/item/wireless_booster.json | 2 +- .../models/item/wireless_receiver.json | 2 +- .../models/item/wooden_crank.json | 2 +- .../models/item/wooden_gear.json | 2 +- .../{storage_16k.png => 16k_storage.png} | Bin ...ge_16k_light.png => 16k_storage_light.png} | Bin .../{storage_1k.png => 1k_storage.png} | Bin ...rage_1k_light.png => 1k_storage_light.png} | Bin .../{storage_4k.png => 4k_storage.png} | Bin ...rage_4k_light.png => 4k_storage_light.png} | Bin .../{storage_64k.png => 64k_storage.png} | Bin ...ge_64k_light.png => 64k_storage_light.png} | Bin ...g => 128_cubed_spatial_cell_component.png} | Bin ...png => 128_cubed_spatial_storage_cell.png} | Bin ...ng => 16_cubed_spatial_cell_component.png} | Bin ....png => 16_cubed_spatial_storage_cell.png} | Bin ...ell16k_part.png => 16k_cell_component.png} | Bin ..._part.png => 16k_fluid_cell_component.png} | Bin ...ell_16k.png => 16k_fluid_storage_cell.png} | Bin ...rage_cell_16k.png => 16k_storage_cell.png} | Bin ..._cell1k_part.png => 1k_cell_component.png} | Bin ...k_part.png => 1k_fluid_cell_component.png} | Bin ..._cell_1k.png => 1k_fluid_storage_cell.png} | Bin ...torage_cell_1k.png => 1k_storage_cell.png} | Bin ...png => 2_cubed_spatial_cell_component.png} | Bin ...d.png => 2_cubed_spatial_storage_cell.png} | Bin ..._cell4k_part.png => 4k_cell_component.png} | Bin ...k_part.png => 4k_fluid_cell_component.png} | Bin ..._cell_4k.png => 4k_fluid_storage_cell.png} | Bin ...torage_cell_4k.png => 4k_storage_cell.png} | Bin ...ell64k_part.png => 64k_cell_component.png} | Bin ..._part.png => 64k_fluid_cell_component.png} | Bin ...ell_64k.png => 64k_fluid_storage_cell.png} | Bin ...rage_cell_64k.png => 64k_storage_cell.png} | Bin ...al_advanced_card.png => advanced_card.png} | Bin ...ilation_core.png => annihilation_core.png} | Bin ...material_basic_card.png => basic_card.png} | Bin ...al_blank_pattern.png => blank_pattern.png} | Bin ...rocessor.png => calculation_processor.png} | Bin ...ss.png => calculation_processor_press.png} | Bin ...al_card_capacity.png => card_capacity.png} | Bin ...al_card_crafting.png => card_crafting.png} | Bin ...material_card_fuzzy.png => card_fuzzy.png} | Bin ...al_card_inverter.png => card_inverter.png} | Bin ...al_card_redstone.png => card_redstone.png} | Bin ...material_card_speed.png => card_speed.png} | Bin ..._crystal.png => certus_quartz_crystal.png} | Bin ....png => certus_quartz_crystal_charged.png} | Bin ...quartz_dust.png => certus_quartz_dust.png} | Bin ...rtz_spade.png => certus_quartz_shovel.png} | Bin ...torage_cell.png => empty_storage_cell.png} | Bin ...material_ender_dust.png => ender_dust.png} | Bin ...rocessor.png => engineering_processor.png} | Bin ...ss.png => engineering_processor_press.png} | Bin .../item/{material_flour.png => flour.png} | Bin ...al_fluix_crystal.png => fluix_crystal.png} | Bin ...material_fluix_dust.png => fluix_dust.png} | Bin ...terial_fluix_pearl.png => fluix_pearl.png} | Bin ..._formation_core.png => formation_core.png} | Bin .../{material_gold_dust.png => gold_dust.png} | Bin .../{material_iron_dust.png => iron_dust.png} | Bin ...ogic_processor.png => logic_processor.png} | Bin ...or_press.png => logic_processor_press.png} | Bin ...terial_matter_ball.png => matter_ball.png} | Bin ...material_name_press.png => name_press.png} | Bin ...quartz_dust.png => nether_quartz_dust.png} | Bin ...rtz_spade.png => nether_quartz_shovel.png} | Bin ....png => printed_calculation_processor.png} | Bin ....png => printed_engineering_processor.png} | Bin ..._print.png => printed_logic_processor.png} | Bin ..._silicon_print.png => printed_silicon.png} | Bin ...png => purified_certus_quartz_crystal.png} | Bin ...crystal.png => purified_fluix_crystal.png} | Bin ...png => purified_nether_quartz_crystal.png} | Bin ....png => quantum_entangled_singularity.png} | Bin .../{material_silicon.png => silicon.png} | Bin ...al_silicon_press.png => silicon_press.png} | Bin ...terial_singularity.png => singularity.png} | Bin .../{material_sky_dust.png => sky_dust.png} | Bin ...eless_booster.png => wireless_booster.png} | Bin ...ess_receiver.png => wireless_receiver.png} | Bin ...terial_wooden_gear.png => wooden_gear.png} | Bin .../advancements/main/crafting_cpu.json | 10 +-- .../advancements/main/spatial_explorer.json | 2 +- .../advancements/main/storage_cell.json | 10 +-- .../inscriber/calculation_processor.json | 4 +- .../calculation_processor_print.json | 2 +- .../inscriber/engineering_processor.json | 4 +- .../engineering_processor_print.json | 2 +- .../recipes/inscriber/logic_processor.json | 4 +- .../inscriber/logic_processor_print.json | 2 +- .../recipes/inscriber/silicon_print.json | 2 +- .../network/blocks/security_station.json | 2 +- .../network/cells/fluid_storage_cell_16k.json | 4 +- .../cells/fluid_storage_cell_16k_storage.json | 4 +- .../network/cells/fluid_storage_cell_1k.json | 4 +- .../cells/fluid_storage_cell_1k_storage.json | 4 +- .../network/cells/fluid_storage_cell_4k.json | 4 +- .../cells/fluid_storage_cell_4k_storage.json | 4 +- .../network/cells/fluid_storage_cell_64k.json | 4 +- .../cells/fluid_storage_cell_64k_storage.json | 4 +- ...luid_storage_components_cell_16k_part.json | 4 +- ...fluid_storage_components_cell_1k_part.json | 2 +- ...fluid_storage_components_cell_4k_part.json | 4 +- ...luid_storage_components_cell_64k_part.json | 4 +- .../network/cells/spatial_components.json | 2 +- .../network/cells/spatial_components_0.json | 4 +- .../network/cells/spatial_components_1.json | 4 +- .../cells/spatial_storage_cell_128_cubed.json | 4 +- ...patial_storage_cell_128_cubed_storage.json | 4 +- .../cells/spatial_storage_cell_16_cubed.json | 4 +- ...spatial_storage_cell_16_cubed_storage.json | 4 +- .../cells/spatial_storage_cell_2_cubed.json | 4 +- .../spatial_storage_cell_2_cubed_storage.json | 4 +- .../network/cells/storage_cell_16k.json | 4 +- .../cells/storage_cell_16k_storage.json | 4 +- .../network/cells/storage_cell_1k.json | 4 +- .../cells/storage_cell_1k_storage.json | 4 +- .../network/cells/storage_cell_4k.json | 4 +- .../cells/storage_cell_4k_storage.json | 4 +- .../network/cells/storage_cell_64k.json | 4 +- .../cells/storage_cell_64k_storage.json | 4 +- .../storage_components_cell_16k_part.json | 4 +- .../storage_components_cell_1k_part.json | 2 +- .../storage_components_cell_4k_part.json | 4 +- .../storage_components_cell_64k_part.json | 4 +- ..._4k.json => 16k_cpu_crafting_storage.json} | 4 +- ..._16k.json => 1k_cpu_crafting_storage.json} | 6 +- ...e_1k.json => 4k_cpu_crafting_storage.json} | 6 +- ...64k.json => 64k_cpu_crafting_storage.json} | 4 +- .../recipes/tools/certus_quartz_spade.json | 2 +- .../recipes/tools/matter_cannon.json | 2 +- .../recipes/tools/nether_quartz_spade.json | 2 +- .../tools/network_color_applicator.json | 2 +- .../recipes/tools/network_portable_cell.json | 2 +- 276 files changed, 729 insertions(+), 739 deletions(-) rename src/main/resources/assets/appliedenergistics2/blockstates/{crafting_storage_16k.json => 16k_crafting_storage.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{crafting_storage_1k.json => 1k_crafting_storage.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{crafting_storage_4k.json => 4k_crafting_storage.json} (100%) rename src/main/resources/assets/appliedenergistics2/blockstates/{crafting_storage_64k.json => 64k_crafting_storage.json} (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/crafting/16k_storage.json rename src/main/resources/assets/appliedenergistics2/models/block/crafting/{storage_16k_formed.json => 16k_storage_formed.json} (67%) create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/crafting/1k_storage.json rename src/main/resources/assets/appliedenergistics2/models/block/crafting/{storage_4k_formed.json => 1k_storage_formed.json} (68%) create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/crafting/4k_storage.json rename src/main/resources/assets/appliedenergistics2/models/block/crafting/{storage_1k_formed.json => 4k_storage_formed.json} (68%) create mode 100644 src/main/resources/assets/appliedenergistics2/models/block/crafting/64k_storage.json rename src/main/resources/assets/appliedenergistics2/models/block/crafting/{storage_64k_formed.json => 64k_storage_formed.json} (67%) delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_16k.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_1k.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_4k.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/block/crafting/storage_64k.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/128_cubed_spatial_cell_component.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/128_cubed_spatial_storage_cell.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/16_cubed_spatial_cell_component.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/16_cubed_spatial_storage_cell.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/16k_cell_component.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/16k_crafting_storage.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/16k_fluid_cell_component.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/16k_fluid_storage_cell.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/16k_storage_cell.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/1k_cell_component.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/1k_crafting_storage.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/1k_fluid_cell_component.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/1k_fluid_storage_cell.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/1k_storage_cell.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/2_cubed_spatial_cell_component.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/2_cubed_spatial_storage_cell.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/4k_cell_component.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/4k_crafting_storage.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/4k_fluid_cell_component.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/4k_fluid_storage_cell.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/4k_storage_cell.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/64k_cell_component.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/64k_crafting_storage.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/64k_fluid_cell_component.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/64k_fluid_storage_cell.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/64k_storage_cell.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/calculation_processor_print.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/cell16k_part.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/cell1k_part.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/cell4k_part.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/cell64k_part.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_shovel.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/certus_quartz_spade.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_16k.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_1k.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_4k.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/crafting_storage_64k.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/engineering_processor_print.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/fluid_cell16k_part.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/fluid_cell1k_part.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/fluid_cell4k_part.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/fluid_cell64k_part.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_cell_16k.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_cell_1k.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_cell_4k.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/fluid_storage_cell_64k.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/logic_processor_print.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_shovel.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/nether_quartz_spade.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/printed_calculation_processor.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/printed_engineering_processor.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/printed_logic_processor.json create mode 100644 src/main/resources/assets/appliedenergistics2/models/item/printed_silicon.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/silicon_print.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/spatial_cell128_part.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/spatial_cell16_part.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/spatial_cell2_part.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_128_cubed.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_16_cubed.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/spatial_storage_cell_2_cubed.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/storage_cell_16k.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/storage_cell_1k.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/storage_cell_4k.json delete mode 100644 src/main/resources/assets/appliedenergistics2/models/item/storage_cell_64k.json rename src/main/resources/assets/appliedenergistics2/textures/block/crafting/{storage_16k.png => 16k_storage.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/block/crafting/{storage_16k_light.png => 16k_storage_light.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/block/crafting/{storage_1k.png => 1k_storage.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/block/crafting/{storage_1k_light.png => 1k_storage_light.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/block/crafting/{storage_4k.png => 4k_storage.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/block/crafting/{storage_4k_light.png => 4k_storage_light.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/block/crafting/{storage_64k.png => 64k_storage.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/block/crafting/{storage_64k_light.png => 64k_storage_light.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_cell128_spatial_part.png => 128_cubed_spatial_cell_component.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{spatial_storage_cell_128_cubed.png => 128_cubed_spatial_storage_cell.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_cell16_spatial_part.png => 16_cubed_spatial_cell_component.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{spatial_storage_cell_16_cubed.png => 16_cubed_spatial_storage_cell.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_cell16k_part.png => 16k_cell_component.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_fluid_cell16k_part.png => 16k_fluid_cell_component.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{fluid_storage_cell_16k.png => 16k_fluid_storage_cell.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{storage_cell_16k.png => 16k_storage_cell.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_cell1k_part.png => 1k_cell_component.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_fluid_cell1k_part.png => 1k_fluid_cell_component.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{fluid_storage_cell_1k.png => 1k_fluid_storage_cell.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{storage_cell_1k.png => 1k_storage_cell.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_cell2_spatial_part.png => 2_cubed_spatial_cell_component.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{spatial_storage_cell_2_cubed.png => 2_cubed_spatial_storage_cell.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_cell4k_part.png => 4k_cell_component.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_fluid_cell4k_part.png => 4k_fluid_cell_component.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{fluid_storage_cell_4k.png => 4k_fluid_storage_cell.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{storage_cell_4k.png => 4k_storage_cell.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_cell64k_part.png => 64k_cell_component.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_fluid_cell64k_part.png => 64k_fluid_cell_component.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{fluid_storage_cell_64k.png => 64k_fluid_storage_cell.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{storage_cell_64k.png => 64k_storage_cell.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_advanced_card.png => advanced_card.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_annihilation_core.png => annihilation_core.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_basic_card.png => basic_card.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_blank_pattern.png => blank_pattern.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_calculation_processor.png => calculation_processor.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_calculation_processor_press.png => calculation_processor_press.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_card_capacity.png => card_capacity.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_card_crafting.png => card_crafting.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_card_fuzzy.png => card_fuzzy.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_card_inverter.png => card_inverter.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_card_redstone.png => card_redstone.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_card_speed.png => card_speed.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_certus_quartz_crystal.png => certus_quartz_crystal.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_certus_quartz_crystal_charged.png => certus_quartz_crystal_charged.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_certus_quartz_dust.png => certus_quartz_dust.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{certus_quartz_spade.png => certus_quartz_shovel.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_empty_storage_cell.png => empty_storage_cell.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_ender_dust.png => ender_dust.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_engineering_processor.png => engineering_processor.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_engineering_processor_press.png => engineering_processor_press.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_flour.png => flour.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_fluix_crystal.png => fluix_crystal.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_fluix_dust.png => fluix_dust.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_fluix_pearl.png => fluix_pearl.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_formation_core.png => formation_core.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_gold_dust.png => gold_dust.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_iron_dust.png => iron_dust.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_logic_processor.png => logic_processor.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_logic_processor_press.png => logic_processor_press.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_matter_ball.png => matter_ball.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_name_press.png => name_press.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_nether_quartz_dust.png => nether_quartz_dust.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{nether_quartz_spade.png => nether_quartz_shovel.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_calculation_processor_print.png => printed_calculation_processor.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_engineering_processor_print.png => printed_engineering_processor.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_logic_processor_print.png => printed_logic_processor.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_silicon_print.png => printed_silicon.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_purified_certus_quartz_crystal.png => purified_certus_quartz_crystal.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_purified_fluix_crystal.png => purified_fluix_crystal.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_purified_nether_quartz_crystal.png => purified_nether_quartz_crystal.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_quantum_entangled_singularity.png => quantum_entangled_singularity.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_silicon.png => silicon.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_silicon_press.png => silicon_press.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_singularity.png => singularity.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_sky_dust.png => sky_dust.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_wireless_booster.png => wireless_booster.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_wireless_receiver.png => wireless_receiver.png} (100%) rename src/main/resources/assets/appliedenergistics2/textures/item/{material_wooden_gear.png => wooden_gear.png} (100%) rename src/main/resources/data/appliedenergistics2/recipes/network/crafting/{cpu_crafting_storage_4k.json => 16k_cpu_crafting_storage.json} (59%) rename src/main/resources/data/appliedenergistics2/recipes/network/crafting/{cpu_crafting_storage_16k.json => 1k_cpu_crafting_storage.json} (60%) rename src/main/resources/data/appliedenergistics2/recipes/network/crafting/{cpu_crafting_storage_1k.json => 4k_cpu_crafting_storage.json} (60%) rename src/main/resources/data/appliedenergistics2/recipes/network/crafting/{cpu_crafting_storage_64k.json => 64k_cpu_crafting_storage.json} (59%) diff --git a/src/api/java/appeng/api/definitions/IParts.java b/src/api/java/appeng/api/definitions/IParts.java index def876d8f..5030f503e 100644 --- a/src/api/java/appeng/api/definitions/IParts.java +++ b/src/api/java/appeng/api/definitions/IParts.java @@ -80,8 +80,6 @@ public interface IParts IItemDefinition p2PTunnelLight(); - // IItemDefinition p2PTunnelOpenComputers(); - IItemDefinition cableAnchor(); IItemDefinition monitor(); diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java b/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java index 27fe3a1db..f20de000c 100644 --- a/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java +++ b/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java @@ -47,10 +47,10 @@ class CraftingCubeModel implements IModelGeometry private final static Material UNIT_BASE = texture( "unit_base" ); private final static Material LIGHT_BASE = texture( "light_base" ); private final static Material ACCELERATOR_LIGHT = texture( "accelerator_light" ); - private final static Material STORAGE_1K_LIGHT = texture( "storage_1k_light" ); - private final static Material STORAGE_4K_LIGHT = texture( "storage_4k_light" ); - private final static Material STORAGE_16K_LIGHT = texture( "storage_16k_light" ); - private final static Material STORAGE_64K_LIGHT = texture( "storage_64k_light" ); + private final static Material STORAGE_1K_LIGHT = texture( "1k_storage_light" ); + private final static Material STORAGE_4K_LIGHT = texture( "4k_storage_light" ); + private final static Material STORAGE_16K_LIGHT = texture( "16k_storage_light" ); + private final static Material STORAGE_64K_LIGHT = texture( "64k_storage_light" ); private final static Material MONITOR_BASE = texture( "monitor_base" ); private final static Material MONITOR_LIGHT_DARK = texture( "monitor_light_dark" ); private final static Material MONITOR_LIGHT_MEDIUM = texture( "monitor_light_medium" ); diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 83b63c220..50e7434da 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -440,22 +440,22 @@ public final class ApiBlocks implements IBlocks TileEntityDefinition craftingStorage = registry.tileEntity("crafting_storage", TileCraftingStorageTile.class, TileCraftingStorageTile::new) .build(); - this.craftingStorage1k = crafting.block( "crafting_storage_1k", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_1K ) ) + this.craftingStorage1k = crafting.block( "1k_crafting_storage", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_1K ) ) .item( ItemCraftingStorage::new ) .tileEntity(craftingStorage) .rendering( new CraftingCubeRendering() ) .build(); - this.craftingStorage4k = crafting.block( "crafting_storage_4k", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_4K ) ) + this.craftingStorage4k = crafting.block( "4k_crafting_storage", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_4K ) ) .item( ItemCraftingStorage::new ) .tileEntity(craftingStorage) .rendering( new CraftingCubeRendering() ) .build(); - this.craftingStorage16k = crafting.block( "crafting_storage_16k", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_16K ) ) + this.craftingStorage16k = crafting.block( "16k_crafting_storage", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_16K ) ) .item( ItemCraftingStorage::new ) .tileEntity(craftingStorage) .rendering( new CraftingCubeRendering() ) .build(); - this.craftingStorage64k = crafting.block( "crafting_storage_64k", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_64K ) ) + this.craftingStorage64k = crafting.block( "64k_crafting_storage", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_64K ) ) .item( ItemCraftingStorage::new ) .tileEntity(craftingStorage) .rendering( new CraftingCubeRendering() ) diff --git a/src/main/java/appeng/core/api/definitions/ApiItems.java b/src/main/java/appeng/core/api/definitions/ApiItems.java index e00f7460e..1e2fe203d 100644 --- a/src/main/java/appeng/core/api/definitions/ApiItems.java +++ b/src/main/java/appeng/core/api/definitions/ApiItems.java @@ -135,7 +135,7 @@ public final class ApiItems implements IItems .itemGroup(ItemGroup.TOOLS) .addFeatures( AEFeature.QUARTZ_HOE ) .build(); - this.certusQuartzShovel = certusTools.item( "certus_quartz_spade", props -> new ToolQuartzSpade( props, AEFeature.CERTUS_QUARTZ_TOOLS ) ) + this.certusQuartzShovel = certusTools.item( "certus_quartz_shovel", props -> new ToolQuartzSpade( props, AEFeature.CERTUS_QUARTZ_TOOLS ) ) .itemGroup(ItemGroup.TOOLS) .addFeatures( AEFeature.QUARTZ_SPADE ) .build(); @@ -169,7 +169,7 @@ public final class ApiItems implements IItems .itemGroup(ItemGroup.TOOLS) .addFeatures( AEFeature.QUARTZ_HOE ) .build(); - this.netherQuartzShovel = netherTools.item( "nether_quartz_spade", props -> new ToolQuartzSpade( props, AEFeature.NETHER_QUARTZ_TOOLS ) ) + this.netherQuartzShovel = netherTools.item( "nether_quartz_shovel", props -> new ToolQuartzSpade( props, AEFeature.NETHER_QUARTZ_TOOLS ) ) .itemGroup(ItemGroup.TOOLS) .addFeatures( AEFeature.QUARTZ_SPADE ) .build(); @@ -249,20 +249,20 @@ public final class ApiItems implements IItems .build(); FeatureFactory storageCells = registry.features( AEFeature.STORAGE_CELLS ); - this.cell1k = storageCells.item( "storage_cell_1k", props -> new BasicItemStorageCell(props, MaterialType.CELL1K_PART, 1 ) ).build(); - this.cell4k = storageCells.item( "storage_cell_4k", props -> new BasicItemStorageCell(props, MaterialType.CELL4K_PART, 4 ) ).build(); - this.cell16k = storageCells.item( "storage_cell_16k", props -> new BasicItemStorageCell(props, MaterialType.CELL16K_PART, 16 ) ).build(); - this.cell64k = storageCells.item( "storage_cell_64k", props -> new BasicItemStorageCell(props, MaterialType.CELL64K_PART, 64 ) ).build(); + this.cell1k = storageCells.item( "1k_storage_cell", props -> new BasicItemStorageCell(props, MaterialType.ITEM_1K_CELL_COMPONENT, 1 ) ).build(); + this.cell4k = storageCells.item( "4k_storage_cell", props -> new BasicItemStorageCell(props, MaterialType.ITEM_4K_CELL_COMPONENT, 4 ) ).build(); + this.cell16k = storageCells.item( "16k_storage_cell", props -> new BasicItemStorageCell(props, MaterialType.ITEM_16K_CELL_COMPONENT, 16 ) ).build(); + this.cell64k = storageCells.item( "64k_storage_cell", props -> new BasicItemStorageCell(props, MaterialType.ITEM_64K_CELL_COMPONENT, 64 ) ).build(); - this.fluidCell1k = storageCells.item( "fluid_storage_cell_1k", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_CELL1K_PART, 1 ) ).build(); - this.fluidCell4k = storageCells.item( "fluid_storage_cell_4k", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_CELL4K_PART, 4 ) ).build(); - this.fluidCell16k = storageCells.item( "fluid_storage_cell_16k", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_CELL16K_PART, 16 ) ).build(); - this.fluidCell64k = storageCells.item( "fluid_storage_cell_64k", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_CELL64K_PART, 64 ) ).build(); + this.fluidCell1k = storageCells.item( "1k_fluid_storage_cell", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_1K_CELL_COMPONENT, 1 ) ).build(); + this.fluidCell4k = storageCells.item( "4k_fluid_storage_cell", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_4K_CELL_COMPONENT, 4 ) ).build(); + this.fluidCell16k = storageCells.item( "16k_fluid_storage_cell", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_16K_CELL_COMPONENT, 16 ) ).build(); + this.fluidCell64k = storageCells.item( "64k_fluid_storage_cell", props -> new BasicFluidStorageCell(props, MaterialType.FLUID_64K_CELL_COMPONENT, 64 ) ).build(); FeatureFactory spatialCells = registry.features( AEFeature.SPATIAL_IO ); - this.spatialCell2 = spatialCells.item( "spatial_storage_cell_2_cubed", props -> new ItemSpatialStorageCell(props, 2 ) ).build(); - this.spatialCell16 = spatialCells.item( "spatial_storage_cell_16_cubed", props -> new ItemSpatialStorageCell(props, 16 ) ).build(); - this.spatialCell128 = spatialCells.item( "spatial_storage_cell_128_cubed", props -> new ItemSpatialStorageCell(props, 128 ) ).build(); + this.spatialCell2 = spatialCells.item( "2_cubed_spatial_storage_cell", props -> new ItemSpatialStorageCell(props, 2 ) ).build(); + this.spatialCell16 = spatialCells.item( "16_cubed_spatial_storage_cell", props -> new ItemSpatialStorageCell(props, 16 ) ).build(); + this.spatialCell128 = spatialCells.item( "128_cubed_spatial_storage_cell", props -> new ItemSpatialStorageCell(props, 128 ) ).build(); this.facade = registry.item( "facade", ItemFacade::new ) .features( AEFeature.FACADES ) diff --git a/src/main/java/appeng/core/api/definitions/ApiMaterials.java b/src/main/java/appeng/core/api/definitions/ApiMaterials.java index 7195bd9ba..6d9921c21 100644 --- a/src/main/java/appeng/core/api/definitions/ApiMaterials.java +++ b/src/main/java/appeng/core/api/definitions/ApiMaterials.java @@ -128,9 +128,9 @@ public final class ApiMaterials implements IMaterials .customize(builder -> builder.setTrackingRange(16).setUpdateInterval(4).setShouldReceiveVelocityUpdates(true)) .build(); - this.cell2SpatialPart = createMaterial(MaterialType.CELL2_SPATIAL_PART ); - this.cell16SpatialPart = createMaterial(MaterialType.CELL16_SPATIAL_PART ); - this.cell128SpatialPart = createMaterial(MaterialType.CELL128_SPATIAL_PART ); + this.cell2SpatialPart = createMaterial(MaterialType.SPATIAL_2_CELL_COMPONENT ); + this.cell16SpatialPart = createMaterial(MaterialType.SPATIAL_16_CELL_COMPONENT ); + this.cell128SpatialPart = createMaterial(MaterialType.SPATIAL_128_CELL_COMPONENT ); this.silicon = createMaterial(MaterialType.SILICON ); this.skyDust = createMaterial(MaterialType.SKY_DUST ); this.calcProcessorPress = createMaterial(MaterialType.CALCULATION_PROCESSOR_PRESS ); @@ -150,10 +150,10 @@ public final class ApiMaterials implements IMaterials this.purifiedCertusQuartzCrystal = createMaterial(MaterialType.PURIFIED_CERTUS_QUARTZ_CRYSTAL ); this.purifiedNetherQuartzCrystal = createMaterial(MaterialType.PURIFIED_NETHER_QUARTZ_CRYSTAL ); this.purifiedFluixCrystal = createMaterial(MaterialType.PURIFIED_FLUIX_CRYSTAL ); - this.cell1kPart = createMaterial(MaterialType.CELL1K_PART ); - this.cell4kPart = createMaterial(MaterialType.CELL4K_PART ); - this.cell16kPart = createMaterial(MaterialType.CELL16K_PART ); - this.cell64kPart = createMaterial(MaterialType.CELL64K_PART ); + this.cell1kPart = createMaterial(MaterialType.ITEM_1K_CELL_COMPONENT ); + this.cell4kPart = createMaterial(MaterialType.ITEM_4K_CELL_COMPONENT ); + this.cell16kPart = createMaterial(MaterialType.ITEM_16K_CELL_COMPONENT ); + this.cell64kPart = createMaterial(MaterialType.ITEM_64K_CELL_COMPONENT ); this.emptyStorageCell = createMaterial(MaterialType.EMPTY_STORAGE_CELL ); this.cardRedstone = createMaterial(MaterialType.CARD_REDSTONE ); this.cardSpeed = createMaterial(MaterialType.CARD_SPEED ); @@ -181,10 +181,10 @@ public final class ApiMaterials implements IMaterials this.singularity = createMaterial(MaterialType.SINGULARITY ); this.qESingularity = createMaterial(MaterialType.QUANTUM_ENTANGLED_SINGULARITY ); this.blankPattern = createMaterial(MaterialType.BLANK_PATTERN ); - this.fluidCell1kPart = createMaterial(MaterialType.FLUID_CELL1K_PART ); - this.fluidCell4kPart = createMaterial(MaterialType.FLUID_CELL4K_PART ); - this.fluidCell16kPart = createMaterial(MaterialType.FLUID_CELL16K_PART ); - this.fluidCell64kPart = createMaterial(MaterialType.FLUID_CELL64K_PART ); + this.fluidCell1kPart = createMaterial(MaterialType.FLUID_1K_CELL_COMPONENT ); + this.fluidCell4kPart = createMaterial(MaterialType.FLUID_4K_CELL_COMPONENT ); + this.fluidCell16kPart = createMaterial(MaterialType.FLUID_16K_CELL_COMPONENT ); + this.fluidCell64kPart = createMaterial(MaterialType.FLUID_64K_CELL_COMPONENT ); } private IItemDefinition createMaterial(final MaterialType mat) diff --git a/src/main/java/appeng/core/api/definitions/ApiParts.java b/src/main/java/appeng/core/api/definitions/ApiParts.java index e19761755..9cec4d532 100644 --- a/src/main/java/appeng/core/api/definitions/ApiParts.java +++ b/src/main/java/appeng/core/api/definitions/ApiParts.java @@ -326,14 +326,6 @@ public final class ApiParts implements IParts return this.p2PTunnelLight; } - /* - * @Override - * public IItemDefinition p2PTunnelOpenComputers() - * { - * return this.p2PTunnelOpenComputers; - * } - */ - @Override public IItemDefinition cableAnchor() { diff --git a/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java b/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java index 2575454cd..07797d794 100644 --- a/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java +++ b/src/main/java/appeng/fluids/items/BasicFluidStorageCell.java @@ -49,19 +49,19 @@ public final class BasicFluidStorageCell extends AbstractStorageCell features; private final ResourceLocation registryName; diff --git a/src/main/java/appeng/items/storage/BasicItemStorageCell.java b/src/main/java/appeng/items/storage/BasicItemStorageCell.java index 53e8a8088..3003e4586 100644 --- a/src/main/java/appeng/items/storage/BasicItemStorageCell.java +++ b/src/main/java/appeng/items/storage/BasicItemStorageCell.java @@ -41,19 +41,19 @@ public final class BasicItemStorageCell extends AbstractStorageCell