From 9658ce06f73d75053de9b2b41c79993daaf4c98e Mon Sep 17 00:00:00 2001 From: WayofTime Date: Mon, 17 Aug 2015 20:16:39 -0400 Subject: [PATCH] A lot more .json files (4) --- base_alchemy_items_concentrated_catalyst.json | 6 + base_alchemy_items_fractured_bone.json | 6 + base_alchemy_items_offensa.json | 6 + base_alchemy_items_orbis_terrae.json | 6 + base_alchemy_items_potentia.json | 6 + base_alchemy_items_praesidium.json | 6 + base_alchemy_items_reductus.json | 6 + base_alchemy_items_strengthened_catalyst.json | 6 + base_alchemy_items_virtus.json | 6 + base_items_cost_core.json | 6 + base_items_cracked_runic_plate.json | 6 + base_items_default_core.json | 6 + base_items_defensive_core.json | 6 + base_items_earthen_core.json | 6 + base_items_empty_core.json | 6 + base_items_ender_shard.json | 6 + base_items_environmental_core.json | 6 + base_items_ethereal_slate.json | 6 + base_items_flame_core.json | 6 + base_items_gust_core.json | 6 + base_items_icy_core.json | 6 + base_items_input_cable.json | 6 + base_items_life_brace.json | 6 + base_items_life_shard.json | 6 + base_items_magicales_cable.json | 6 + base_items_melee_core.json | 6 + base_items_obsidian_brace.json | 6 + base_items_offensive_core.json | 6 + base_items_output_cable.json | 6 + base_items_paradigm_back_plate.json | 6 + base_items_potency_core.json | 6 + base_items_power_core.json | 6 + base_items_projectile_core.json | 6 + base_items_quartz_rod.json | 6 + base_items_runic_plate.json | 6 + base_items_scribed_runic_plate.json | 6 + base_items_self_core.json | 6 + base_items_soul_runic_plate.json | 6 + base_items_soul_shard.json | 6 + base_items_stone_brace.json | 6 + base_items_tool_core.json | 6 + base_items_wood_brace.json | 6 + build.properties | 8 +- incense_byrrus.json | 6 + incense_livens.json | 6 + incense_purpura.json | 6 + incense_viridis.json | 6 + incense_wood_ash.json | 6 + .../AlchemicalWizardry.java | 8 +- .../client/InventoryRenderHelper.java | 29 +- .../client/nei/NEIAlchemyRecipeHandler.java | 356 ++++++++--------- .../client/nei/NEIAltarRecipeHandler.java | 374 +++++++++--------- .../client/nei/NEIBindingRitualHandler.java | 272 ++++++------- .../client/nei/NEIBloodOrbShapedHandler.java | 284 ++++++------- .../nei/NEIBloodOrbShapelessHandler.java | 270 ++++++------- .../client/nei/NEIConfig.java | 72 ++-- ...e_alchemy_items_concentrated_catalyst.json | 6 + .../base_alchemy_items_fractured_bone.json | 6 + .../item/base_alchemy_items_offensa.json | 6 + .../item/base_alchemy_items_orbis_terrae.json | 6 + .../item/base_alchemy_items_potentia.json | 6 + .../item/base_alchemy_items_praesidium.json | 6 + .../item/base_alchemy_items_reductus.json | 6 + ...e_alchemy_items_strengthened_catalyst.json | 6 + .../item/base_alchemy_items_virtus.json | 6 + .../models/item/base_items_cost_core.json | 6 + .../item/base_items_cracked_runic_plate.json | 6 + .../models/item/base_items_default_core.json | 6 + .../item/base_items_defensive_core.json | 6 + .../models/item/base_items_earthen_core.json | 6 + .../models/item/base_items_empty_core.json | 6 + .../models/item/base_items_ender_shard.json | 6 + .../item/base_items_environmental_core.json | 6 + .../item/base_items_ethereal_slate.json | 6 + .../models/item/base_items_flame_core.json | 6 + .../models/item/base_items_gust_core.json | 6 + .../models/item/base_items_icy_core.json | 6 + .../models/item/base_items_input_cable.json | 6 + .../models/item/base_items_life_brace.json | 6 + .../models/item/base_items_life_shard.json | 6 + .../item/base_items_magicales_cable.json | 6 + .../models/item/base_items_melee_core.json | 6 + .../item/base_items_obsidian_brace.json | 6 + .../item/base_items_offensive_core.json | 6 + .../models/item/base_items_output_cable.json | 6 + .../item/base_items_paradigm_back_plate.json | 6 + .../models/item/base_items_potency_core.json | 6 + .../models/item/base_items_power_core.json | 6 + .../item/base_items_projectile_core.json | 6 + .../models/item/base_items_quartz_rod.json | 6 + .../models/item/base_items_runic_plate.json | 6 + .../item/base_items_scribed_runic_plate.json | 6 + .../models/item/base_items_self_core.json | 6 + .../item/base_items_soul_runic_plate.json | 6 + .../models/item/base_items_soul_shard.json | 6 + .../models/item/base_items_stone_brace.json | 6 + .../models/item/base_items_tool_core.json | 6 + .../models/item/base_items_wood_brace.json | 6 + .../models/item/blood_light_sigil.json | 8 + .../models/item/bucket_life.json | 8 + .../models/item/complex_spell_crystal.json | 8 + .../models/item/creative_dagger.json | 8 + .../models/item/demon_crystal.json | 8 + .../models/item/enhanced_filling_agent.json | 8 + .../models/item/key_of_binding.json | 8 + .../models/item/multi_tool.json | 8 + .../models/item/ritual_diviner.json | 8 + .../sigil_of_ender_severance_activated.json | 8 + .../sigil_of_ender_severance_deactivated.json | 8 + .../models/item/sigil_of_sight.json | 8 + .../models/item/standard_filling_agent.json | 8 + .../models/item/weak_binding_agent.json | 8 + .../models/item/weak_filling_agent.json | 8 + ...baseAlchemyItem_concentrated_catalyst.png} | Bin ...png => baseAlchemyItem_fractured_bone.png} | Bin ...ffensa.png => baseAlchemyItem_offensa.png} | Bin ...e.png => baseAlchemyItem_orbis_terrae.png} | Bin ...entia.png => baseAlchemyItem_potentia.png} | Bin ...ium.png => baseAlchemyItem_praesidium.png} | Bin ...uctus.png => baseAlchemyItem_reductus.png} | Bin ...baseAlchemyItem_strengthened_catalyst.png} | Bin ...mVirtus.png => baseAlchemyItem_virtus.png} | Bin ...oodash.png => baseIncenseItem_woodash.png} | Bin ...temCostCore.png => baseItem_cost_core.png} | Bin ...e.png => baseItem_cracked_runic_plate.png} | Bin ...aultCore.png => baseItem_default_core.png} | Bin ...veCore.png => baseItem_defensive_core.png} | Bin ...thenCore.png => baseItem_earthen_core.png} | Bin ...mEmptyCore.png => baseItem_empty_core.png} | Bin ...nderShard.png => baseItem_ender_shard.png} | Bin ...re.png => baseItem_environmental_core.png} | Bin ...lSlate.png => baseItem_ethereal_slate.png} | Bin ...mFlameCore.png => baseItem_flame_core.png} | Bin ...temGustCore.png => baseItem_gust_core.png} | Bin ...eItemIcyCore.png => baseItem_icy_core.png} | Bin ...nputCable.png => baseItem_input_cable.png} | Bin ...mLifeBrace.png => baseItem_life_brace.png} | Bin ...mLifeShard.png => baseItem_life_shard.png} | Bin ...Cable.png => baseItem_magicales_cable.png} | Bin ...mMeleeCore.png => baseItem_melee_core.png} | Bin ...nBrace.png => baseItem_obsidian_brace.png} | Bin ...veCore.png => baseItem_offensive_core.png} | Bin ...putCable.png => baseItem_output_cable.png} | Bin ...e.png => baseItem_paradigm_back_plate.png} | Bin ...encyCore.png => baseItem_potency_core.png} | Bin ...mPowerCore.png => baseItem_power_core.png} | Bin ...eCore.png => baseItem_projectile_core.png} | Bin ...mQuartzRod.png => baseItem_quartz_rod.png} | Bin ...unicPlate.png => baseItem_runic_plate.png} | Bin ...e.png => baseItem_scribed_runic_plate.png} | Bin ...temSelfCore.png => baseItem_self_core.png} | Bin ...late.png => baseItem_soul_runic_plate.png} | Bin ...mSoulShard.png => baseItem_soul_shard.png} | Bin ...toneBrace.png => baseItem_stone_brace.png} | Bin ...temToolCore.png => baseItem_tool_core.png} | Bin ...mWoodBrace.png => baseItem_wood_brace.png} | Bin 156 files changed, 1502 insertions(+), 825 deletions(-) create mode 100644 base_alchemy_items_concentrated_catalyst.json create mode 100644 base_alchemy_items_fractured_bone.json create mode 100644 base_alchemy_items_offensa.json create mode 100644 base_alchemy_items_orbis_terrae.json create mode 100644 base_alchemy_items_potentia.json create mode 100644 base_alchemy_items_praesidium.json create mode 100644 base_alchemy_items_reductus.json create mode 100644 base_alchemy_items_strengthened_catalyst.json create mode 100644 base_alchemy_items_virtus.json create mode 100644 base_items_cost_core.json create mode 100644 base_items_cracked_runic_plate.json create mode 100644 base_items_default_core.json create mode 100644 base_items_defensive_core.json create mode 100644 base_items_earthen_core.json create mode 100644 base_items_empty_core.json create mode 100644 base_items_ender_shard.json create mode 100644 base_items_environmental_core.json create mode 100644 base_items_ethereal_slate.json create mode 100644 base_items_flame_core.json create mode 100644 base_items_gust_core.json create mode 100644 base_items_icy_core.json create mode 100644 base_items_input_cable.json create mode 100644 base_items_life_brace.json create mode 100644 base_items_life_shard.json create mode 100644 base_items_magicales_cable.json create mode 100644 base_items_melee_core.json create mode 100644 base_items_obsidian_brace.json create mode 100644 base_items_offensive_core.json create mode 100644 base_items_output_cable.json create mode 100644 base_items_paradigm_back_plate.json create mode 100644 base_items_potency_core.json create mode 100644 base_items_power_core.json create mode 100644 base_items_projectile_core.json create mode 100644 base_items_quartz_rod.json create mode 100644 base_items_runic_plate.json create mode 100644 base_items_scribed_runic_plate.json create mode 100644 base_items_self_core.json create mode 100644 base_items_soul_runic_plate.json create mode 100644 base_items_soul_shard.json create mode 100644 base_items_stone_brace.json create mode 100644 base_items_tool_core.json create mode 100644 base_items_wood_brace.json create mode 100644 incense_byrrus.json create mode 100644 incense_livens.json create mode 100644 incense_purpura.json create mode 100644 incense_viridis.json create mode 100644 incense_wood_ash.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_concentrated_catalyst.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_fractured_bone.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_offensa.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_orbis_terrae.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_potentia.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_praesidium.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_reductus.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_strengthened_catalyst.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_virtus.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_cost_core.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_cracked_runic_plate.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_default_core.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_defensive_core.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_earthen_core.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_empty_core.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_ender_shard.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_environmental_core.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_ethereal_slate.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_flame_core.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_gust_core.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_icy_core.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_input_cable.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_life_brace.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_life_shard.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_magicales_cable.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_melee_core.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_obsidian_brace.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_offensive_core.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_output_cable.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_paradigm_back_plate.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_potency_core.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_power_core.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_projectile_core.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_quartz_rod.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_runic_plate.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_scribed_runic_plate.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_self_core.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_soul_runic_plate.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_soul_shard.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_stone_brace.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_tool_core.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/base_items_wood_brace.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/blood_light_sigil.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/bucket_life.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/complex_spell_crystal.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/creative_dagger.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/demon_crystal.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/enhanced_filling_agent.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/key_of_binding.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/multi_tool.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/ritual_diviner.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/sigil_of_ender_severance_activated.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/sigil_of_ender_severance_deactivated.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/sigil_of_sight.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/standard_filling_agent.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/weak_binding_agent.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/weak_filling_agent.json rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseAlchemyItemConcentratedCatalyst.png => baseAlchemyItem_concentrated_catalyst.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseAlchemyItemFracturedBone.png => baseAlchemyItem_fractured_bone.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseAlchemyItemOffensa.png => baseAlchemyItem_offensa.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseAlchemyItemOrbisTerrae.png => baseAlchemyItem_orbis_terrae.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseAlchemyItemPotentia.png => baseAlchemyItem_potentia.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseAlchemyItemPraesidium.png => baseAlchemyItem_praesidium.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseAlchemyItemReductus.png => baseAlchemyItem_reductus.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseAlchemyItemStrengthenedCatalyst.png => baseAlchemyItem_strengthened_catalyst.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseAlchemyItemVirtus.png => baseAlchemyItem_virtus.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseIncenseItemWoodash.png => baseIncenseItem_woodash.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemCostCore.png => baseItem_cost_core.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemCrackedRunicPlate.png => baseItem_cracked_runic_plate.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemDefaultCore.png => baseItem_default_core.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemDefensiveCore.png => baseItem_defensive_core.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemEarthenCore.png => baseItem_earthen_core.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemEmptyCore.png => baseItem_empty_core.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemEnderShard.png => baseItem_ender_shard.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemEnvironmentalCore.png => baseItem_environmental_core.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemEtherealSlate.png => baseItem_ethereal_slate.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemFlameCore.png => baseItem_flame_core.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemGustCore.png => baseItem_gust_core.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemIcyCore.png => baseItem_icy_core.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemInputCable.png => baseItem_input_cable.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemLifeBrace.png => baseItem_life_brace.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemLifeShard.png => baseItem_life_shard.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemMagicalesCable.png => baseItem_magicales_cable.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemMeleeCore.png => baseItem_melee_core.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemObsidianBrace.png => baseItem_obsidian_brace.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemOffensiveCore.png => baseItem_offensive_core.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemOutputCable.png => baseItem_output_cable.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemParadigmBackPlate.png => baseItem_paradigm_back_plate.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemPotencyCore.png => baseItem_potency_core.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemPowerCore.png => baseItem_power_core.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemProjectileCore.png => baseItem_projectile_core.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemQuartzRod.png => baseItem_quartz_rod.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemRunicPlate.png => baseItem_runic_plate.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemScribedRunicPlate.png => baseItem_scribed_runic_plate.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemSelfCore.png => baseItem_self_core.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemSoulRunicPlate.png => baseItem_soul_runic_plate.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemSoulShard.png => baseItem_soul_shard.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemStoneBrace.png => baseItem_stone_brace.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemToolCore.png => baseItem_tool_core.png} (100%) rename src/main/resources/assets/alchemicalwizardry/textures/items/{baseItemWoodBrace.png => baseItem_wood_brace.png} (100%) diff --git a/base_alchemy_items_concentrated_catalyst.json b/base_alchemy_items_concentrated_catalyst.json new file mode 100644 index 00000000..32a7a0cf --- /dev/null +++ b/base_alchemy_items_concentrated_catalyst.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseAlchemyItem_concentrated_catalyst" + } +} diff --git a/base_alchemy_items_fractured_bone.json b/base_alchemy_items_fractured_bone.json new file mode 100644 index 00000000..e522e583 --- /dev/null +++ b/base_alchemy_items_fractured_bone.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseAlchemyItem_fractured_bone" + } +} diff --git a/base_alchemy_items_offensa.json b/base_alchemy_items_offensa.json new file mode 100644 index 00000000..345f6f0f --- /dev/null +++ b/base_alchemy_items_offensa.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseAlchemyItem_offensa" + } +} diff --git a/base_alchemy_items_orbis_terrae.json b/base_alchemy_items_orbis_terrae.json new file mode 100644 index 00000000..23d10cf7 --- /dev/null +++ b/base_alchemy_items_orbis_terrae.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseAlchemyItem_orbis_terrae" + } +} diff --git a/base_alchemy_items_potentia.json b/base_alchemy_items_potentia.json new file mode 100644 index 00000000..562ef958 --- /dev/null +++ b/base_alchemy_items_potentia.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseAlchemyItem_potentia" + } +} diff --git a/base_alchemy_items_praesidium.json b/base_alchemy_items_praesidium.json new file mode 100644 index 00000000..16af9851 --- /dev/null +++ b/base_alchemy_items_praesidium.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseAlchemyItem_praesidium" + } +} diff --git a/base_alchemy_items_reductus.json b/base_alchemy_items_reductus.json new file mode 100644 index 00000000..1ed71e30 --- /dev/null +++ b/base_alchemy_items_reductus.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseAlchemyItem_reductus" + } +} diff --git a/base_alchemy_items_strengthened_catalyst.json b/base_alchemy_items_strengthened_catalyst.json new file mode 100644 index 00000000..9dd78462 --- /dev/null +++ b/base_alchemy_items_strengthened_catalyst.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseAlchemyItem_strengthened_catalyst" + } +} diff --git a/base_alchemy_items_virtus.json b/base_alchemy_items_virtus.json new file mode 100644 index 00000000..0d9fe482 --- /dev/null +++ b/base_alchemy_items_virtus.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseAlchemyItem_virtus" + } +} diff --git a/base_items_cost_core.json b/base_items_cost_core.json new file mode 100644 index 00000000..89b38a07 --- /dev/null +++ b/base_items_cost_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_cost_core" + } +} diff --git a/base_items_cracked_runic_plate.json b/base_items_cracked_runic_plate.json new file mode 100644 index 00000000..f5c267de --- /dev/null +++ b/base_items_cracked_runic_plate.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_cracked_runic_plate" + } +} diff --git a/base_items_default_core.json b/base_items_default_core.json new file mode 100644 index 00000000..cfb8d2f7 --- /dev/null +++ b/base_items_default_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_default_core" + } +} diff --git a/base_items_defensive_core.json b/base_items_defensive_core.json new file mode 100644 index 00000000..21c8ec50 --- /dev/null +++ b/base_items_defensive_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_defensive_core" + } +} diff --git a/base_items_earthen_core.json b/base_items_earthen_core.json new file mode 100644 index 00000000..105f006c --- /dev/null +++ b/base_items_earthen_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_earthen_core" + } +} diff --git a/base_items_empty_core.json b/base_items_empty_core.json new file mode 100644 index 00000000..1ac4bf4b --- /dev/null +++ b/base_items_empty_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_empty_core" + } +} diff --git a/base_items_ender_shard.json b/base_items_ender_shard.json new file mode 100644 index 00000000..168c7cd5 --- /dev/null +++ b/base_items_ender_shard.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_ender_shard" + } +} diff --git a/base_items_environmental_core.json b/base_items_environmental_core.json new file mode 100644 index 00000000..572e0952 --- /dev/null +++ b/base_items_environmental_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_environmental_core" + } +} diff --git a/base_items_ethereal_slate.json b/base_items_ethereal_slate.json new file mode 100644 index 00000000..9a6256d5 --- /dev/null +++ b/base_items_ethereal_slate.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_ethereal_slate" + } +} diff --git a/base_items_flame_core.json b/base_items_flame_core.json new file mode 100644 index 00000000..eb3730d4 --- /dev/null +++ b/base_items_flame_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_flame_core" + } +} diff --git a/base_items_gust_core.json b/base_items_gust_core.json new file mode 100644 index 00000000..54532099 --- /dev/null +++ b/base_items_gust_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_gust_core" + } +} diff --git a/base_items_icy_core.json b/base_items_icy_core.json new file mode 100644 index 00000000..288c806c --- /dev/null +++ b/base_items_icy_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_icy_core" + } +} diff --git a/base_items_input_cable.json b/base_items_input_cable.json new file mode 100644 index 00000000..6b170e34 --- /dev/null +++ b/base_items_input_cable.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_input_cable" + } +} diff --git a/base_items_life_brace.json b/base_items_life_brace.json new file mode 100644 index 00000000..37288fac --- /dev/null +++ b/base_items_life_brace.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_life_brace" + } +} diff --git a/base_items_life_shard.json b/base_items_life_shard.json new file mode 100644 index 00000000..565ff666 --- /dev/null +++ b/base_items_life_shard.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_life_shard" + } +} diff --git a/base_items_magicales_cable.json b/base_items_magicales_cable.json new file mode 100644 index 00000000..a419e50e --- /dev/null +++ b/base_items_magicales_cable.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_magicales_cable" + } +} diff --git a/base_items_melee_core.json b/base_items_melee_core.json new file mode 100644 index 00000000..a775c118 --- /dev/null +++ b/base_items_melee_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_melee_core" + } +} diff --git a/base_items_obsidian_brace.json b/base_items_obsidian_brace.json new file mode 100644 index 00000000..95b9ed09 --- /dev/null +++ b/base_items_obsidian_brace.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_obsidian_brace" + } +} diff --git a/base_items_offensive_core.json b/base_items_offensive_core.json new file mode 100644 index 00000000..aa1b3211 --- /dev/null +++ b/base_items_offensive_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_offensive_core" + } +} diff --git a/base_items_output_cable.json b/base_items_output_cable.json new file mode 100644 index 00000000..e60e2ce9 --- /dev/null +++ b/base_items_output_cable.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_output_cable" + } +} diff --git a/base_items_paradigm_back_plate.json b/base_items_paradigm_back_plate.json new file mode 100644 index 00000000..75bc6878 --- /dev/null +++ b/base_items_paradigm_back_plate.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_paradigm_back_plate" + } +} diff --git a/base_items_potency_core.json b/base_items_potency_core.json new file mode 100644 index 00000000..521cfc37 --- /dev/null +++ b/base_items_potency_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_potency_core" + } +} diff --git a/base_items_power_core.json b/base_items_power_core.json new file mode 100644 index 00000000..b1f20d72 --- /dev/null +++ b/base_items_power_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_power_core" + } +} diff --git a/base_items_projectile_core.json b/base_items_projectile_core.json new file mode 100644 index 00000000..fc0678f5 --- /dev/null +++ b/base_items_projectile_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_projectile_core" + } +} diff --git a/base_items_quartz_rod.json b/base_items_quartz_rod.json new file mode 100644 index 00000000..2687255c --- /dev/null +++ b/base_items_quartz_rod.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_quartz_rod" + } +} diff --git a/base_items_runic_plate.json b/base_items_runic_plate.json new file mode 100644 index 00000000..4654f87b --- /dev/null +++ b/base_items_runic_plate.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_runic_plate" + } +} diff --git a/base_items_scribed_runic_plate.json b/base_items_scribed_runic_plate.json new file mode 100644 index 00000000..95f12ac6 --- /dev/null +++ b/base_items_scribed_runic_plate.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_scribed_runic_plate" + } +} diff --git a/base_items_self_core.json b/base_items_self_core.json new file mode 100644 index 00000000..147888f7 --- /dev/null +++ b/base_items_self_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_self_core" + } +} diff --git a/base_items_soul_runic_plate.json b/base_items_soul_runic_plate.json new file mode 100644 index 00000000..8a4b1c59 --- /dev/null +++ b/base_items_soul_runic_plate.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_soul_runic_plate" + } +} diff --git a/base_items_soul_shard.json b/base_items_soul_shard.json new file mode 100644 index 00000000..2e39ef90 --- /dev/null +++ b/base_items_soul_shard.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_soul_shard" + } +} diff --git a/base_items_stone_brace.json b/base_items_stone_brace.json new file mode 100644 index 00000000..5ffc1f26 --- /dev/null +++ b/base_items_stone_brace.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_stone_brace" + } +} diff --git a/base_items_tool_core.json b/base_items_tool_core.json new file mode 100644 index 00000000..5eea9c3f --- /dev/null +++ b/base_items_tool_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_tool_core" + } +} diff --git a/base_items_wood_brace.json b/base_items_wood_brace.json new file mode 100644 index 00000000..4ac279a7 --- /dev/null +++ b/base_items_wood_brace.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_wood_brace" + } +} diff --git a/build.properties b/build.properties index 8651a7d1..c1994c31 100644 --- a/build.properties +++ b/build.properties @@ -1,12 +1,14 @@ +# +#Thu Aug 13 06:05:36 EDT 2015 mod_name=BloodMagic forge_version=11.14.3.1499 -cclib_version=1.1.2.133 ccc_version=1.0.5.34 +cclib_version=1.1.2.133 nei_version=1.0.5.82 //=Dependency Information guideapi_version=1.0.1-20 package_group=com.wayoftime.bloodmagic -mod_version=1.3.3 +mod_version=1.4.0 minetweaker_version=Dev-1.7.10-3.0.9B -build_number=12 +build_number=2 mc_version=1.8 diff --git a/incense_byrrus.json b/incense_byrrus.json new file mode 100644 index 00000000..ab084669 --- /dev/null +++ b/incense_byrrus.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseIncenseItem_byrrus" + } +} diff --git a/incense_livens.json b/incense_livens.json new file mode 100644 index 00000000..3e1f7ebf --- /dev/null +++ b/incense_livens.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseIncenseItem_livens" + } +} diff --git a/incense_purpura.json b/incense_purpura.json new file mode 100644 index 00000000..f72f29a3 --- /dev/null +++ b/incense_purpura.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseIncenseItem_purpura" + } +} diff --git a/incense_viridis.json b/incense_viridis.json new file mode 100644 index 00000000..26704345 --- /dev/null +++ b/incense_viridis.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseIncenseItem_viridis" + } +} diff --git a/incense_wood_ash.json b/incense_wood_ash.json new file mode 100644 index 00000000..296d9841 --- /dev/null +++ b/incense_wood_ash.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseIncenseItem_wood_ash" + } +} diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 94d87cf4..11836664 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -11,7 +11,6 @@ import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import WayofTime.alchemicalWizardry.common.potion.*; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -130,6 +129,7 @@ import WayofTime.alchemicalWizardry.common.omega.OmegaParadigmFire; import WayofTime.alchemicalWizardry.common.omega.OmegaParadigmWater; import WayofTime.alchemicalWizardry.common.omega.OmegaParadigmWind; import WayofTime.alchemicalWizardry.common.omega.OmegaRegistry; +import WayofTime.alchemicalWizardry.common.potion.PotionBloodMagic; import WayofTime.alchemicalWizardry.common.renderer.AlchemyCircleRenderer; import WayofTime.alchemicalWizardry.common.rituals.RitualEffectAnimalGrowth; import WayofTime.alchemicalWizardry.common.rituals.RitualEffectAutoAlchemy; @@ -246,9 +246,9 @@ import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorRegistry; import WayofTime.alchemicalWizardry.common.tileEntity.TEAlchemicalCalcinator; import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; import WayofTime.alchemicalWizardry.common.tileEntity.TEBelljar; +import WayofTime.alchemicalWizardry.common.tileEntity.TEChemistrySet; import WayofTime.alchemicalWizardry.common.tileEntity.TEConduit; import WayofTime.alchemicalWizardry.common.tileEntity.TECrucible; -import WayofTime.alchemicalWizardry.common.tileEntity.TESpellTable; import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; import WayofTime.alchemicalWizardry.common.tileEntity.TEMimicBlock; import WayofTime.alchemicalWizardry.common.tileEntity.TEOrientable; @@ -263,8 +263,8 @@ import WayofTime.alchemicalWizardry.common.tileEntity.TESpellEffectBlock; import WayofTime.alchemicalWizardry.common.tileEntity.TESpellEnhancementBlock; import WayofTime.alchemicalWizardry.common.tileEntity.TESpellModifierBlock; import WayofTime.alchemicalWizardry.common.tileEntity.TESpellParadigmBlock; +import WayofTime.alchemicalWizardry.common.tileEntity.TESpellTable; import WayofTime.alchemicalWizardry.common.tileEntity.TETeleposer; -import WayofTime.alchemicalWizardry.common.tileEntity.TEChemistrySet; import WayofTime.alchemicalWizardry.common.tileEntity.gui.GuiHandler; //import WayofTime.alchemicalWizardry.common.tweaker.MineTweakerIntegration; @@ -472,7 +472,7 @@ public class AlchemicalWizardry @EventHandler public void preInit(FMLPreInitializationEvent event) - { + { File bmDirectory = new File("config/BloodMagic/schematics"); if (!bmDirectory.exists() && bmDirectory.mkdirs()) diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/InventoryRenderHelper.java b/src/main/java/WayofTime/alchemicalWizardry/client/InventoryRenderHelper.java index 846b29de..81ab6918 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/InventoryRenderHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/InventoryRenderHelper.java @@ -1,5 +1,8 @@ package WayofTime.alchemicalWizardry.client; +import java.io.FileNotFoundException; +import java.io.PrintWriter; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; @@ -116,7 +119,7 @@ public class InventoryRenderHelper { registerSimpleItem(ModItems.weakBindingAgent); registerSimpleItem(ModItems.itemRitualDiviner); //TODO Make it work for all 3 metas registerSimpleItem(ModItems.itemKeyOfDiablo); - registerToggleItem(ModItems.itemBloodLightSigil); + registerSimpleItem(ModItems.itemBloodLightSigil); registerSimpleItem(ModItems.itemComplexSpellCrystal); registerSimpleItem(ModItems.bucketLife); registerToggleItem(ModItems.itemSigilOfEnderSeverance); @@ -126,21 +129,39 @@ public class InventoryRenderHelper { int i = 0; for(String name : ItemComponents.ITEM_NAMES) { - itemRender(ModItems.baseItems, i, ModItems.baseItems.getUnlocalizedName().substring(5) + "_" + name); + String funName = ModItems.baseItems.getUnlocalizedName().substring(5) + "_" + name; + itemRender(ModItems.baseItems, i, funName); +// try { +// PrintWriter writer = new PrintWriter(funName + ".json"); +// writer.println("{"); +// writer.println(" " + '"' + "parent" + '"' + ":" + '"' + "alchemicalwizardry:item/standard_item" + '"' + ","); +// writer.println(" "+ '"' + "textures" + '"' + ": {"); +// writer.println(" " + '"' + "layer0" + '"' + ":" + '"' + "alchemicalwizardry:items/" + "baseItem" + "_" + name + '"'); +// writer.println(" }"); +// writer.println("}"); +// writer.close(); +// } catch (FileNotFoundException e1) { +// // TODO Auto-generated catch block +// e1.printStackTrace(); +// } i++; } i = 0; for(String name : ItemAlchemyBase.ITEM_NAMES) { - itemRender(ModItems.baseAlchemyItems, i, ModItems.baseAlchemyItems.getUnlocalizedName().substring(5) + "_" + name); + String funName = ModItems.baseAlchemyItems.getUnlocalizedName().substring(5) + "_" + name; + itemRender(ModItems.baseAlchemyItems, i, funName); + i++; } i = 0; for(String name : ItemIncense.ITEM_NAMES) { - itemRender(ModItems.itemIncense, i, ModItems.itemIncense.getUnlocalizedName().substring(5) + "_" + name); + String funName = ModItems.itemIncense.getUnlocalizedName().substring(5) + "_" + name; + itemRender(ModItems.itemIncense, i, funName); + i++; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAlchemyRecipeHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAlchemyRecipeHandler.java index c92c0b0f..031488ac 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAlchemyRecipeHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAlchemyRecipeHandler.java @@ -1,178 +1,178 @@ -package WayofTime.alchemicalWizardry.client.nei; - -import static WayofTime.alchemicalWizardry.client.nei.NEIConfig.bloodOrbs; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; - -import WayofTime.alchemicalWizardry.common.tileEntity.gui.GuiChemistrySet; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipe; -import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; -import codechicken.nei.ItemList; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; - -/** - * NEI Alchemy Recipe Handler by joshie * - */ -public class NEIAlchemyRecipeHandler extends TemplateRecipeHandler { - public class CachedAlchemyRecipe extends CachedRecipe { - public class BloodOrbs { - public PositionedStack stack; - - public BloodOrbs(ItemStack orb) { - this.stack = new PositionedStack(orb, 136, 47, false); - } - } - - ArrayList orbs; - PositionedStack output; - List inputs; - int lp; - - public CachedAlchemyRecipe(AlchemyRecipe recipe, ItemStack orb) { - this(recipe); - this.orbs = new ArrayList(); - orbs.add(new BloodOrbs(orb)); - } - - public CachedAlchemyRecipe(AlchemyRecipe recipe) { - List inputs = new ArrayList(); - ItemStack[] stacks = recipe.getRecipe(); - if (stacks.length > 0) inputs.add(new PositionedStack(stacks[0], 76, 3)); - if (stacks.length > 1) inputs.add(new PositionedStack(stacks[1], 51, 19)); - if (stacks.length > 2) inputs.add(new PositionedStack(stacks[2], 101, 19)); - if (stacks.length > 3) inputs.add(new PositionedStack(stacks[3], 64, 47)); - if (stacks.length > 4) inputs.add(new PositionedStack(stacks[4], 88, 47)); - this.inputs = inputs; - this.output = new PositionedStack(recipe.getResult(), 76, 25); - this.lp = recipe.getAmountNeeded() * 100; - this.orbs = new ArrayList(); - for (Item orb : bloodOrbs) { - if (((IBloodOrb) orb).getOrbLevel() >= recipe.getOrbLevel()) { - orbs.add(new BloodOrbs(new ItemStack(orb))); - } - } - } - - @Override - public List getIngredients() { - return inputs; - } - - @Override - public PositionedStack getResult() { - return output; - } - - @Override - public PositionedStack getOtherStack() { - if (orbs == null || orbs.size() <= 0) return null; - return orbs.get((cycleticks / 48) % orbs.size()).stack; - } - } - - @Override - public TemplateRecipeHandler newInstance() { - for (ItemStack item : ItemList.items) { - if (item != null && item.getItem() instanceof IBloodOrb) { - bloodOrbs.add(item.getItem()); - } - } - - return super.newInstance(); - } - - @Override - public String getOverlayIdentifier() { - return "alchemicalwizardry.alchemy"; - } - - @Override - public void loadTransferRects() { - transferRects.add(new RecipeTransferRect(new Rectangle(134, 22, 16, 24), "alchemicalwizardry.alchemy")); - } - - @Override - public Class getGuiClass() { - return GuiChemistrySet.class; - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) { - if (outputId.equals("alchemicalwizardry.alchemy") && getClass() == NEIAlchemyRecipeHandler.class) { - for (AlchemyRecipe recipe : AlchemyRecipeRegistry.recipes) { - if (recipe.getResult() != null) arecipes.add(new CachedAlchemyRecipe(recipe)); - } - } else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - for (AlchemyRecipe recipe : AlchemyRecipeRegistry.recipes) { - if (recipe == null) continue; - if (NEIServerUtils.areStacksSameTypeCrafting(result, recipe.getResult())) { - arecipes.add(new CachedAlchemyRecipe(recipe)); - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) { - if (ingredient.getItem() instanceof IBloodOrb) { - for (AlchemyRecipe recipe : AlchemyRecipeRegistry.recipes) { - if (recipe == null) continue; - if (((IBloodOrb) ingredient.getItem()).getOrbLevel() >= recipe.getOrbLevel()) { - arecipes.add(new CachedAlchemyRecipe(recipe, ingredient)); - } - } - } else { - for (AlchemyRecipe recipe : AlchemyRecipeRegistry.recipes) { - if (recipe == null) continue; - ItemStack[] stacks = recipe.getRecipe(); - for (ItemStack stack : stacks) { - if (NEIServerUtils.areStacksSameTypeCrafting(stack, ingredient)) { - arecipes.add(new CachedAlchemyRecipe(recipe)); - break; - } - } - } - } - } - - @Override - public void drawExtras(int id) { - CachedAlchemyRecipe cache = (CachedAlchemyRecipe) arecipes.get(id); - Minecraft.getMinecraft().fontRendererObj.drawString("\u00a77" + cache.lp + "LP", getLPX(cache.lp), 34, 0); - } - - public int getLPX(int lp) { - if (lp < 10) return 122; - else if (lp < 100) return 122; - else if (lp < 1000) return 130; - else if (lp < 10000) return 127; - else if (lp < 100000) return 124; - return 122; - } - - @Override - public String getRecipeName() { - return StatCollector.translateToLocal("tile.blockWritingTable.name"); - } - - @Override - public String getGuiTexture() { - return new ResourceLocation("alchemicalwizardry", "gui/nei/alchemy.png").toString(); - } -} +//package WayofTime.alchemicalWizardry.client.nei; +// +//import static WayofTime.alchemicalWizardry.client.nei.NEIConfig.bloodOrbs; +// +//import java.awt.Rectangle; +//import java.util.ArrayList; +//import java.util.List; +// +//import WayofTime.alchemicalWizardry.common.tileEntity.gui.GuiChemistrySet; +//import net.minecraft.client.Minecraft; +//import net.minecraft.client.gui.inventory.GuiContainer; +//import net.minecraft.item.Item; +//import net.minecraft.item.ItemStack; +//import net.minecraft.util.ResourceLocation; +//import net.minecraft.util.StatCollector; +//import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipe; +//import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; +//import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; +//import codechicken.nei.ItemList; +//import codechicken.nei.NEIServerUtils; +//import codechicken.nei.PositionedStack; +//import codechicken.nei.recipe.TemplateRecipeHandler; +// +///** +// * NEI Alchemy Recipe Handler by joshie * +// */ +//public class NEIAlchemyRecipeHandler extends TemplateRecipeHandler { +// public class CachedAlchemyRecipe extends CachedRecipe { +// public class BloodOrbs { +// public PositionedStack stack; +// +// public BloodOrbs(ItemStack orb) { +// this.stack = new PositionedStack(orb, 136, 47, false); +// } +// } +// +// ArrayList orbs; +// PositionedStack output; +// List inputs; +// int lp; +// +// public CachedAlchemyRecipe(AlchemyRecipe recipe, ItemStack orb) { +// this(recipe); +// this.orbs = new ArrayList(); +// orbs.add(new BloodOrbs(orb)); +// } +// +// public CachedAlchemyRecipe(AlchemyRecipe recipe) { +// List inputs = new ArrayList(); +// ItemStack[] stacks = recipe.getRecipe(); +// if (stacks.length > 0) inputs.add(new PositionedStack(stacks[0], 76, 3)); +// if (stacks.length > 1) inputs.add(new PositionedStack(stacks[1], 51, 19)); +// if (stacks.length > 2) inputs.add(new PositionedStack(stacks[2], 101, 19)); +// if (stacks.length > 3) inputs.add(new PositionedStack(stacks[3], 64, 47)); +// if (stacks.length > 4) inputs.add(new PositionedStack(stacks[4], 88, 47)); +// this.inputs = inputs; +// this.output = new PositionedStack(recipe.getResult(), 76, 25); +// this.lp = recipe.getAmountNeeded() * 100; +// this.orbs = new ArrayList(); +// for (Item orb : bloodOrbs) { +// if (((IBloodOrb) orb).getOrbLevel() >= recipe.getOrbLevel()) { +// orbs.add(new BloodOrbs(new ItemStack(orb))); +// } +// } +// } +// +// @Override +// public List getIngredients() { +// return inputs; +// } +// +// @Override +// public PositionedStack getResult() { +// return output; +// } +// +// @Override +// public PositionedStack getOtherStack() { +// if (orbs == null || orbs.size() <= 0) return null; +// return orbs.get((cycleticks / 48) % orbs.size()).stack; +// } +// } +// +// @Override +// public TemplateRecipeHandler newInstance() { +// for (ItemStack item : ItemList.items) { +// if (item != null && item.getItem() instanceof IBloodOrb) { +// bloodOrbs.add(item.getItem()); +// } +// } +// +// return super.newInstance(); +// } +// +// @Override +// public String getOverlayIdentifier() { +// return "alchemicalwizardry.alchemy"; +// } +// +// @Override +// public void loadTransferRects() { +// transferRects.add(new RecipeTransferRect(new Rectangle(134, 22, 16, 24), "alchemicalwizardry.alchemy")); +// } +// +// @Override +// public Class getGuiClass() { +// return GuiChemistrySet.class; +// } +// +// @Override +// public void loadCraftingRecipes(String outputId, Object... results) { +// if (outputId.equals("alchemicalwizardry.alchemy") && getClass() == NEIAlchemyRecipeHandler.class) { +// for (AlchemyRecipe recipe : AlchemyRecipeRegistry.recipes) { +// if (recipe.getResult() != null) arecipes.add(new CachedAlchemyRecipe(recipe)); +// } +// } else { +// super.loadCraftingRecipes(outputId, results); +// } +// } +// +// @Override +// public void loadCraftingRecipes(ItemStack result) { +// for (AlchemyRecipe recipe : AlchemyRecipeRegistry.recipes) { +// if (recipe == null) continue; +// if (NEIServerUtils.areStacksSameTypeCrafting(result, recipe.getResult())) { +// arecipes.add(new CachedAlchemyRecipe(recipe)); +// } +// } +// } +// +// @Override +// public void loadUsageRecipes(ItemStack ingredient) { +// if (ingredient.getItem() instanceof IBloodOrb) { +// for (AlchemyRecipe recipe : AlchemyRecipeRegistry.recipes) { +// if (recipe == null) continue; +// if (((IBloodOrb) ingredient.getItem()).getOrbLevel() >= recipe.getOrbLevel()) { +// arecipes.add(new CachedAlchemyRecipe(recipe, ingredient)); +// } +// } +// } else { +// for (AlchemyRecipe recipe : AlchemyRecipeRegistry.recipes) { +// if (recipe == null) continue; +// ItemStack[] stacks = recipe.getRecipe(); +// for (ItemStack stack : stacks) { +// if (NEIServerUtils.areStacksSameTypeCrafting(stack, ingredient)) { +// arecipes.add(new CachedAlchemyRecipe(recipe)); +// break; +// } +// } +// } +// } +// } +// +// @Override +// public void drawExtras(int id) { +// CachedAlchemyRecipe cache = (CachedAlchemyRecipe) arecipes.get(id); +// Minecraft.getMinecraft().fontRendererObj.drawString("\u00a77" + cache.lp + "LP", getLPX(cache.lp), 34, 0); +// } +// +// public int getLPX(int lp) { +// if (lp < 10) return 122; +// else if (lp < 100) return 122; +// else if (lp < 1000) return 130; +// else if (lp < 10000) return 127; +// else if (lp < 100000) return 124; +// return 122; +// } +// +// @Override +// public String getRecipeName() { +// return StatCollector.translateToLocal("tile.blockWritingTable.name"); +// } +// +// @Override +// public String getGuiTexture() { +// return new ResourceLocation("alchemicalwizardry", "gui/nei/alchemy.png").toString(); +// } +//} diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAltarRecipeHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAltarRecipeHandler.java index c932f60a..28c58e6b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAltarRecipeHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAltarRecipeHandler.java @@ -1,187 +1,187 @@ -package WayofTime.alchemicalWizardry.client.nei; - -import java.awt.Dimension; -import java.awt.Point; -import java.awt.Rectangle; -import java.lang.reflect.Field; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; - -import org.lwjgl.input.Mouse; - -import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipe; -import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler; - -/** - * NEI Altar Recipe Handler by joshie * - */ -public class NEIAltarRecipeHandler extends TemplateRecipeHandler { - public class CachedAltarRecipe extends CachedRecipe { - PositionedStack input; -// PositionedStack inputItems; - PositionedStack output; - int tier, lp_amount, consumption, drain; - - public CachedAltarRecipe(AltarRecipe recipe) { -// inputItems = new PositionedStack(recipe.input, 38, 2, false); - input = new PositionedStack(recipe.requiredItem, 38, 2, false); - output = new PositionedStack(recipe.result, 132, 32, false); - tier = recipe.minTier; - lp_amount = recipe.liquidRequired; - consumption = recipe.consumptionRate; - drain = recipe.drainRate; - } - - @Override - public PositionedStack getIngredient() { - return input; - } - - @Override - public PositionedStack getResult() { - return output; - } - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) { - if (outputId.equals("alchemicalwizardry.altar") && getClass() == NEIAltarRecipeHandler.class) { - for(AltarRecipe recipe: AltarRecipeRegistry.altarRecipes) { - if(recipe != null && recipe.result != null) arecipes.add(new CachedAltarRecipe(recipe)); - } - } else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - for(AltarRecipe recipe: AltarRecipeRegistry.altarRecipes) { - if(NEIServerUtils.areStacksSameTypeCrafting(recipe.result, result)) { - if(recipe != null && recipe.result != null) arecipes.add(new CachedAltarRecipe(recipe)); - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) { - for(AltarRecipe recipe: AltarRecipeRegistry.altarRecipes) { - if(NEIServerUtils.areStacksSameTypeCrafting(recipe.requiredItem, ingredient)) { - if(recipe != null && recipe.result != null) arecipes.add(new CachedAltarRecipe(recipe)); - } - } - } - - //Mouse Position helper - public Point getMouse(int width, int height) { - Point mousepos = getMousePosition(); - int guiLeft = (width - 176) / 2; - int guiTop = (height - 166) / 2; - Point relMouse = new Point(mousepos.x - guiLeft, mousepos.y - guiTop); - return relMouse; - } - - //width helper, getting width normal way hates me on compile - public int getGuiWidth(GuiRecipe gui) { - try { - Field f = gui.getClass().getField("width"); - return (Integer) f.get(gui); - } catch (NoSuchFieldException e) { - try { - Field f = gui.getClass().getField("field_146294_l"); - return (Integer) f.get(gui); - } catch (Exception e2) { - return 0; - } - } catch (Exception e) { - e.printStackTrace(); - return 0; - } - } - - //height helper, getting height normal way hates me on compile - public int getGuiHeight(GuiRecipe gui) { - try { - Field f = gui.getClass().getField("height"); - return (Integer) f.get(gui); - } catch (NoSuchFieldException e) { - try { - Field f = gui.getClass().getField("field_146295_m"); - return (Integer) f.get(gui); - } catch (Exception e2) { - return 0; - } - } catch (Exception e) { - e.printStackTrace(); - return 0; - } - } - - @Override - public void drawExtras(int id) { - CachedAltarRecipe recipe = (CachedAltarRecipe) arecipes.get(id); - Minecraft.getMinecraft().fontRendererObj.drawString("\u00a77" + StatCollector.translateToLocal("bm.string.tier") + ": " + recipe.tier, 78, 5, 0); - Minecraft.getMinecraft().fontRendererObj.drawString("\u00a77" + "LP: " + recipe.lp_amount, 78, 15, 0); - } - - @Override - public List handleTooltip(GuiRecipe gui, List currenttip, int id) { - currenttip = super.handleTooltip(gui, currenttip, id); - Point mouse = getMouse(getGuiWidth(gui), getGuiHeight(gui)); - CachedAltarRecipe recipe = (CachedAltarRecipe) arecipes.get(id); - int yLow = id % 2 == 0 ? 38 : 102; - int yHigh = id % 2 == 0 ? 72 : 136; - if(mouse.x >= 19 && mouse.x <= 80 && mouse.y >= yLow && mouse.y <= yHigh) { - currenttip.add(StatCollector.translateToLocal("bm.string.consume") + ": " + recipe.consumption + "LP/t"); - currenttip.add(StatCollector.translateToLocal("bm.string.drain") + ": " + recipe.drain + "LP/t"); - } - - return currenttip; - } - - @Override - public String getOverlayIdentifier() { - return "altarrecipes"; - } - - @Override - public void loadTransferRects() { - transferRects.add(new RecipeTransferRect(new Rectangle(90, 32, 22, 16), "alchemicalwizardry.altar")); - } - - @Override - public String getRecipeName() { - return " " + StatCollector.translateToLocal("tile.bloodAltar.name"); - } - - @Override - public String getGuiTexture() { - return new ResourceLocation("alchemicalwizardry", "gui/nei/altar.png").toString(); - } - - public static Point getMousePosition() { - Dimension size = displaySize(); - Dimension res = displayRes(); - return new Point(Mouse.getX() * size.width / res.width, size.height - Mouse.getY() * size.height / res.height - 1); - } - - public static Dimension displaySize() { - Minecraft mc = Minecraft.getMinecraft(); - ScaledResolution res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); - return new Dimension(res.getScaledWidth(), res.getScaledHeight()); - } - - public static Dimension displayRes() { - Minecraft mc = Minecraft.getMinecraft(); - return new Dimension(mc.displayWidth, mc.displayHeight); - } -} +//package WayofTime.alchemicalWizardry.client.nei; +// +//import java.awt.Dimension; +//import java.awt.Point; +//import java.awt.Rectangle; +//import java.lang.reflect.Field; +//import java.util.List; +// +//import net.minecraft.client.Minecraft; +//import net.minecraft.client.gui.ScaledResolution; +//import net.minecraft.item.ItemStack; +//import net.minecraft.util.ResourceLocation; +//import net.minecraft.util.StatCollector; +// +//import org.lwjgl.input.Mouse; +// +//import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipe; +//import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; +//import codechicken.nei.NEIServerUtils; +//import codechicken.nei.PositionedStack; +//import codechicken.nei.recipe.GuiRecipe; +//import codechicken.nei.recipe.TemplateRecipeHandler; +// +///** +// * NEI Altar Recipe Handler by joshie * +// */ +//public class NEIAltarRecipeHandler extends TemplateRecipeHandler { +// public class CachedAltarRecipe extends CachedRecipe { +// PositionedStack input; +//// PositionedStack inputItems; +// PositionedStack output; +// int tier, lp_amount, consumption, drain; +// +// public CachedAltarRecipe(AltarRecipe recipe) { +//// inputItems = new PositionedStack(recipe.input, 38, 2, false); +// input = new PositionedStack(recipe.requiredItem, 38, 2, false); +// output = new PositionedStack(recipe.result, 132, 32, false); +// tier = recipe.minTier; +// lp_amount = recipe.liquidRequired; +// consumption = recipe.consumptionRate; +// drain = recipe.drainRate; +// } +// +// @Override +// public PositionedStack getIngredient() { +// return input; +// } +// +// @Override +// public PositionedStack getResult() { +// return output; +// } +// } +// +// @Override +// public void loadCraftingRecipes(String outputId, Object... results) { +// if (outputId.equals("alchemicalwizardry.altar") && getClass() == NEIAltarRecipeHandler.class) { +// for(AltarRecipe recipe: AltarRecipeRegistry.altarRecipes) { +// if(recipe != null && recipe.result != null) arecipes.add(new CachedAltarRecipe(recipe)); +// } +// } else { +// super.loadCraftingRecipes(outputId, results); +// } +// } +// +// @Override +// public void loadCraftingRecipes(ItemStack result) { +// for(AltarRecipe recipe: AltarRecipeRegistry.altarRecipes) { +// if(NEIServerUtils.areStacksSameTypeCrafting(recipe.result, result)) { +// if(recipe != null && recipe.result != null) arecipes.add(new CachedAltarRecipe(recipe)); +// } +// } +// } +// +// @Override +// public void loadUsageRecipes(ItemStack ingredient) { +// for(AltarRecipe recipe: AltarRecipeRegistry.altarRecipes) { +// if(NEIServerUtils.areStacksSameTypeCrafting(recipe.requiredItem, ingredient)) { +// if(recipe != null && recipe.result != null) arecipes.add(new CachedAltarRecipe(recipe)); +// } +// } +// } +// +// //Mouse Position helper +// public Point getMouse(int width, int height) { +// Point mousepos = getMousePosition(); +// int guiLeft = (width - 176) / 2; +// int guiTop = (height - 166) / 2; +// Point relMouse = new Point(mousepos.x - guiLeft, mousepos.y - guiTop); +// return relMouse; +// } +// +// //width helper, getting width normal way hates me on compile +// public int getGuiWidth(GuiRecipe gui) { +// try { +// Field f = gui.getClass().getField("width"); +// return (Integer) f.get(gui); +// } catch (NoSuchFieldException e) { +// try { +// Field f = gui.getClass().getField("field_146294_l"); +// return (Integer) f.get(gui); +// } catch (Exception e2) { +// return 0; +// } +// } catch (Exception e) { +// e.printStackTrace(); +// return 0; +// } +// } +// +// //height helper, getting height normal way hates me on compile +// public int getGuiHeight(GuiRecipe gui) { +// try { +// Field f = gui.getClass().getField("height"); +// return (Integer) f.get(gui); +// } catch (NoSuchFieldException e) { +// try { +// Field f = gui.getClass().getField("field_146295_m"); +// return (Integer) f.get(gui); +// } catch (Exception e2) { +// return 0; +// } +// } catch (Exception e) { +// e.printStackTrace(); +// return 0; +// } +// } +// +// @Override +// public void drawExtras(int id) { +// CachedAltarRecipe recipe = (CachedAltarRecipe) arecipes.get(id); +// Minecraft.getMinecraft().fontRendererObj.drawString("\u00a77" + StatCollector.translateToLocal("bm.string.tier") + ": " + recipe.tier, 78, 5, 0); +// Minecraft.getMinecraft().fontRendererObj.drawString("\u00a77" + "LP: " + recipe.lp_amount, 78, 15, 0); +// } +// +// @Override +// public List handleTooltip(GuiRecipe gui, List currenttip, int id) { +// currenttip = super.handleTooltip(gui, currenttip, id); +// Point mouse = getMouse(getGuiWidth(gui), getGuiHeight(gui)); +// CachedAltarRecipe recipe = (CachedAltarRecipe) arecipes.get(id); +// int yLow = id % 2 == 0 ? 38 : 102; +// int yHigh = id % 2 == 0 ? 72 : 136; +// if(mouse.x >= 19 && mouse.x <= 80 && mouse.y >= yLow && mouse.y <= yHigh) { +// currenttip.add(StatCollector.translateToLocal("bm.string.consume") + ": " + recipe.consumption + "LP/t"); +// currenttip.add(StatCollector.translateToLocal("bm.string.drain") + ": " + recipe.drain + "LP/t"); +// } +// +// return currenttip; +// } +// +// @Override +// public String getOverlayIdentifier() { +// return "altarrecipes"; +// } +// +// @Override +// public void loadTransferRects() { +// transferRects.add(new RecipeTransferRect(new Rectangle(90, 32, 22, 16), "alchemicalwizardry.altar")); +// } +// +// @Override +// public String getRecipeName() { +// return " " + StatCollector.translateToLocal("tile.bloodAltar.name"); +// } +// +// @Override +// public String getGuiTexture() { +// return new ResourceLocation("alchemicalwizardry", "gui/nei/altar.png").toString(); +// } +// +// public static Point getMousePosition() { +// Dimension size = displaySize(); +// Dimension res = displayRes(); +// return new Point(Mouse.getX() * size.width / res.width, size.height - Mouse.getY() * size.height / res.height - 1); +// } +// +// public static Dimension displaySize() { +// Minecraft mc = Minecraft.getMinecraft(); +// ScaledResolution res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); +// return new Dimension(res.getScaledWidth(), res.getScaledHeight()); +// } +// +// public static Dimension displayRes() { +// Minecraft mc = Minecraft.getMinecraft(); +// return new Dimension(mc.displayWidth, mc.displayHeight); +// } +//} diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java index 21f2fba8..58e9196d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBindingRitualHandler.java @@ -1,136 +1,136 @@ -package WayofTime.alchemicalWizardry.client.nei; - -import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRecipe; -import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import org.lwjgl.input.Mouse; - -import java.awt.*; - -/** - * Binding Ritual Handler by Arcaratus - */ -public class NEIBindingRitualHandler extends TemplateRecipeHandler -{ - public class CachedBindingRecipe extends CachedRecipe - { - PositionedStack input, output; - - public CachedBindingRecipe(BindingRecipe recipe) - { - input = new PositionedStack(recipe.requiredItem, 37, 21, false); - output = new PositionedStack(recipe.outputItem, 110, 21, false); - } - - @Override - public PositionedStack getIngredient() - { - return input; - } - - @Override - public PositionedStack getResult() - { - return output; - } - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if (outputId.equals("alchemicalwizardry.bindingritual") && getClass() == NEIBindingRitualHandler.class) - { - for (BindingRecipe recipe : BindingRegistry.bindingRecipes) - { - if (recipe != null && recipe.outputItem != null) - { - arecipes.add(new CachedBindingRecipe(recipe)); - } - } - } - else - { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - for (BindingRecipe recipe: BindingRegistry.bindingRecipes) - { - if (NEIServerUtils.areStacksSameTypeCrafting(recipe.outputItem, result)) - { - if (recipe != null && recipe.outputItem != null) - { - arecipes.add(new CachedBindingRecipe(recipe)); - } - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) - { - for (BindingRecipe recipe: BindingRegistry.bindingRecipes) - { - if (NEIServerUtils.areStacksSameTypeCrafting(recipe.requiredItem, ingredient)) - { - if (recipe != null && recipe.outputItem != null) - { - arecipes.add(new CachedBindingRecipe(recipe)); - } - } - } - } - - @Override - public String getOverlayIdentifier() - { - return "alchemicalwizardry.bindingritual"; - } - - @Override - public void loadTransferRects() - { - transferRects.add(new RecipeTransferRect(new Rectangle(68, 20, 22, 16), "alchemicalwizardry.bindingritual")); - } - - @Override - public String getRecipeName() - { - return "Binding Ritual"; - } - - @Override - public String getGuiTexture() - { - return new ResourceLocation("alchemicalwizardry", "gui/nei/bindingRitual.png").toString(); - } - - public static Point getMousePosition() - { - Dimension size = displaySize(); - Dimension res = displayRes(); - return new Point(Mouse.getX() * size.width / res.width, size.height - Mouse.getY() * size.height / res.height - 1); - } - - public static Dimension displaySize() - { - Minecraft mc = Minecraft.getMinecraft(); - ScaledResolution res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); - return new Dimension(res.getScaledWidth(), res.getScaledHeight()); - } - - public static Dimension displayRes() - { - Minecraft mc = Minecraft.getMinecraft(); - return new Dimension(mc.displayWidth, mc.displayHeight); - } -} \ No newline at end of file +//package WayofTime.alchemicalWizardry.client.nei; +// +//import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRecipe; +//import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry; +//import codechicken.nei.NEIServerUtils; +//import codechicken.nei.PositionedStack; +//import codechicken.nei.recipe.TemplateRecipeHandler; +//import net.minecraft.client.Minecraft; +//import net.minecraft.client.gui.ScaledResolution; +//import net.minecraft.item.ItemStack; +//import net.minecraft.util.ResourceLocation; +//import org.lwjgl.input.Mouse; +// +//import java.awt.*; +// +///** +// * Binding Ritual Handler by Arcaratus +// */ +//public class NEIBindingRitualHandler extends TemplateRecipeHandler +//{ +// public class CachedBindingRecipe extends CachedRecipe +// { +// PositionedStack input, output; +// +// public CachedBindingRecipe(BindingRecipe recipe) +// { +// input = new PositionedStack(recipe.requiredItem, 37, 21, false); +// output = new PositionedStack(recipe.outputItem, 110, 21, false); +// } +// +// @Override +// public PositionedStack getIngredient() +// { +// return input; +// } +// +// @Override +// public PositionedStack getResult() +// { +// return output; +// } +// } +// +// @Override +// public void loadCraftingRecipes(String outputId, Object... results) +// { +// if (outputId.equals("alchemicalwizardry.bindingritual") && getClass() == NEIBindingRitualHandler.class) +// { +// for (BindingRecipe recipe : BindingRegistry.bindingRecipes) +// { +// if (recipe != null && recipe.outputItem != null) +// { +// arecipes.add(new CachedBindingRecipe(recipe)); +// } +// } +// } +// else +// { +// super.loadCraftingRecipes(outputId, results); +// } +// } +// +// @Override +// public void loadCraftingRecipes(ItemStack result) +// { +// for (BindingRecipe recipe: BindingRegistry.bindingRecipes) +// { +// if (NEIServerUtils.areStacksSameTypeCrafting(recipe.outputItem, result)) +// { +// if (recipe != null && recipe.outputItem != null) +// { +// arecipes.add(new CachedBindingRecipe(recipe)); +// } +// } +// } +// } +// +// @Override +// public void loadUsageRecipes(ItemStack ingredient) +// { +// for (BindingRecipe recipe: BindingRegistry.bindingRecipes) +// { +// if (NEIServerUtils.areStacksSameTypeCrafting(recipe.requiredItem, ingredient)) +// { +// if (recipe != null && recipe.outputItem != null) +// { +// arecipes.add(new CachedBindingRecipe(recipe)); +// } +// } +// } +// } +// +// @Override +// public String getOverlayIdentifier() +// { +// return "alchemicalwizardry.bindingritual"; +// } +// +// @Override +// public void loadTransferRects() +// { +// transferRects.add(new RecipeTransferRect(new Rectangle(68, 20, 22, 16), "alchemicalwizardry.bindingritual")); +// } +// +// @Override +// public String getRecipeName() +// { +// return "Binding Ritual"; +// } +// +// @Override +// public String getGuiTexture() +// { +// return new ResourceLocation("alchemicalwizardry", "gui/nei/bindingRitual.png").toString(); +// } +// +// public static Point getMousePosition() +// { +// Dimension size = displaySize(); +// Dimension res = displayRes(); +// return new Point(Mouse.getX() * size.width / res.width, size.height - Mouse.getY() * size.height / res.height - 1); +// } +// +// public static Dimension displaySize() +// { +// Minecraft mc = Minecraft.getMinecraft(); +// ScaledResolution res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); +// return new Dimension(res.getScaledWidth(), res.getScaledHeight()); +// } +// +// public static Dimension displayRes() +// { +// Minecraft mc = Minecraft.getMinecraft(); +// return new Dimension(mc.displayWidth, mc.displayHeight); +// } +//} \ No newline at end of file diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapedHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapedHandler.java index b32f47cd..6701572d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapedHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapedHandler.java @@ -1,142 +1,142 @@ -package WayofTime.alchemicalWizardry.client.nei; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.StatCollector; -import WayofTime.alchemicalWizardry.api.items.ShapedBloodOrbRecipe; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.ShapedRecipeHandler; - -/** - * NEI Blood Orb Shaped Recipe Handler by joshie * - */ -public class NEIBloodOrbShapedHandler extends ShapedRecipeHandler { - public class CachedBloodOrbRecipe extends CachedShapedRecipe { - public CachedBloodOrbRecipe(int width, int height, Object[] items, ItemStack out) { - super(width, height, items, out); - } - - @Override - public void setIngredients(int width, int height, Object[] items) { - for (int x = 0; x < width; x++) { - for (int y = 0; y < height; y++) { - if (items[y * width + x] == null) - continue; - - Object o = items[y * width + x]; - if (o instanceof ItemStack) { - PositionedStack stack = new PositionedStack(items[y * width + x], 25 + x * 18, 6 + y * 18, false); - stack.setMaxSize(1); - ingredients.add(stack); - } else if (o instanceof Integer) { - ArrayList orbs = new ArrayList(); - for (Item item : NEIConfig.bloodOrbs) { - if (((IBloodOrb) item).getOrbLevel() >= (Integer) o) { - orbs.add(new ItemStack(item)); - } - } - - PositionedStack stack = new PositionedStack(orbs, 25 + x * 18, 6 + y * 18, false); - stack.setMaxSize(1); - ingredients.add(stack); - }else if(o instanceof List) - { - PositionedStack stack = new PositionedStack(o, 25 + x * 18, 6 + y * 18, false); - stack.setMaxSize(1); - ingredients.add(stack); - } - } - } - } - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) { - if (outputId.equals("crafting") && getClass() == NEIBloodOrbShapedHandler.class) { - for (IRecipe irecipe : (List) CraftingManager.getInstance().getRecipeList()) { - if (irecipe instanceof ShapedBloodOrbRecipe) { - CachedBloodOrbRecipe recipe = forgeShapedRecipe((ShapedBloodOrbRecipe) irecipe); - if (recipe == null) - continue; - - recipe.computeVisuals(); - arecipes.add(recipe); - } - } - } else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - for (IRecipe irecipe : (List) CraftingManager.getInstance().getRecipeList()) { - if (irecipe instanceof ShapedBloodOrbRecipe) { - CachedBloodOrbRecipe recipe = forgeShapedRecipe((ShapedBloodOrbRecipe) irecipe); - if (recipe == null || !NEIServerUtils.areStacksSameTypeCrafting(recipe.result.item, result)) - continue; - - recipe.computeVisuals(); - arecipes.add(recipe); - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) { - for (IRecipe irecipe : (List) CraftingManager.getInstance().getRecipeList()) { - CachedShapedRecipe recipe = null; - if (irecipe instanceof ShapedBloodOrbRecipe) - recipe = forgeShapedRecipe((ShapedBloodOrbRecipe) irecipe); - - if (recipe == null || !recipe.contains(recipe.ingredients, ingredient.getItem())) - continue; - - recipe.computeVisuals(); - if (recipe.contains(recipe.ingredients, ingredient)) { - recipe.setIngredientPermutation(recipe.ingredients, ingredient); - arecipes.add(recipe); - } - } - } - - private CachedBloodOrbRecipe forgeShapedRecipe(ShapedBloodOrbRecipe recipe) { - int width; - int height; - try { - width = recipe.width; - height = recipe.height; - } catch (Exception e) { - e.printStackTrace(); - return null; - } - - Object[] items = recipe.getInput(); - for (Object item : items) - if (item instanceof List && ((List) item).isEmpty())// ore - // handler, - // no ores - return null; - - return new CachedBloodOrbRecipe(width, height, items, recipe.getRecipeOutput()); - } - - @Override - public void loadTransferRects() { - transferRects.add(new RecipeTransferRect(new Rectangle(84, 23, 24, 18), "crafting")); - } - - - @Override - public String getRecipeName() { - return StatCollector.translateToLocal("bm.string.crafting.orb.shaped"); - } -} +//package WayofTime.alchemicalWizardry.client.nei; +// +//import java.awt.Rectangle; +//import java.util.ArrayList; +//import java.util.List; +// +//import net.minecraft.item.Item; +//import net.minecraft.item.ItemStack; +//import net.minecraft.item.crafting.CraftingManager; +//import net.minecraft.item.crafting.IRecipe; +//import net.minecraft.util.StatCollector; +//import WayofTime.alchemicalWizardry.api.items.ShapedBloodOrbRecipe; +//import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; +//import codechicken.nei.NEIServerUtils; +//import codechicken.nei.PositionedStack; +//import codechicken.nei.recipe.ShapedRecipeHandler; +// +///** +// * NEI Blood Orb Shaped Recipe Handler by joshie * +// */ +//public class NEIBloodOrbShapedHandler extends ShapedRecipeHandler { +// public class CachedBloodOrbRecipe extends CachedShapedRecipe { +// public CachedBloodOrbRecipe(int width, int height, Object[] items, ItemStack out) { +// super(width, height, items, out); +// } +// +// @Override +// public void setIngredients(int width, int height, Object[] items) { +// for (int x = 0; x < width; x++) { +// for (int y = 0; y < height; y++) { +// if (items[y * width + x] == null) +// continue; +// +// Object o = items[y * width + x]; +// if (o instanceof ItemStack) { +// PositionedStack stack = new PositionedStack(items[y * width + x], 25 + x * 18, 6 + y * 18, false); +// stack.setMaxSize(1); +// ingredients.add(stack); +// } else if (o instanceof Integer) { +// ArrayList orbs = new ArrayList(); +// for (Item item : NEIConfig.bloodOrbs) { +// if (((IBloodOrb) item).getOrbLevel() >= (Integer) o) { +// orbs.add(new ItemStack(item)); +// } +// } +// +// PositionedStack stack = new PositionedStack(orbs, 25 + x * 18, 6 + y * 18, false); +// stack.setMaxSize(1); +// ingredients.add(stack); +// }else if(o instanceof List) +// { +// PositionedStack stack = new PositionedStack(o, 25 + x * 18, 6 + y * 18, false); +// stack.setMaxSize(1); +// ingredients.add(stack); +// } +// } +// } +// } +// } +// +// @Override +// public void loadCraftingRecipes(String outputId, Object... results) { +// if (outputId.equals("crafting") && getClass() == NEIBloodOrbShapedHandler.class) { +// for (IRecipe irecipe : (List) CraftingManager.getInstance().getRecipeList()) { +// if (irecipe instanceof ShapedBloodOrbRecipe) { +// CachedBloodOrbRecipe recipe = forgeShapedRecipe((ShapedBloodOrbRecipe) irecipe); +// if (recipe == null) +// continue; +// +// recipe.computeVisuals(); +// arecipes.add(recipe); +// } +// } +// } else { +// super.loadCraftingRecipes(outputId, results); +// } +// } +// +// @Override +// public void loadCraftingRecipes(ItemStack result) { +// for (IRecipe irecipe : (List) CraftingManager.getInstance().getRecipeList()) { +// if (irecipe instanceof ShapedBloodOrbRecipe) { +// CachedBloodOrbRecipe recipe = forgeShapedRecipe((ShapedBloodOrbRecipe) irecipe); +// if (recipe == null || !NEIServerUtils.areStacksSameTypeCrafting(recipe.result.item, result)) +// continue; +// +// recipe.computeVisuals(); +// arecipes.add(recipe); +// } +// } +// } +// +// @Override +// public void loadUsageRecipes(ItemStack ingredient) { +// for (IRecipe irecipe : (List) CraftingManager.getInstance().getRecipeList()) { +// CachedShapedRecipe recipe = null; +// if (irecipe instanceof ShapedBloodOrbRecipe) +// recipe = forgeShapedRecipe((ShapedBloodOrbRecipe) irecipe); +// +// if (recipe == null || !recipe.contains(recipe.ingredients, ingredient.getItem())) +// continue; +// +// recipe.computeVisuals(); +// if (recipe.contains(recipe.ingredients, ingredient)) { +// recipe.setIngredientPermutation(recipe.ingredients, ingredient); +// arecipes.add(recipe); +// } +// } +// } +// +// private CachedBloodOrbRecipe forgeShapedRecipe(ShapedBloodOrbRecipe recipe) { +// int width; +// int height; +// try { +// width = recipe.width; +// height = recipe.height; +// } catch (Exception e) { +// e.printStackTrace(); +// return null; +// } +// +// Object[] items = recipe.getInput(); +// for (Object item : items) +// if (item instanceof List && ((List) item).isEmpty())// ore +// // handler, +// // no ores +// return null; +// +// return new CachedBloodOrbRecipe(width, height, items, recipe.getRecipeOutput()); +// } +// +// @Override +// public void loadTransferRects() { +// transferRects.add(new RecipeTransferRect(new Rectangle(84, 23, 24, 18), "crafting")); +// } +// +// +// @Override +// public String getRecipeName() { +// return StatCollector.translateToLocal("bm.string.crafting.orb.shaped"); +// } +//} diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapelessHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapelessHandler.java index ebf7afba..bd05a2d7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapelessHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIBloodOrbShapelessHandler.java @@ -1,135 +1,135 @@ -package WayofTime.alchemicalWizardry.client.nei; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.StatCollector; -import WayofTime.alchemicalWizardry.api.items.ShapelessBloodOrbRecipe; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.ShapelessRecipeHandler; - -/** - * NEI Blood Orb Shapeless Recipe Handler by joshie * - */ -public class NEIBloodOrbShapelessHandler extends ShapelessRecipeHandler { - public class CachedBloodOrbRecipe extends CachedShapelessRecipe { - public CachedBloodOrbRecipe(ArrayList items, ItemStack recipeOutput) { - super(items, recipeOutput); - } - - @Override - public void setIngredients(List items) { - ingredients.clear(); - for (int ingred = 0; ingred < items.size(); ingred++) { - Object o = items.get(ingred); - if (o instanceof ItemStack) { - PositionedStack stack = new PositionedStack(items.get(ingred), 25 + stackorder[ingred][0] * 18, 6 + stackorder[ingred][1] * 18); - stack.setMaxSize(1); - ingredients.add(stack); - } else if (o instanceof Integer) { - ArrayList orbs = new ArrayList(); - for (Item item : NEIConfig.bloodOrbs) { - if (((IBloodOrb) item).getOrbLevel() >= (Integer) o) { - orbs.add(new ItemStack(item)); - } - } - - PositionedStack stack = new PositionedStack(orbs, 25 + stackorder[ingred][0] * 18, 6 + stackorder[ingred][1] * 18); - stack.setMaxSize(1); - ingredients.add(stack); - }else if(o instanceof List) - { - PositionedStack stack = new PositionedStack(o, 25 + stackorder[ingred][0] * 18, 6 + stackorder[ingred][1] * 18); - stack.setMaxSize(1); - ingredients.add(stack); - } - } - } - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) { - if (outputId.equals("crafting") && getClass() == NEIBloodOrbShapelessHandler.class) { - List allrecipes = CraftingManager.getInstance().getRecipeList(); - for (IRecipe irecipe : allrecipes) { - CachedBloodOrbRecipe recipe = null; - if (irecipe instanceof ShapelessBloodOrbRecipe) - recipe = forgeShapelessRecipe((ShapelessBloodOrbRecipe) irecipe); - - if (recipe == null) - continue; - - arecipes.add(recipe); - } - } else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - List allrecipes = CraftingManager.getInstance().getRecipeList(); - for (IRecipe irecipe : allrecipes) { - if (NEIServerUtils.areStacksSameTypeCrafting(irecipe.getRecipeOutput(), result)) { - CachedBloodOrbRecipe recipe = null; - if (irecipe instanceof ShapelessBloodOrbRecipe) - recipe = forgeShapelessRecipe((ShapelessBloodOrbRecipe) irecipe); - - if (recipe == null) - continue; - - arecipes.add(recipe); - } - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) { - List allrecipes = CraftingManager.getInstance().getRecipeList(); - for (IRecipe irecipe : allrecipes) { - CachedBloodOrbRecipe recipe = null; - if (irecipe instanceof ShapelessBloodOrbRecipe) - recipe = forgeShapelessRecipe((ShapelessBloodOrbRecipe) irecipe); - - if (recipe == null) - continue; - - if (recipe.contains(recipe.ingredients, ingredient)) { - recipe.setIngredientPermutation(recipe.ingredients, ingredient); - arecipes.add(recipe); - } - } - } - - public CachedBloodOrbRecipe forgeShapelessRecipe(ShapelessBloodOrbRecipe recipe) { - ArrayList items = recipe.getInput(); - - for (Object item : items) - if (item instanceof List && ((List) item).isEmpty())//ore handler, no ores - return null; - - return new CachedBloodOrbRecipe(items, recipe.getRecipeOutput()); - } - - @Override - public void loadTransferRects() { - transferRects.add(new RecipeTransferRect(new Rectangle(84, 23, 24, 18), "crafting")); - } - - @Override - public String getOverlayIdentifier() { - return "crafting"; - } - - @Override - public String getRecipeName() { - return StatCollector.translateToLocal("bm.string.crafting.orb.shapeless"); - } -} +//package WayofTime.alchemicalWizardry.client.nei; +// +//import java.awt.Rectangle; +//import java.util.ArrayList; +//import java.util.List; +// +//import net.minecraft.item.Item; +//import net.minecraft.item.ItemStack; +//import net.minecraft.item.crafting.CraftingManager; +//import net.minecraft.item.crafting.IRecipe; +//import net.minecraft.util.StatCollector; +//import WayofTime.alchemicalWizardry.api.items.ShapelessBloodOrbRecipe; +//import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; +//import codechicken.nei.NEIServerUtils; +//import codechicken.nei.PositionedStack; +//import codechicken.nei.recipe.ShapelessRecipeHandler; +// +///** +// * NEI Blood Orb Shapeless Recipe Handler by joshie * +// */ +//public class NEIBloodOrbShapelessHandler extends ShapelessRecipeHandler { +// public class CachedBloodOrbRecipe extends CachedShapelessRecipe { +// public CachedBloodOrbRecipe(ArrayList items, ItemStack recipeOutput) { +// super(items, recipeOutput); +// } +// +// @Override +// public void setIngredients(List items) { +// ingredients.clear(); +// for (int ingred = 0; ingred < items.size(); ingred++) { +// Object o = items.get(ingred); +// if (o instanceof ItemStack) { +// PositionedStack stack = new PositionedStack(items.get(ingred), 25 + stackorder[ingred][0] * 18, 6 + stackorder[ingred][1] * 18); +// stack.setMaxSize(1); +// ingredients.add(stack); +// } else if (o instanceof Integer) { +// ArrayList orbs = new ArrayList(); +// for (Item item : NEIConfig.bloodOrbs) { +// if (((IBloodOrb) item).getOrbLevel() >= (Integer) o) { +// orbs.add(new ItemStack(item)); +// } +// } +// +// PositionedStack stack = new PositionedStack(orbs, 25 + stackorder[ingred][0] * 18, 6 + stackorder[ingred][1] * 18); +// stack.setMaxSize(1); +// ingredients.add(stack); +// }else if(o instanceof List) +// { +// PositionedStack stack = new PositionedStack(o, 25 + stackorder[ingred][0] * 18, 6 + stackorder[ingred][1] * 18); +// stack.setMaxSize(1); +// ingredients.add(stack); +// } +// } +// } +// } +// +// @Override +// public void loadCraftingRecipes(String outputId, Object... results) { +// if (outputId.equals("crafting") && getClass() == NEIBloodOrbShapelessHandler.class) { +// List allrecipes = CraftingManager.getInstance().getRecipeList(); +// for (IRecipe irecipe : allrecipes) { +// CachedBloodOrbRecipe recipe = null; +// if (irecipe instanceof ShapelessBloodOrbRecipe) +// recipe = forgeShapelessRecipe((ShapelessBloodOrbRecipe) irecipe); +// +// if (recipe == null) +// continue; +// +// arecipes.add(recipe); +// } +// } else { +// super.loadCraftingRecipes(outputId, results); +// } +// } +// +// @Override +// public void loadCraftingRecipes(ItemStack result) { +// List allrecipes = CraftingManager.getInstance().getRecipeList(); +// for (IRecipe irecipe : allrecipes) { +// if (NEIServerUtils.areStacksSameTypeCrafting(irecipe.getRecipeOutput(), result)) { +// CachedBloodOrbRecipe recipe = null; +// if (irecipe instanceof ShapelessBloodOrbRecipe) +// recipe = forgeShapelessRecipe((ShapelessBloodOrbRecipe) irecipe); +// +// if (recipe == null) +// continue; +// +// arecipes.add(recipe); +// } +// } +// } +// +// @Override +// public void loadUsageRecipes(ItemStack ingredient) { +// List allrecipes = CraftingManager.getInstance().getRecipeList(); +// for (IRecipe irecipe : allrecipes) { +// CachedBloodOrbRecipe recipe = null; +// if (irecipe instanceof ShapelessBloodOrbRecipe) +// recipe = forgeShapelessRecipe((ShapelessBloodOrbRecipe) irecipe); +// +// if (recipe == null) +// continue; +// +// if (recipe.contains(recipe.ingredients, ingredient)) { +// recipe.setIngredientPermutation(recipe.ingredients, ingredient); +// arecipes.add(recipe); +// } +// } +// } +// +// public CachedBloodOrbRecipe forgeShapelessRecipe(ShapelessBloodOrbRecipe recipe) { +// ArrayList items = recipe.getInput(); +// +// for (Object item : items) +// if (item instanceof List && ((List) item).isEmpty())//ore handler, no ores +// return null; +// +// return new CachedBloodOrbRecipe(items, recipe.getRecipeOutput()); +// } +// +// @Override +// public void loadTransferRects() { +// transferRects.add(new RecipeTransferRect(new Rectangle(84, 23, 24, 18), "crafting")); +// } +// +// @Override +// public String getOverlayIdentifier() { +// return "crafting"; +// } +// +// @Override +// public String getRecipeName() { +// return StatCollector.translateToLocal("bm.string.crafting.orb.shapeless"); +// } +//} diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIConfig.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIConfig.java index 4fa27786..bedb5213 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIConfig.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIConfig.java @@ -1,36 +1,36 @@ -package WayofTime.alchemicalWizardry.client.nei; - - -import java.util.ArrayList; - -import net.minecraft.item.Item; -import codechicken.nei.api.API; -import codechicken.nei.api.IConfigureNEI; - -public class NEIConfig implements IConfigureNEI { - public static ArrayList bloodOrbs = new ArrayList(); - - @Override - public void loadConfig() { - API.registerRecipeHandler(new NEIAlchemyRecipeHandler()); - API.registerUsageHandler(new NEIAlchemyRecipeHandler()); - API.registerRecipeHandler(new NEIAltarRecipeHandler()); - API.registerUsageHandler(new NEIAltarRecipeHandler()); - API.registerRecipeHandler(new NEIBloodOrbShapedHandler()); - API.registerUsageHandler(new NEIBloodOrbShapedHandler()); - API.registerRecipeHandler(new NEIBloodOrbShapelessHandler()); - API.registerUsageHandler(new NEIBloodOrbShapelessHandler()); - API.registerRecipeHandler(new NEIBindingRitualHandler()); - API.registerUsageHandler(new NEIBindingRitualHandler()); - } - - @Override - public String getName() { - return "Blood Magic NEI"; - } - - @Override - public String getVersion() { - return "1.3"; - } -} +//package WayofTime.alchemicalWizardry.client.nei; +// +// +//import java.util.ArrayList; +// +//import net.minecraft.item.Item; +//import codechicken.nei.api.API; +//import codechicken.nei.api.IConfigureNEI; +// +//public class NEIConfig implements IConfigureNEI { +// public static ArrayList bloodOrbs = new ArrayList(); +// +// @Override +// public void loadConfig() { +// API.registerRecipeHandler(new NEIAlchemyRecipeHandler()); +// API.registerUsageHandler(new NEIAlchemyRecipeHandler()); +// API.registerRecipeHandler(new NEIAltarRecipeHandler()); +// API.registerUsageHandler(new NEIAltarRecipeHandler()); +// API.registerRecipeHandler(new NEIBloodOrbShapedHandler()); +// API.registerUsageHandler(new NEIBloodOrbShapedHandler()); +// API.registerRecipeHandler(new NEIBloodOrbShapelessHandler()); +// API.registerUsageHandler(new NEIBloodOrbShapelessHandler()); +// API.registerRecipeHandler(new NEIBindingRitualHandler()); +// API.registerUsageHandler(new NEIBindingRitualHandler()); +// } +// +// @Override +// public String getName() { +// return "Blood Magic NEI"; +// } +// +// @Override +// public String getVersion() { +// return "1.3"; +// } +//} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_concentrated_catalyst.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_concentrated_catalyst.json new file mode 100644 index 00000000..32a7a0cf --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_concentrated_catalyst.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseAlchemyItem_concentrated_catalyst" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_fractured_bone.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_fractured_bone.json new file mode 100644 index 00000000..e522e583 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_fractured_bone.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseAlchemyItem_fractured_bone" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_offensa.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_offensa.json new file mode 100644 index 00000000..345f6f0f --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_offensa.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseAlchemyItem_offensa" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_orbis_terrae.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_orbis_terrae.json new file mode 100644 index 00000000..23d10cf7 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_orbis_terrae.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseAlchemyItem_orbis_terrae" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_potentia.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_potentia.json new file mode 100644 index 00000000..562ef958 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_potentia.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseAlchemyItem_potentia" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_praesidium.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_praesidium.json new file mode 100644 index 00000000..16af9851 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_praesidium.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseAlchemyItem_praesidium" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_reductus.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_reductus.json new file mode 100644 index 00000000..1ed71e30 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_reductus.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseAlchemyItem_reductus" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_strengthened_catalyst.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_strengthened_catalyst.json new file mode 100644 index 00000000..9dd78462 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_strengthened_catalyst.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseAlchemyItem_strengthened_catalyst" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_virtus.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_virtus.json new file mode 100644 index 00000000..0d9fe482 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_alchemy_items_virtus.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseAlchemyItem_virtus" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_cost_core.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_cost_core.json new file mode 100644 index 00000000..89b38a07 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_cost_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_cost_core" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_cracked_runic_plate.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_cracked_runic_plate.json new file mode 100644 index 00000000..f5c267de --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_cracked_runic_plate.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_cracked_runic_plate" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_default_core.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_default_core.json new file mode 100644 index 00000000..cfb8d2f7 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_default_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_default_core" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_defensive_core.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_defensive_core.json new file mode 100644 index 00000000..21c8ec50 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_defensive_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_defensive_core" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_earthen_core.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_earthen_core.json new file mode 100644 index 00000000..105f006c --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_earthen_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_earthen_core" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_empty_core.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_empty_core.json new file mode 100644 index 00000000..1ac4bf4b --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_empty_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_empty_core" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_ender_shard.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_ender_shard.json new file mode 100644 index 00000000..168c7cd5 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_ender_shard.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_ender_shard" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_environmental_core.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_environmental_core.json new file mode 100644 index 00000000..572e0952 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_environmental_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_environmental_core" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_ethereal_slate.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_ethereal_slate.json new file mode 100644 index 00000000..9a6256d5 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_ethereal_slate.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_ethereal_slate" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_flame_core.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_flame_core.json new file mode 100644 index 00000000..eb3730d4 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_flame_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_flame_core" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_gust_core.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_gust_core.json new file mode 100644 index 00000000..54532099 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_gust_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_gust_core" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_icy_core.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_icy_core.json new file mode 100644 index 00000000..288c806c --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_icy_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_icy_core" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_input_cable.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_input_cable.json new file mode 100644 index 00000000..6b170e34 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_input_cable.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_input_cable" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_life_brace.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_life_brace.json new file mode 100644 index 00000000..37288fac --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_life_brace.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_life_brace" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_life_shard.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_life_shard.json new file mode 100644 index 00000000..565ff666 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_life_shard.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_life_shard" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_magicales_cable.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_magicales_cable.json new file mode 100644 index 00000000..a419e50e --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_magicales_cable.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_magicales_cable" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_melee_core.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_melee_core.json new file mode 100644 index 00000000..a775c118 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_melee_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_melee_core" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_obsidian_brace.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_obsidian_brace.json new file mode 100644 index 00000000..95b9ed09 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_obsidian_brace.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_obsidian_brace" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_offensive_core.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_offensive_core.json new file mode 100644 index 00000000..aa1b3211 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_offensive_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_offensive_core" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_output_cable.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_output_cable.json new file mode 100644 index 00000000..e60e2ce9 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_output_cable.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_output_cable" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_paradigm_back_plate.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_paradigm_back_plate.json new file mode 100644 index 00000000..75bc6878 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_paradigm_back_plate.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_paradigm_back_plate" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_potency_core.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_potency_core.json new file mode 100644 index 00000000..521cfc37 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_potency_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_potency_core" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_power_core.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_power_core.json new file mode 100644 index 00000000..b1f20d72 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_power_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_power_core" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_projectile_core.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_projectile_core.json new file mode 100644 index 00000000..fc0678f5 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_projectile_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_projectile_core" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_quartz_rod.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_quartz_rod.json new file mode 100644 index 00000000..2687255c --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_quartz_rod.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_quartz_rod" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_runic_plate.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_runic_plate.json new file mode 100644 index 00000000..4654f87b --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_runic_plate.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_runic_plate" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_scribed_runic_plate.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_scribed_runic_plate.json new file mode 100644 index 00000000..95f12ac6 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_scribed_runic_plate.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_scribed_runic_plate" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_self_core.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_self_core.json new file mode 100644 index 00000000..147888f7 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_self_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_self_core" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_soul_runic_plate.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_soul_runic_plate.json new file mode 100644 index 00000000..8a4b1c59 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_soul_runic_plate.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_soul_runic_plate" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_soul_shard.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_soul_shard.json new file mode 100644 index 00000000..2e39ef90 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_soul_shard.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_soul_shard" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_stone_brace.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_stone_brace.json new file mode 100644 index 00000000..5ffc1f26 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_stone_brace.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_stone_brace" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_tool_core.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_tool_core.json new file mode 100644 index 00000000..5eea9c3f --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_tool_core.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_tool_core" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/base_items_wood_brace.json b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_wood_brace.json new file mode 100644 index 00000000..4ac279a7 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/base_items_wood_brace.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/baseItem_wood_brace" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/blood_light_sigil.json b/src/main/resources/assets/alchemicalwizardry/models/item/blood_light_sigil.json new file mode 100644 index 00000000..a9137df9 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/blood_light_sigil.json @@ -0,0 +1,8 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/BloodLightSigil" + } +} + + diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/bucket_life.json b/src/main/resources/assets/alchemicalwizardry/models/item/bucket_life.json new file mode 100644 index 00000000..5e26abcb --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/bucket_life.json @@ -0,0 +1,8 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/LifeBucket" + } +} + + diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/complex_spell_crystal.json b/src/main/resources/assets/alchemicalwizardry/models/item/complex_spell_crystal.json new file mode 100644 index 00000000..8ba2a990 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/complex_spell_crystal.json @@ -0,0 +1,8 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/ComplexCrystal" + } +} + + diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/creative_dagger.json b/src/main/resources/assets/alchemicalwizardry/models/item/creative_dagger.json new file mode 100644 index 00000000..33bdba7f --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/creative_dagger.json @@ -0,0 +1,8 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/SacrificialDagger" + } +} + + diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/demon_crystal.json b/src/main/resources/assets/alchemicalwizardry/models/item/demon_crystal.json new file mode 100644 index 00000000..c3149853 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/demon_crystal.json @@ -0,0 +1,8 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/DemonPlacer" + } +} + + diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/enhanced_filling_agent.json b/src/main/resources/assets/alchemicalwizardry/models/item/enhanced_filling_agent.json new file mode 100644 index 00000000..fd359db6 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/enhanced_filling_agent.json @@ -0,0 +1,8 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/EnhancedFillingAgent" + } +} + + diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/key_of_binding.json b/src/main/resources/assets/alchemicalwizardry/models/item/key_of_binding.json new file mode 100644 index 00000000..acbb4fb5 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/key_of_binding.json @@ -0,0 +1,8 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/DiabloKey" + } +} + + diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/multi_tool.json b/src/main/resources/assets/alchemicalwizardry/models/item/multi_tool.json new file mode 100644 index 00000000..a96ec670 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/multi_tool.json @@ -0,0 +1,8 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/BoundTool" + } +} + + diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/ritual_diviner.json b/src/main/resources/assets/alchemicalwizardry/models/item/ritual_diviner.json new file mode 100644 index 00000000..4d54f903 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/ritual_diviner.json @@ -0,0 +1,8 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/RitualDiviner" + } +} + + diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/sigil_of_ender_severance_activated.json b/src/main/resources/assets/alchemicalwizardry/models/item/sigil_of_ender_severance_activated.json new file mode 100644 index 00000000..caa2b0a8 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/sigil_of_ender_severance_activated.json @@ -0,0 +1,8 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/SigilOfSeverance_activated" + } +} + + diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/sigil_of_ender_severance_deactivated.json b/src/main/resources/assets/alchemicalwizardry/models/item/sigil_of_ender_severance_deactivated.json new file mode 100644 index 00000000..462d6eff --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/sigil_of_ender_severance_deactivated.json @@ -0,0 +1,8 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/SigilOfSeverance_deactivated" + } +} + + diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/sigil_of_sight.json b/src/main/resources/assets/alchemicalwizardry/models/item/sigil_of_sight.json new file mode 100644 index 00000000..1e948b57 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/sigil_of_sight.json @@ -0,0 +1,8 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/SeerSigil" + } +} + + diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/standard_filling_agent.json b/src/main/resources/assets/alchemicalwizardry/models/item/standard_filling_agent.json new file mode 100644 index 00000000..04711232 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/standard_filling_agent.json @@ -0,0 +1,8 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/StandardFillingAgent" + } +} + + diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/weak_binding_agent.json b/src/main/resources/assets/alchemicalwizardry/models/item/weak_binding_agent.json new file mode 100644 index 00000000..24a27ca5 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/weak_binding_agent.json @@ -0,0 +1,8 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/WeakBindingAGent" + } +} + + diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/weak_filling_agent.json b/src/main/resources/assets/alchemicalwizardry/models/item/weak_filling_agent.json new file mode 100644 index 00000000..c65c0bf7 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/weak_filling_agent.json @@ -0,0 +1,8 @@ +{ + "parent":"alchemicalwizardry:item/standard_item", + "textures": { + "layer0":"alchemicalwizardry:items/WeakFillingAgent" + } +} + + diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItemConcentratedCatalyst.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItem_concentrated_catalyst.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItemConcentratedCatalyst.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItem_concentrated_catalyst.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItemFracturedBone.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItem_fractured_bone.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItemFracturedBone.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItem_fractured_bone.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItemOffensa.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItem_offensa.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItemOffensa.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItem_offensa.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItemOrbisTerrae.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItem_orbis_terrae.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItemOrbisTerrae.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItem_orbis_terrae.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItemPotentia.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItem_potentia.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItemPotentia.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItem_potentia.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItemPraesidium.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItem_praesidium.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItemPraesidium.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItem_praesidium.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItemReductus.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItem_reductus.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItemReductus.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItem_reductus.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItemStrengthenedCatalyst.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItem_strengthened_catalyst.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItemStrengthenedCatalyst.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItem_strengthened_catalyst.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItemVirtus.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItem_virtus.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItemVirtus.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseAlchemyItem_virtus.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseIncenseItemWoodash.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseIncenseItem_woodash.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseIncenseItemWoodash.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseIncenseItem_woodash.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemCostCore.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_cost_core.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemCostCore.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_cost_core.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemCrackedRunicPlate.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_cracked_runic_plate.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemCrackedRunicPlate.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_cracked_runic_plate.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemDefaultCore.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_default_core.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemDefaultCore.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_default_core.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemDefensiveCore.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_defensive_core.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemDefensiveCore.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_defensive_core.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemEarthenCore.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_earthen_core.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemEarthenCore.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_earthen_core.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemEmptyCore.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_empty_core.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemEmptyCore.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_empty_core.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemEnderShard.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_ender_shard.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemEnderShard.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_ender_shard.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemEnvironmentalCore.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_environmental_core.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemEnvironmentalCore.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_environmental_core.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemEtherealSlate.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_ethereal_slate.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemEtherealSlate.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_ethereal_slate.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemFlameCore.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_flame_core.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemFlameCore.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_flame_core.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemGustCore.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_gust_core.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemGustCore.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_gust_core.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemIcyCore.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_icy_core.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemIcyCore.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_icy_core.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemInputCable.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_input_cable.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemInputCable.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_input_cable.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemLifeBrace.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_life_brace.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemLifeBrace.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_life_brace.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemLifeShard.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_life_shard.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemLifeShard.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_life_shard.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemMagicalesCable.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_magicales_cable.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemMagicalesCable.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_magicales_cable.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemMeleeCore.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_melee_core.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemMeleeCore.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_melee_core.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemObsidianBrace.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_obsidian_brace.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemObsidianBrace.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_obsidian_brace.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemOffensiveCore.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_offensive_core.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemOffensiveCore.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_offensive_core.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemOutputCable.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_output_cable.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemOutputCable.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_output_cable.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemParadigmBackPlate.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_paradigm_back_plate.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemParadigmBackPlate.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_paradigm_back_plate.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemPotencyCore.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_potency_core.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemPotencyCore.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_potency_core.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemPowerCore.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_power_core.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemPowerCore.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_power_core.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemProjectileCore.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_projectile_core.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemProjectileCore.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_projectile_core.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemQuartzRod.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_quartz_rod.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemQuartzRod.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_quartz_rod.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemRunicPlate.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_runic_plate.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemRunicPlate.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_runic_plate.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemScribedRunicPlate.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_scribed_runic_plate.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemScribedRunicPlate.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_scribed_runic_plate.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemSelfCore.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_self_core.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemSelfCore.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_self_core.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemSoulRunicPlate.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_soul_runic_plate.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemSoulRunicPlate.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_soul_runic_plate.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemSoulShard.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_soul_shard.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemSoulShard.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_soul_shard.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemStoneBrace.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_stone_brace.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemStoneBrace.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_stone_brace.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemToolCore.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_tool_core.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemToolCore.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_tool_core.png diff --git a/src/main/resources/assets/alchemicalwizardry/textures/items/baseItemWoodBrace.png b/src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_wood_brace.png similarity index 100% rename from src/main/resources/assets/alchemicalwizardry/textures/items/baseItemWoodBrace.png rename to src/main/resources/assets/alchemicalwizardry/textures/items/baseItem_wood_brace.png