diff --git a/Inventory++/3d_armor/LICENSE.txt b/3d_armor/LICENSE.txt similarity index 100% rename from Inventory++/3d_armor/LICENSE.txt rename to 3d_armor/LICENSE.txt diff --git a/Inventory++/3d_armor/README.txt b/3d_armor/README.txt similarity index 100% rename from Inventory++/3d_armor/README.txt rename to 3d_armor/README.txt diff --git a/Inventory++/3d_armor/api.lua b/3d_armor/api.lua similarity index 100% rename from Inventory++/3d_armor/api.lua rename to 3d_armor/api.lua diff --git a/Inventory++/3d_armor/armor.conf.example b/3d_armor/armor.conf.example similarity index 100% rename from Inventory++/3d_armor/armor.conf.example rename to 3d_armor/armor.conf.example diff --git a/Inventory++/3d_armor/armor.lua b/3d_armor/armor.lua similarity index 100% rename from Inventory++/3d_armor/armor.lua rename to 3d_armor/armor.lua diff --git a/Inventory++/3d_armor/crafting_guide.txt b/3d_armor/crafting_guide.txt similarity index 100% rename from Inventory++/3d_armor/crafting_guide.txt rename to 3d_armor/crafting_guide.txt diff --git a/Inventory++/3d_armor/depends.txt b/3d_armor/depends.txt similarity index 100% rename from Inventory++/3d_armor/depends.txt rename to 3d_armor/depends.txt diff --git a/Inventory++/3d_armor/description.txt b/3d_armor/description.txt similarity index 100% rename from Inventory++/3d_armor/description.txt rename to 3d_armor/description.txt diff --git a/Inventory++/3d_armor/init.lua b/3d_armor/init.lua similarity index 100% rename from Inventory++/3d_armor/init.lua rename to 3d_armor/init.lua diff --git a/Inventory++/3d_armor/models/3d_armor_character.b3d b/3d_armor/models/3d_armor_character.b3d similarity index 100% rename from Inventory++/3d_armor/models/3d_armor_character.b3d rename to 3d_armor/models/3d_armor_character.b3d diff --git a/Inventory++/3d_armor/models/3d_armor_character.blend b/3d_armor/models/3d_armor_character.blend similarity index 100% rename from Inventory++/3d_armor/models/3d_armor_character.blend rename to 3d_armor/models/3d_armor_character.blend diff --git a/Inventory++/3d_armor/textures/3d_armor_boots_admin.png b/3d_armor/textures/3d_armor_boots_admin.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_boots_admin.png rename to 3d_armor/textures/3d_armor_boots_admin.png diff --git a/Inventory++/3d_armor/textures/3d_armor_boots_admin_preview.png b/3d_armor/textures/3d_armor_boots_admin_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_boots_admin_preview.png rename to 3d_armor/textures/3d_armor_boots_admin_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_boots_bronze.png b/3d_armor/textures/3d_armor_boots_bronze.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_boots_bronze.png rename to 3d_armor/textures/3d_armor_boots_bronze.png diff --git a/Inventory++/3d_armor/textures/3d_armor_boots_bronze_preview.png b/3d_armor/textures/3d_armor_boots_bronze_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_boots_bronze_preview.png rename to 3d_armor/textures/3d_armor_boots_bronze_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_boots_cactus.png b/3d_armor/textures/3d_armor_boots_cactus.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_boots_cactus.png rename to 3d_armor/textures/3d_armor_boots_cactus.png diff --git a/Inventory++/3d_armor/textures/3d_armor_boots_cactus_preview.png b/3d_armor/textures/3d_armor_boots_cactus_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_boots_cactus_preview.png rename to 3d_armor/textures/3d_armor_boots_cactus_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_boots_crystal.png b/3d_armor/textures/3d_armor_boots_crystal.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_boots_crystal.png rename to 3d_armor/textures/3d_armor_boots_crystal.png diff --git a/Inventory++/3d_armor/textures/3d_armor_boots_crystal_preview.png b/3d_armor/textures/3d_armor_boots_crystal_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_boots_crystal_preview.png rename to 3d_armor/textures/3d_armor_boots_crystal_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_boots_diamond.png b/3d_armor/textures/3d_armor_boots_diamond.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_boots_diamond.png rename to 3d_armor/textures/3d_armor_boots_diamond.png diff --git a/Inventory++/3d_armor/textures/3d_armor_boots_diamond_preview.png b/3d_armor/textures/3d_armor_boots_diamond_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_boots_diamond_preview.png rename to 3d_armor/textures/3d_armor_boots_diamond_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_boots_gold.png b/3d_armor/textures/3d_armor_boots_gold.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_boots_gold.png rename to 3d_armor/textures/3d_armor_boots_gold.png diff --git a/Inventory++/3d_armor/textures/3d_armor_boots_gold_preview.png b/3d_armor/textures/3d_armor_boots_gold_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_boots_gold_preview.png rename to 3d_armor/textures/3d_armor_boots_gold_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_boots_mithril.png b/3d_armor/textures/3d_armor_boots_mithril.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_boots_mithril.png rename to 3d_armor/textures/3d_armor_boots_mithril.png diff --git a/Inventory++/3d_armor/textures/3d_armor_boots_mithril_preview.png b/3d_armor/textures/3d_armor_boots_mithril_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_boots_mithril_preview.png rename to 3d_armor/textures/3d_armor_boots_mithril_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_boots_steel.png b/3d_armor/textures/3d_armor_boots_steel.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_boots_steel.png rename to 3d_armor/textures/3d_armor_boots_steel.png diff --git a/Inventory++/3d_armor/textures/3d_armor_boots_steel_preview.png b/3d_armor/textures/3d_armor_boots_steel_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_boots_steel_preview.png rename to 3d_armor/textures/3d_armor_boots_steel_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_boots_wood.png b/3d_armor/textures/3d_armor_boots_wood.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_boots_wood.png rename to 3d_armor/textures/3d_armor_boots_wood.png diff --git a/Inventory++/3d_armor/textures/3d_armor_boots_wood_preview.png b/3d_armor/textures/3d_armor_boots_wood_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_boots_wood_preview.png rename to 3d_armor/textures/3d_armor_boots_wood_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_chestplate_admin.png b/3d_armor/textures/3d_armor_chestplate_admin.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_chestplate_admin.png rename to 3d_armor/textures/3d_armor_chestplate_admin.png diff --git a/Inventory++/3d_armor/textures/3d_armor_chestplate_admin_preview.png b/3d_armor/textures/3d_armor_chestplate_admin_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_chestplate_admin_preview.png rename to 3d_armor/textures/3d_armor_chestplate_admin_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_chestplate_bronze.png b/3d_armor/textures/3d_armor_chestplate_bronze.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_chestplate_bronze.png rename to 3d_armor/textures/3d_armor_chestplate_bronze.png diff --git a/Inventory++/3d_armor/textures/3d_armor_chestplate_bronze_preview.png b/3d_armor/textures/3d_armor_chestplate_bronze_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_chestplate_bronze_preview.png rename to 3d_armor/textures/3d_armor_chestplate_bronze_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_chestplate_cactus.png b/3d_armor/textures/3d_armor_chestplate_cactus.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_chestplate_cactus.png rename to 3d_armor/textures/3d_armor_chestplate_cactus.png diff --git a/Inventory++/3d_armor/textures/3d_armor_chestplate_cactus_preview.png b/3d_armor/textures/3d_armor_chestplate_cactus_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_chestplate_cactus_preview.png rename to 3d_armor/textures/3d_armor_chestplate_cactus_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_chestplate_crystal.png b/3d_armor/textures/3d_armor_chestplate_crystal.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_chestplate_crystal.png rename to 3d_armor/textures/3d_armor_chestplate_crystal.png diff --git a/Inventory++/3d_armor/textures/3d_armor_chestplate_crystal_preview.png b/3d_armor/textures/3d_armor_chestplate_crystal_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_chestplate_crystal_preview.png rename to 3d_armor/textures/3d_armor_chestplate_crystal_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_chestplate_diamond.png b/3d_armor/textures/3d_armor_chestplate_diamond.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_chestplate_diamond.png rename to 3d_armor/textures/3d_armor_chestplate_diamond.png diff --git a/Inventory++/3d_armor/textures/3d_armor_chestplate_diamond_preview.png b/3d_armor/textures/3d_armor_chestplate_diamond_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_chestplate_diamond_preview.png rename to 3d_armor/textures/3d_armor_chestplate_diamond_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_chestplate_gold.png b/3d_armor/textures/3d_armor_chestplate_gold.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_chestplate_gold.png rename to 3d_armor/textures/3d_armor_chestplate_gold.png diff --git a/Inventory++/3d_armor/textures/3d_armor_chestplate_gold_preview.png b/3d_armor/textures/3d_armor_chestplate_gold_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_chestplate_gold_preview.png rename to 3d_armor/textures/3d_armor_chestplate_gold_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_chestplate_mithril.png b/3d_armor/textures/3d_armor_chestplate_mithril.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_chestplate_mithril.png rename to 3d_armor/textures/3d_armor_chestplate_mithril.png diff --git a/Inventory++/3d_armor/textures/3d_armor_chestplate_mithril_preview.png b/3d_armor/textures/3d_armor_chestplate_mithril_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_chestplate_mithril_preview.png rename to 3d_armor/textures/3d_armor_chestplate_mithril_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_chestplate_steel.png b/3d_armor/textures/3d_armor_chestplate_steel.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_chestplate_steel.png rename to 3d_armor/textures/3d_armor_chestplate_steel.png diff --git a/Inventory++/3d_armor/textures/3d_armor_chestplate_steel_preview.png b/3d_armor/textures/3d_armor_chestplate_steel_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_chestplate_steel_preview.png rename to 3d_armor/textures/3d_armor_chestplate_steel_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_chestplate_wood.png b/3d_armor/textures/3d_armor_chestplate_wood.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_chestplate_wood.png rename to 3d_armor/textures/3d_armor_chestplate_wood.png diff --git a/Inventory++/3d_armor/textures/3d_armor_chestplate_wood_preview.png b/3d_armor/textures/3d_armor_chestplate_wood_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_chestplate_wood_preview.png rename to 3d_armor/textures/3d_armor_chestplate_wood_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_helmet_admin.png b/3d_armor/textures/3d_armor_helmet_admin.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_helmet_admin.png rename to 3d_armor/textures/3d_armor_helmet_admin.png diff --git a/Inventory++/3d_armor/textures/3d_armor_helmet_admin_preview.png b/3d_armor/textures/3d_armor_helmet_admin_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_helmet_admin_preview.png rename to 3d_armor/textures/3d_armor_helmet_admin_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_helmet_bronze.png b/3d_armor/textures/3d_armor_helmet_bronze.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_helmet_bronze.png rename to 3d_armor/textures/3d_armor_helmet_bronze.png diff --git a/Inventory++/3d_armor/textures/3d_armor_helmet_bronze_preview.png b/3d_armor/textures/3d_armor_helmet_bronze_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_helmet_bronze_preview.png rename to 3d_armor/textures/3d_armor_helmet_bronze_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_helmet_cactus.png b/3d_armor/textures/3d_armor_helmet_cactus.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_helmet_cactus.png rename to 3d_armor/textures/3d_armor_helmet_cactus.png diff --git a/Inventory++/3d_armor/textures/3d_armor_helmet_cactus_preview.png b/3d_armor/textures/3d_armor_helmet_cactus_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_helmet_cactus_preview.png rename to 3d_armor/textures/3d_armor_helmet_cactus_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_helmet_crystal.png b/3d_armor/textures/3d_armor_helmet_crystal.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_helmet_crystal.png rename to 3d_armor/textures/3d_armor_helmet_crystal.png diff --git a/Inventory++/3d_armor/textures/3d_armor_helmet_crystal_preview.png b/3d_armor/textures/3d_armor_helmet_crystal_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_helmet_crystal_preview.png rename to 3d_armor/textures/3d_armor_helmet_crystal_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_helmet_diamond.png b/3d_armor/textures/3d_armor_helmet_diamond.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_helmet_diamond.png rename to 3d_armor/textures/3d_armor_helmet_diamond.png diff --git a/Inventory++/3d_armor/textures/3d_armor_helmet_diamond_preview.png b/3d_armor/textures/3d_armor_helmet_diamond_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_helmet_diamond_preview.png rename to 3d_armor/textures/3d_armor_helmet_diamond_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_helmet_gold.png b/3d_armor/textures/3d_armor_helmet_gold.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_helmet_gold.png rename to 3d_armor/textures/3d_armor_helmet_gold.png diff --git a/Inventory++/3d_armor/textures/3d_armor_helmet_gold_preview.png b/3d_armor/textures/3d_armor_helmet_gold_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_helmet_gold_preview.png rename to 3d_armor/textures/3d_armor_helmet_gold_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_helmet_mithril.png b/3d_armor/textures/3d_armor_helmet_mithril.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_helmet_mithril.png rename to 3d_armor/textures/3d_armor_helmet_mithril.png diff --git a/Inventory++/3d_armor/textures/3d_armor_helmet_mithril_preview.png b/3d_armor/textures/3d_armor_helmet_mithril_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_helmet_mithril_preview.png rename to 3d_armor/textures/3d_armor_helmet_mithril_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_helmet_steel.png b/3d_armor/textures/3d_armor_helmet_steel.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_helmet_steel.png rename to 3d_armor/textures/3d_armor_helmet_steel.png diff --git a/Inventory++/3d_armor/textures/3d_armor_helmet_steel_preview.png b/3d_armor/textures/3d_armor_helmet_steel_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_helmet_steel_preview.png rename to 3d_armor/textures/3d_armor_helmet_steel_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_helmet_wood.png b/3d_armor/textures/3d_armor_helmet_wood.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_helmet_wood.png rename to 3d_armor/textures/3d_armor_helmet_wood.png diff --git a/Inventory++/3d_armor/textures/3d_armor_helmet_wood_preview.png b/3d_armor/textures/3d_armor_helmet_wood_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_helmet_wood_preview.png rename to 3d_armor/textures/3d_armor_helmet_wood_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_boots_admin.png b/3d_armor/textures/3d_armor_inv_boots_admin.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_boots_admin.png rename to 3d_armor/textures/3d_armor_inv_boots_admin.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_boots_bronze.png b/3d_armor/textures/3d_armor_inv_boots_bronze.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_boots_bronze.png rename to 3d_armor/textures/3d_armor_inv_boots_bronze.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_boots_cactus.png b/3d_armor/textures/3d_armor_inv_boots_cactus.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_boots_cactus.png rename to 3d_armor/textures/3d_armor_inv_boots_cactus.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_boots_crystal.png b/3d_armor/textures/3d_armor_inv_boots_crystal.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_boots_crystal.png rename to 3d_armor/textures/3d_armor_inv_boots_crystal.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_boots_diamond.png b/3d_armor/textures/3d_armor_inv_boots_diamond.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_boots_diamond.png rename to 3d_armor/textures/3d_armor_inv_boots_diamond.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_boots_gold.png b/3d_armor/textures/3d_armor_inv_boots_gold.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_boots_gold.png rename to 3d_armor/textures/3d_armor_inv_boots_gold.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_boots_mithril.png b/3d_armor/textures/3d_armor_inv_boots_mithril.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_boots_mithril.png rename to 3d_armor/textures/3d_armor_inv_boots_mithril.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_boots_steel.png b/3d_armor/textures/3d_armor_inv_boots_steel.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_boots_steel.png rename to 3d_armor/textures/3d_armor_inv_boots_steel.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_boots_wood.png b/3d_armor/textures/3d_armor_inv_boots_wood.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_boots_wood.png rename to 3d_armor/textures/3d_armor_inv_boots_wood.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_chestplate_admin.png b/3d_armor/textures/3d_armor_inv_chestplate_admin.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_chestplate_admin.png rename to 3d_armor/textures/3d_armor_inv_chestplate_admin.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_chestplate_bronze.png b/3d_armor/textures/3d_armor_inv_chestplate_bronze.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_chestplate_bronze.png rename to 3d_armor/textures/3d_armor_inv_chestplate_bronze.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_chestplate_cactus.png b/3d_armor/textures/3d_armor_inv_chestplate_cactus.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_chestplate_cactus.png rename to 3d_armor/textures/3d_armor_inv_chestplate_cactus.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_chestplate_crystal.png b/3d_armor/textures/3d_armor_inv_chestplate_crystal.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_chestplate_crystal.png rename to 3d_armor/textures/3d_armor_inv_chestplate_crystal.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_chestplate_diamond.png b/3d_armor/textures/3d_armor_inv_chestplate_diamond.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_chestplate_diamond.png rename to 3d_armor/textures/3d_armor_inv_chestplate_diamond.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_chestplate_gold.png b/3d_armor/textures/3d_armor_inv_chestplate_gold.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_chestplate_gold.png rename to 3d_armor/textures/3d_armor_inv_chestplate_gold.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_chestplate_mithril.png b/3d_armor/textures/3d_armor_inv_chestplate_mithril.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_chestplate_mithril.png rename to 3d_armor/textures/3d_armor_inv_chestplate_mithril.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_chestplate_steel.png b/3d_armor/textures/3d_armor_inv_chestplate_steel.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_chestplate_steel.png rename to 3d_armor/textures/3d_armor_inv_chestplate_steel.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_chestplate_wood.png b/3d_armor/textures/3d_armor_inv_chestplate_wood.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_chestplate_wood.png rename to 3d_armor/textures/3d_armor_inv_chestplate_wood.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_helmet_admin.png b/3d_armor/textures/3d_armor_inv_helmet_admin.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_helmet_admin.png rename to 3d_armor/textures/3d_armor_inv_helmet_admin.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_helmet_bronze.png b/3d_armor/textures/3d_armor_inv_helmet_bronze.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_helmet_bronze.png rename to 3d_armor/textures/3d_armor_inv_helmet_bronze.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_helmet_cactus.png b/3d_armor/textures/3d_armor_inv_helmet_cactus.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_helmet_cactus.png rename to 3d_armor/textures/3d_armor_inv_helmet_cactus.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_helmet_crystal.png b/3d_armor/textures/3d_armor_inv_helmet_crystal.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_helmet_crystal.png rename to 3d_armor/textures/3d_armor_inv_helmet_crystal.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_helmet_diamond.png b/3d_armor/textures/3d_armor_inv_helmet_diamond.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_helmet_diamond.png rename to 3d_armor/textures/3d_armor_inv_helmet_diamond.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_helmet_gold.png b/3d_armor/textures/3d_armor_inv_helmet_gold.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_helmet_gold.png rename to 3d_armor/textures/3d_armor_inv_helmet_gold.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_helmet_mithril.png b/3d_armor/textures/3d_armor_inv_helmet_mithril.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_helmet_mithril.png rename to 3d_armor/textures/3d_armor_inv_helmet_mithril.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_helmet_steel.png b/3d_armor/textures/3d_armor_inv_helmet_steel.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_helmet_steel.png rename to 3d_armor/textures/3d_armor_inv_helmet_steel.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_helmet_wood.png b/3d_armor/textures/3d_armor_inv_helmet_wood.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_helmet_wood.png rename to 3d_armor/textures/3d_armor_inv_helmet_wood.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_leggings_admin.png b/3d_armor/textures/3d_armor_inv_leggings_admin.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_leggings_admin.png rename to 3d_armor/textures/3d_armor_inv_leggings_admin.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_leggings_bronze.png b/3d_armor/textures/3d_armor_inv_leggings_bronze.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_leggings_bronze.png rename to 3d_armor/textures/3d_armor_inv_leggings_bronze.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_leggings_cactus.png b/3d_armor/textures/3d_armor_inv_leggings_cactus.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_leggings_cactus.png rename to 3d_armor/textures/3d_armor_inv_leggings_cactus.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_leggings_crystal.png b/3d_armor/textures/3d_armor_inv_leggings_crystal.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_leggings_crystal.png rename to 3d_armor/textures/3d_armor_inv_leggings_crystal.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_leggings_diamond.png b/3d_armor/textures/3d_armor_inv_leggings_diamond.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_leggings_diamond.png rename to 3d_armor/textures/3d_armor_inv_leggings_diamond.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_leggings_gold.png b/3d_armor/textures/3d_armor_inv_leggings_gold.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_leggings_gold.png rename to 3d_armor/textures/3d_armor_inv_leggings_gold.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_leggings_mithril.png b/3d_armor/textures/3d_armor_inv_leggings_mithril.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_leggings_mithril.png rename to 3d_armor/textures/3d_armor_inv_leggings_mithril.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_leggings_steel.png b/3d_armor/textures/3d_armor_inv_leggings_steel.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_leggings_steel.png rename to 3d_armor/textures/3d_armor_inv_leggings_steel.png diff --git a/Inventory++/3d_armor/textures/3d_armor_inv_leggings_wood.png b/3d_armor/textures/3d_armor_inv_leggings_wood.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_inv_leggings_wood.png rename to 3d_armor/textures/3d_armor_inv_leggings_wood.png diff --git a/Inventory++/3d_armor/textures/3d_armor_leggings_admin.png b/3d_armor/textures/3d_armor_leggings_admin.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_leggings_admin.png rename to 3d_armor/textures/3d_armor_leggings_admin.png diff --git a/Inventory++/3d_armor/textures/3d_armor_leggings_admin_preview.png b/3d_armor/textures/3d_armor_leggings_admin_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_leggings_admin_preview.png rename to 3d_armor/textures/3d_armor_leggings_admin_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_leggings_bronze.png b/3d_armor/textures/3d_armor_leggings_bronze.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_leggings_bronze.png rename to 3d_armor/textures/3d_armor_leggings_bronze.png diff --git a/Inventory++/3d_armor/textures/3d_armor_leggings_bronze_preview.png b/3d_armor/textures/3d_armor_leggings_bronze_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_leggings_bronze_preview.png rename to 3d_armor/textures/3d_armor_leggings_bronze_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_leggings_cactus.png b/3d_armor/textures/3d_armor_leggings_cactus.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_leggings_cactus.png rename to 3d_armor/textures/3d_armor_leggings_cactus.png diff --git a/Inventory++/3d_armor/textures/3d_armor_leggings_cactus_preview.png b/3d_armor/textures/3d_armor_leggings_cactus_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_leggings_cactus_preview.png rename to 3d_armor/textures/3d_armor_leggings_cactus_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_leggings_crystal.png b/3d_armor/textures/3d_armor_leggings_crystal.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_leggings_crystal.png rename to 3d_armor/textures/3d_armor_leggings_crystal.png diff --git a/Inventory++/3d_armor/textures/3d_armor_leggings_crystal_preview.png b/3d_armor/textures/3d_armor_leggings_crystal_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_leggings_crystal_preview.png rename to 3d_armor/textures/3d_armor_leggings_crystal_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_leggings_diamond.png b/3d_armor/textures/3d_armor_leggings_diamond.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_leggings_diamond.png rename to 3d_armor/textures/3d_armor_leggings_diamond.png diff --git a/Inventory++/3d_armor/textures/3d_armor_leggings_diamond_preview.png b/3d_armor/textures/3d_armor_leggings_diamond_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_leggings_diamond_preview.png rename to 3d_armor/textures/3d_armor_leggings_diamond_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_leggings_gold.png b/3d_armor/textures/3d_armor_leggings_gold.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_leggings_gold.png rename to 3d_armor/textures/3d_armor_leggings_gold.png diff --git a/Inventory++/3d_armor/textures/3d_armor_leggings_gold_preview.png b/3d_armor/textures/3d_armor_leggings_gold_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_leggings_gold_preview.png rename to 3d_armor/textures/3d_armor_leggings_gold_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_leggings_mithril.png b/3d_armor/textures/3d_armor_leggings_mithril.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_leggings_mithril.png rename to 3d_armor/textures/3d_armor_leggings_mithril.png diff --git a/Inventory++/3d_armor/textures/3d_armor_leggings_mithril_preview.png b/3d_armor/textures/3d_armor_leggings_mithril_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_leggings_mithril_preview.png rename to 3d_armor/textures/3d_armor_leggings_mithril_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_leggings_steel.png b/3d_armor/textures/3d_armor_leggings_steel.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_leggings_steel.png rename to 3d_armor/textures/3d_armor_leggings_steel.png diff --git a/Inventory++/3d_armor/textures/3d_armor_leggings_steel_preview.png b/3d_armor/textures/3d_armor_leggings_steel_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_leggings_steel_preview.png rename to 3d_armor/textures/3d_armor_leggings_steel_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_leggings_wood.png b/3d_armor/textures/3d_armor_leggings_wood.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_leggings_wood.png rename to 3d_armor/textures/3d_armor_leggings_wood.png diff --git a/Inventory++/3d_armor/textures/3d_armor_leggings_wood_preview.png b/3d_armor/textures/3d_armor_leggings_wood_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_leggings_wood_preview.png rename to 3d_armor/textures/3d_armor_leggings_wood_preview.png diff --git a/Inventory++/3d_armor/textures/3d_armor_trans.png b/3d_armor/textures/3d_armor_trans.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_trans.png rename to 3d_armor/textures/3d_armor_trans.png diff --git a/Inventory++/3d_armor/textures/3d_armor_ui_form.png b/3d_armor/textures/3d_armor_ui_form.png similarity index 100% rename from Inventory++/3d_armor/textures/3d_armor_ui_form.png rename to 3d_armor/textures/3d_armor_ui_form.png diff --git a/Inventory++/3d_armor/textures/character_preview.png b/3d_armor/textures/character_preview.png similarity index 100% rename from Inventory++/3d_armor/textures/character_preview.png rename to 3d_armor/textures/character_preview.png diff --git a/Inventory++/3d_armor/textures/preview_index.txt b/3d_armor/textures/preview_index.txt similarity index 100% rename from Inventory++/3d_armor/textures/preview_index.txt rename to 3d_armor/textures/preview_index.txt diff --git a/Inventory++/3d_armor_ip/LICENSE.txt b/3d_armor_ip/LICENSE.txt similarity index 100% rename from Inventory++/3d_armor_ip/LICENSE.txt rename to 3d_armor_ip/LICENSE.txt diff --git a/Inventory++/3d_armor_ip/depends.txt b/3d_armor_ip/depends.txt similarity index 100% rename from Inventory++/3d_armor_ip/depends.txt rename to 3d_armor_ip/depends.txt diff --git a/Inventory++/3d_armor_ip/description.txt b/3d_armor_ip/description.txt similarity index 100% rename from Inventory++/3d_armor_ip/description.txt rename to 3d_armor_ip/description.txt diff --git a/Inventory++/3d_armor_ip/init.lua b/3d_armor_ip/init.lua similarity index 100% rename from Inventory++/3d_armor_ip/init.lua rename to 3d_armor_ip/init.lua diff --git a/Inventory++/3d_armor_ip/textures/BAK_inventory_plus_armor.png b/3d_armor_ip/textures/BAK_inventory_plus_armor.png similarity index 100% rename from Inventory++/3d_armor_ip/textures/BAK_inventory_plus_armor.png rename to 3d_armor_ip/textures/BAK_inventory_plus_armor.png diff --git a/Inventory++/3d_armor_ip/textures/inventory_plus_armor.png b/3d_armor_ip/textures/inventory_plus_armor.png similarity index 100% rename from Inventory++/3d_armor_ip/textures/inventory_plus_armor.png rename to 3d_armor_ip/textures/inventory_plus_armor.png diff --git a/Default_Inventory/creative/README.txt b/Default_Inventory/creative/README.txt deleted file mode 100644 index 82357f3..0000000 --- a/Default_Inventory/creative/README.txt +++ /dev/null @@ -1,12 +0,0 @@ -Minetest Game mod: creative -=========================== -See license.txt for license information. - -Authors of source code ----------------------- -Originally by Perttu Ahola (celeron55) (MIT) -Jean-Patrick G. (kilbith) (MIT) - -Author of media (textures) --------------------------- -Jean-Patrick G. (kilbith) (CC BY-SA 3.0) diff --git a/Default_Inventory/creative/depends.txt b/Default_Inventory/creative/depends.txt deleted file mode 100644 index 975e652..0000000 --- a/Default_Inventory/creative/depends.txt +++ /dev/null @@ -1,2 +0,0 @@ -default -sfinv diff --git a/Default_Inventory/creative/init.lua b/Default_Inventory/creative/init.lua deleted file mode 100644 index 7b842ed..0000000 --- a/Default_Inventory/creative/init.lua +++ /dev/null @@ -1,69 +0,0 @@ -creative = {} - -minetest.register_privilege("creative", { - description = "Allow player to use creative inventory", - give_to_singleplayer = false -}) - -local creative_mode_cache = minetest.settings:get_bool("creative_mode") - -function creative.is_enabled_for(name) - return creative_mode_cache or - minetest.check_player_privs(name, {creative = true}) -end - -dofile(minetest.get_modpath("creative") .. "/inventory.lua") - -if creative_mode_cache then - -- Dig time is modified according to difference (leveldiff) between tool - -- 'maxlevel' and node 'level'. Digtime is divided by the larger of - -- leveldiff and 1. - -- To speed up digging in creative, hand 'maxlevel' and 'digtime' have been - -- increased such that nodes of differing levels have an insignificant - -- effect on digtime. - local digtime = 42 - local caps = {times = {digtime, digtime, digtime}, uses = 0, maxlevel = 256} - - minetest.register_item(":", { - type = "none", - wield_image = "wieldhand.png", - wield_scale = {x = 1, y = 1, z = 2.5}, - range = 10, - tool_capabilities = { - full_punch_interval = 0.5, - max_drop_level = 3, - groupcaps = { - crumbly = caps, - cracky = caps, - snappy = caps, - choppy = caps, - oddly_breakable_by_hand = caps, - }, - damage_groups = {fleshy = 10}, - } - }) -end - --- Unlimited node placement -minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack) - return creative.is_enabled_for(placer:get_player_name()) -end) - --- Don't pick up if the item is already in the inventory -local old_handle_node_drops = minetest.handle_node_drops -function minetest.handle_node_drops(pos, drops, digger) - if not digger or not digger:is_player() then - return - end - if not creative.is_enabled_for(digger:get_player_name()) then - return old_handle_node_drops(pos, drops, digger) - end - local inv = digger:get_inventory() - if inv then - for _, item in ipairs(drops) do - if not inv:contains_item("main", item, true) then - inv:add_item("main", item) - end - end - end -end diff --git a/Default_Inventory/creative/inventory.lua b/Default_Inventory/creative/inventory.lua deleted file mode 100644 index 48571bf..0000000 --- a/Default_Inventory/creative/inventory.lua +++ /dev/null @@ -1,197 +0,0 @@ -local player_inventory = {} - -function creative.init_creative_inventory(player) - local player_name = player:get_player_name() - player_inventory[player_name] = { - size = 0, - filter = "", - start_i = 0 - } - - minetest.create_detached_inventory("creative_" .. player_name, { - allow_move = function(inv, from_list, from_index, to_list, to_index, count, player2) - if not to_list == "main" then - return count - else - return 0 - end - end, - allow_put = function(inv, listname, index, stack, player2) - return 0 - end, - allow_take = function(inv, listname, index, stack, player2) - return -1 - end, - on_move = function(inv, from_list, from_index, to_list, to_index, count, player2) - end, - on_put = function(inv, listname, index, stack, player2) - end, - on_take = function(inv, listname, index, stack, player2) - if stack and stack:get_count() > 0 then - minetest.log("action", player_name .. " takes " .. stack:get_name().. " from creative inventory") - end - end, - }, player_name) - - return player_inventory[player_name] -end - -function creative.update_creative_inventory(player_name, tab_content) - local creative_list = {} - local inv = player_inventory[player_name] or - creative.init_creative_inventory(minetest.get_player_by_name(player_name)) - local player_inv = minetest.get_inventory({type = "detached", name = "creative_" .. player_name}) - - for name, def in pairs(tab_content) do - if not (def.groups.not_in_creative_inventory == 1) and - def.description and def.description ~= "" and - (def.name:find(inv.filter, 1, true) or - def.description:lower():find(inv.filter, 1, true)) then - creative_list[#creative_list+1] = name - end - end - - table.sort(creative_list) - player_inv:set_size("main", #creative_list) - player_inv:set_list("main", creative_list) - inv.size = #creative_list -end - --- Create the refill slot -local refill = minetest.create_detached_inventory("creative_refill", { - allow_put = function(inv, listname, index, stack, player) - if minetest.setting_getbool("creative_mode") then - return stack:get_count() - else - return 0 - end - end, - on_put = function(inv, listname, index, stack, player) - inv:set_stack(listname, index, ItemStack(stack:get_name().." "..stack:get_stack_max())) - local player_name = player:get_player_name() - minetest.sound_play("creative_refill",{to_player=player_name, gain = 0.25}) - end, -}) -refill:set_size("main", 1) - --- Create the trash field -local trash = minetest.create_detached_inventory("creative_trash", { - -- Allow the stack to be placed and remove it in on_put() - -- This allows the creative inventory to restore the stack - allow_put = function(inv, listname, index, stack, player) - return stack:get_count() - end, - on_put = function(inv, listname) - inv:set_list(listname, {}) - minetest.sound_play("creative_trash", {to_player=player_name, gain = 0.25}) - end, -}) -trash:set_size("main", 1) - -creative.formspec_add = "" - -function creative.register_tab(name, title, items) - sfinv.register_page("creative:" .. name, { - title = title, - is_in_nav = function(self, player, context) - return creative.is_enabled_for(player:get_player_name()) - end, - get = function(self, player, context) - local player_name = player:get_player_name() - creative.update_creative_inventory(player_name, items) - local inv = player_inventory[player_name] - local start_i = inv.start_i or 0 - local pagenum = math.floor(start_i / (3*8) + 1) - local pagemax = math.ceil(inv.size / (3*8)) - return sfinv.make_formspec(player, context, - "label[6.55,4.05;" .. minetest.colorize("#FFFF00", tostring(pagenum)) .. " / " .. tostring(pagemax) .. "]" .. - [[ - image[5.07,3.41;0.8,0.8;creative_refill_icon.png] - image[4.07,3.42;0.8,0.8;creative_trash_icon.png] - listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF] - list[current_player;main;0,4.7;8,1;] - list[current_player;main;0,5.85;8,3;8] - list[detached:creative_trash;main;4,3.3;1,1;] - listring[] - list[detached:creative_refill;main;5,3.3;1,1;] - button[6,3.342;1,0.9;creative_prev;<] - button[7,3.342;1,0.9;creative_next;>] - button[3.3,3.342;0.8,0.9;creative_search;?] - button[0,3.342;0.8,0.9;creative_clear;X] - tooltip[creative_search;Search] - tooltip[creative_clear;Reset] - listring[current_player;main] - field_close_on_enter[creative_filter;false] - ]] .. - "field[1,3.812;2.7,0.5;creative_filter;;" .. minetest.formspec_escape(inv.filter) .. "]" .. - "listring[detached:creative_" .. player_name .. ";main]" .. - "list[detached:creative_" .. player_name .. ";main;0,0;8,3;" .. tostring(start_i) .. "]" .. - default.get_hotbar_bg(0,4.7) .. - default.gui_bg .. default.gui_bg_img .. default.gui_slots - .. creative.formspec_add, false) - end, - on_enter = function(self, player, context) - local player_name = player:get_player_name() - local inv = player_inventory[player_name] - if inv then - inv.start_i = 0 - end - end, - on_player_receive_fields = function(self, player, context, fields) - local player_name = player:get_player_name() - local inv = player_inventory[player_name] - assert(inv) - - if fields.creative_clear then - inv.start_i = 0 - inv.filter = "" - creative.update_creative_inventory(player_name, items) - sfinv.set_player_inventory_formspec(player, context) - elseif fields.creative_search or - fields.key_enter_field == "creative_filter" then - inv.start_i = 0 - inv.filter = fields.creative_filter:lower() - creative.update_creative_inventory(player_name, items) - sfinv.set_player_inventory_formspec(player, context) - elseif not fields.quit then - local start_i = inv.start_i or 0 - - if fields.creative_prev then - start_i = start_i - 3*8 - if start_i < 0 then - start_i = inv.size - (inv.size % (3*8)) - if inv.size == start_i then - start_i = math.max(0, inv.size - (3*8)) - end - end - elseif fields.creative_next then - start_i = start_i + 3*8 - if start_i >= inv.size then - start_i = 0 - end - end - - inv.start_i = start_i - sfinv.set_player_inventory_formspec(player, context) - end - end - }) -end - -minetest.register_on_joinplayer(function(player) - creative.update_creative_inventory(player:get_player_name(), minetest.registered_items) -end) - -creative.register_tab("all", "Creative Inv", minetest.registered_items) ---creative.register_tab("nodes", "Nodes", minetest.registered_nodes) ---creative.register_tab("tools", "Tools", minetest.registered_tools) ---creative.register_tab("craftitems", "Items", minetest.registered_craftitems) - -local old_homepage_name = sfinv.get_homepage_name -function sfinv.get_homepage_name(player) - if creative.is_enabled_for(player:get_player_name()) then - return "sfinv:crafting" - else - return old_homepage_name(player) - end -end diff --git a/Default_Inventory/creative/license.txt b/Default_Inventory/creative/license.txt deleted file mode 100644 index 4ad1d5f..0000000 --- a/Default_Inventory/creative/license.txt +++ /dev/null @@ -1,60 +0,0 @@ -License of source code ----------------------- - -The MIT License (MIT) -Copyright (C) 2012-2016 Perttu Ahola (celeron55) -Copyright (C) 2015-2016 Jean-Patrick G. (kilbith) - -Permission is hereby granted, free of charge, to any person obtaining a copy of this -software and associated documentation files (the "Software"), to deal in the Software -without restriction, including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, and to permit -persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or -substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - -For more details: -https://opensource.org/licenses/MIT - - -Licenses of media (textures) ----------------------------- - -Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) -Copyright (C) 2016 Jean-Patrick G. (kilbith) - -You are free to: -Share — copy and redistribute the material in any medium or format. -Adapt — remix, transform, and build upon the material for any purpose, even commercially. -The licensor cannot revoke these freedoms as long as you follow the license terms. - -Under the following terms: - -Attribution — You must give appropriate credit, provide a link to the license, and -indicate if changes were made. You may do so in any reasonable manner, but not in any way -that suggests the licensor endorses you or your use. - -ShareAlike — If you remix, transform, or build upon the material, you must distribute -your contributions under the same license as the original. - -No additional restrictions — You may not apply legal terms or technological measures that -legally restrict others from doing anything the license permits. - -Notices: - -You do not have to comply with the license for elements of the material in the public -domain or where your use is permitted by an applicable exception or limitation. -No warranties are given. The license may not give you all of the permissions necessary -for your intended use. For example, other rights such as publicity, privacy, or moral -rights may limit how you use the material. - -For more details: -http://creativecommons.org/licenses/by-sa/3.0/ diff --git a/Default_Inventory/creative/sounds/creative_refill.ogg b/Default_Inventory/creative/sounds/creative_refill.ogg deleted file mode 100644 index d3a5a7e..0000000 Binary files a/Default_Inventory/creative/sounds/creative_refill.ogg and /dev/null differ diff --git a/Default_Inventory/creative/sounds/creative_trash.ogg b/Default_Inventory/creative/sounds/creative_trash.ogg deleted file mode 100644 index f33b08d..0000000 Binary files a/Default_Inventory/creative/sounds/creative_trash.ogg and /dev/null differ diff --git a/Default_Inventory/creative/textures/creative_refill_icon.png b/Default_Inventory/creative/textures/creative_refill_icon.png deleted file mode 100644 index 2406f6f..0000000 Binary files a/Default_Inventory/creative/textures/creative_refill_icon.png and /dev/null differ diff --git a/Default_Inventory/creative/textures/creative_trash_icon.png b/Default_Inventory/creative/textures/creative_trash_icon.png deleted file mode 100644 index f4fd0ad..0000000 Binary files a/Default_Inventory/creative/textures/creative_trash_icon.png and /dev/null differ diff --git a/Default_Inventory/description.txt b/Default_Inventory/description.txt deleted file mode 100644 index a234c1b..0000000 --- a/Default_Inventory/description.txt +++ /dev/null @@ -1 +0,0 @@ -modified for Inventory++ \ No newline at end of file diff --git a/Default_Inventory/sfinv/README.md b/Default_Inventory/sfinv/README.md deleted file mode 100644 index 6ff3392..0000000 --- a/Default_Inventory/sfinv/README.md +++ /dev/null @@ -1,21 +0,0 @@ -Simple Fast Inventory -==================== - -![SFINV Screeny](https://cdn.pbrd.co/images/1yQhd1TI.png) - -A cleaner, simpler, solution to having an advanced inventory in Minetest. - -Written by rubenwardy. -License: MIT - -See game_api.txt for this mod's API - -License of source code and media files: ---------------------------------------- -Copyright (C) 2016 rubenwardy - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/Default_Inventory/sfinv/api.lua b/Default_Inventory/sfinv/api.lua deleted file mode 100644 index bd6de1e..0000000 --- a/Default_Inventory/sfinv/api.lua +++ /dev/null @@ -1,170 +0,0 @@ -sfinv = { - pages = {}, - pages_unordered = {}, - contexts = {}, - enabled = true -} - -function sfinv.register_page(name, def) - assert(name, "Invalid sfinv page. Requires a name") - assert(def, "Invalid sfinv page. Requires a def[inition] table") - assert(def.get, "Invalid sfinv page. Def requires a get function.") - assert(not sfinv.pages[name], "Attempt to register already registered sfinv page " .. dump(name)) - - sfinv.pages[name] = def - def.name = name - table.insert(sfinv.pages_unordered, def) -end - -function sfinv.override_page(name, def) - assert(name, "Invalid sfinv page override. Requires a name") - assert(def, "Invalid sfinv page override. Requires a def[inition] table") - local page = sfinv.pages[name] - assert(page, "Attempt to override sfinv page " .. dump(name) .. " which does not exist.") - for key, value in pairs(def) do - page[key] = value - end -end - -function sfinv.get_nav_fs(player, context, nav, current_idx) - -- Only show tabs if there is more than one page - if #nav > 1 then - return "tabheader[0,0;tabs;" .. table.concat(nav, ",") .. ";" .. current_idx .. ";true;false]" - else - return "" - end -end - -local theme_main = "bgcolor[#080808BB;true]" .. default.gui_bg .. - default.gui_bg_img - -local theme_inv = default.gui_slots .. [[ - list[current_player;main;0,4.7;8,1;] - list[current_player;main;0,5.85;8,3;8] - ]] - -function sfinv.make_formspec(player, context, content, show_inv, size) - local tmp = { - size or "size[8,8.6]", - theme_main, - sfinv.get_nav_fs(player, context, context.nav_titles, context.nav_idx), - content - } - if show_inv then - tmp[#tmp + 1] = theme_inv - end - return table.concat(tmp, "") -end - -function sfinv.get_homepage_name(player) - return "sfinv:crafting" -end - -function sfinv.get_formspec(player, context) - -- Generate navigation tabs - local nav = {} - local nav_ids = {} - local current_idx = 1 - for i, pdef in pairs(sfinv.pages_unordered) do - if not pdef.is_in_nav or pdef:is_in_nav(player, context) then - nav[#nav + 1] = pdef.title - nav_ids[#nav_ids + 1] = pdef.name - if pdef.name == context.page then - current_idx = #nav_ids - end - end - end - context.nav = nav_ids - context.nav_titles = nav - context.nav_idx = current_idx - - -- Generate formspec - local page = sfinv.pages[context.page] or sfinv.pages["404"] - if page then - return page:get(player, context) - else - local old_page = context.page - context.page = sfinv.get_homepage_name(player) - assert(sfinv.pages[context.page], "[sfinv] Invalid homepage") - minetest.log("warning", "[sfinv] Couldn't find " .. dump(old_page) .. " so using switching to homepage") - return sfinv.get_formspec(player, context) - end -end - -function sfinv.get_or_create_context(player) - local name = player:get_player_name() - local context = sfinv.contexts[name] - if not context then - context = { - page = sfinv.get_homepage_name(player) - } - sfinv.contexts[name] = context - end - return context -end - -function sfinv.set_context(player, context) - sfinv.contexts[player:get_player_name()] = context -end - -function sfinv.set_player_inventory_formspec(player, context) - local fs = sfinv.get_formspec(player, - context or sfinv.get_or_create_context(player)) - player:set_inventory_formspec(fs) -end - -function sfinv.set_page(player, pagename) - local context = sfinv.get_or_create_context(player) - local oldpage = sfinv.pages[context.page] - if oldpage and oldpage.on_leave then - oldpage:on_leave(player, context) - end - context.page = pagename - local page = sfinv.pages[pagename] - if page.on_enter then - page:on_enter(player, context) - end - sfinv.set_player_inventory_formspec(player, context) -end - -minetest.register_on_joinplayer(function(player) - if sfinv.enabled then - sfinv.set_player_inventory_formspec(player) - end -end) - -minetest.register_on_leaveplayer(function(player) - sfinv.contexts[player:get_player_name()] = nil -end) - -minetest.register_on_player_receive_fields(function(player, formname, fields) - if formname ~= "" or not sfinv.enabled then - return false - end - - -- Get Context - local name = player:get_player_name() - local context = sfinv.contexts[name] - if not context then - sfinv.set_player_inventory_formspec(player) - return false - end - - -- Was a tab selected? - if fields.tabs and context.nav then - local tid = tonumber(fields.tabs) - if tid and tid > 0 then - local id = context.nav[tid] - local page = sfinv.pages[id] - if id and page then - sfinv.set_page(player, id) - end - end - else - -- Pass event to page - local page = sfinv.pages[context.page] - if page and page.on_player_receive_fields then - return page:on_player_receive_fields(player, context, fields) - end - end -end) diff --git a/Default_Inventory/sfinv/depends.txt b/Default_Inventory/sfinv/depends.txt deleted file mode 100644 index 4ad96d5..0000000 --- a/Default_Inventory/sfinv/depends.txt +++ /dev/null @@ -1 +0,0 @@ -default diff --git a/Default_Inventory/sfinv/init.lua b/Default_Inventory/sfinv/init.lua deleted file mode 100644 index 9df34c4..0000000 --- a/Default_Inventory/sfinv/init.lua +++ /dev/null @@ -1,33 +0,0 @@ -dofile(minetest.get_modpath("sfinv") .. "/api.lua") - --- Create the trash field -local trash = minetest.create_detached_inventory("crafting_trash", { - allow_put = function(inv, listname, index, stack, player) - return stack:get_count() - end, - on_put = function(inv, listname, player) - inv:set_list(listname, {}) - minetest.sound_play("crafting_trash", {to_player=player_name, gain = 0.25}) - end, -}) -trash:set_size("main", 1) - -sfinv.register_page("sfinv:crafting", { - title = "Crafting", - get = function(self, player, context) - return sfinv.make_formspec(player, context, [[ - button[7.25,0;0.8,0.8;page_reload;@] - tooltip[page_reload;Reload Inv++] - listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF] - image[5.75,1.5;1,1;gui_furnace_arrow_bg.png^[transformR270] - image[0.075,1.6;0.8,0.8;crafting_trash_icon.png] - list[current_player;main;0,4.7;8,1;] - list[current_player;craft;2.5,0.5;3,3;] - listring[] - list[detached:crafting_trash;main;0,1.5;1,1;] - list[current_player;craftpreview;7,1.5;1,1;] - listring[current_player;main] - ..default.gui_bg ..default.gui_bg_img ..default.gui_slots - ]], true) - end -}) diff --git a/Default_Inventory/sfinv/sounds/crafting_trash.ogg b/Default_Inventory/sfinv/sounds/crafting_trash.ogg deleted file mode 100644 index f33b08d..0000000 Binary files a/Default_Inventory/sfinv/sounds/crafting_trash.ogg and /dev/null differ diff --git a/Default_Inventory/sfinv/textures/crafting_trash_icon.png b/Default_Inventory/sfinv/textures/crafting_trash_icon.png deleted file mode 100644 index e789ad6..0000000 Binary files a/Default_Inventory/sfinv/textures/crafting_trash_icon.png and /dev/null differ diff --git a/Inventory++/bags/textures/License.txt b/Inventory++/bags/textures/License.txt deleted file mode 100644 index 7fa4857..0000000 --- a/Inventory++/bags/textures/License.txt +++ /dev/null @@ -1,2 +0,0 @@ -new inventory_plus_bags.png from Inventory Icon mod by Wuzzy -`inventory_icon_backpack_free.png`: DitsyDM and Traipse OpenRPG (CC-BY-SA 3.0 Unported) diff --git a/Inventory++/craftguide/textures/craftguide_sign.png b/Inventory++/craftguide/textures/craftguide_sign.png deleted file mode 100644 index f64b5ab..0000000 Binary files a/Inventory++/craftguide/textures/craftguide_sign.png and /dev/null differ diff --git a/Inventory++/craftguide/textures/craftguide_sign_inv.png b/Inventory++/craftguide/textures/craftguide_sign_inv.png deleted file mode 100644 index 6137234..0000000 Binary files a/Inventory++/craftguide/textures/craftguide_sign_inv.png and /dev/null differ diff --git a/Inventory++/home_gui/init.lua b/Inventory++/home_gui/init.lua deleted file mode 100644 index dde5e02..0000000 --- a/Inventory++/home_gui/init.lua +++ /dev/null @@ -1,102 +0,0 @@ ---[[ - -Home GUI for Minetest - -Copyright (c) 2012 cornernote, Brett O'Donnell -Source Code: https://github.com/cornernote/minetest-home_gui -License: BSD-3-Clause https://raw.github.com/cornernote/minetest-home_gui/master/LICENSE - -]]-- - --- local api -local home_gui = {} - --- filename -home_gui.filename = minetest.get_worldpath()..'/home_gui' - --- load_home -local homepos = {} -local load_home = function() - local input = io.open(home_gui.filename..".home", "r") - if input then - while true do - local x = input:read("*n") - if x == nil then - break - end - local y = input:read("*n") - local z = input:read("*n") - local name = input:read("*l") - homepos[name:sub(2)] = {x = x, y = y, z = z} - end - io.close(input) - else - homepos = {} - end -end -load_home() -- run it now - --- set_home -home_gui.set_home = function(player, pos) - homepos[player:get_player_name()] = pos - -- save the home data from the table to the file - local output = io.open(home_gui.filename..".home", "w") - for k, v in pairs(homepos) do - if v ~= nil then - output:write(math.floor(v.x).." "..math.floor(v.y).." "..math.floor(v.z).." "..k.."\n") - end - end - io.close(output) -end - --- go_home -home_gui.go_home = function(player) - local pos = homepos[player:get_player_name()] - if pos~=nil then - player:setpos(pos) - end -end - --- get_formspec -home_gui.get_formspec = function(player) - local formspec = "size[8,8.6]" - ..default.gui_bg - ..default.gui_bg_img - ..default.gui_slots - .."button[0,0;2,0.5;main;Back]" - .."button_exit[1,2;2,0.5;home_gui_set;Set Home]" - .."button_exit[5,2;2,0.5;home_gui_go;Go Home]" - .."list[current_player;main;0,4.7;8,1;]" - .."list[current_player;main;0,5.85;8,3;8]" - local home = homepos[player:get_player_name()] - if home ~= nil then - formspec = formspec - .."label[3.15,3;Home set to:]" - .."label[3.15,3.35;"..math.floor(home.x)..","..math.floor(home.y)..","..math.floor(home.z).."]" - end - return formspec -end - --- register_on_joinplayer -minetest.register_on_joinplayer(function(player) - -- add inventory_plus page - inventory_plus.register_button(player,"home_gui","Home Pos") -end) - --- register_on_player_receive_fields -minetest.register_on_player_receive_fields(function(player, formname, fields) - if fields.home_gui_set then - home_gui.set_home(player, player:getpos()) - inventory_plus.set_inventory_formspec(player, inventory_plus.get_formspec(player,"main")) - end - if fields.home_gui_go then - home_gui.go_home(player) - inventory_plus.set_inventory_formspec(player, inventory_plus.get_formspec(player,"main")) - end - if fields.home_gui then - inventory_plus.set_inventory_formspec(player, home_gui.get_formspec(player)) - end -end) - --- log that we started ---minetest.log("action", "[MOD]"..minetest.get_current_modname().." -- loaded from "..minetest.get_modpath(minetest.get_current_modname())) diff --git a/Inventory++/modpack.txt b/Inventory++/modpack.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Inventory++/screenshot.png b/Inventory++/screenshot.png deleted file mode 100644 index 547b618..0000000 Binary files a/Inventory++/screenshot.png and /dev/null differ diff --git a/Inventory++/bags/LICENSE b/bags/LICENSE similarity index 100% rename from Inventory++/bags/LICENSE rename to bags/LICENSE diff --git a/Inventory++/bags/README.md b/bags/README.md similarity index 100% rename from Inventory++/bags/README.md rename to bags/README.md diff --git a/Inventory++/bags/depends.txt b/bags/depends.txt similarity index 100% rename from Inventory++/bags/depends.txt rename to bags/depends.txt diff --git a/Inventory++/bags/init.lua b/bags/init.lua similarity index 100% rename from Inventory++/bags/init.lua rename to bags/init.lua diff --git a/bags/textures/License.txt b/bags/textures/License.txt new file mode 100644 index 0000000..7d7c3e4 --- /dev/null +++ b/bags/textures/License.txt @@ -0,0 +1,2 @@ +textures by Napiophelios +License : (CC-BY-SA 3.0 Unported) diff --git a/Inventory++/bags/textures/bags_large.png b/bags/textures/bags_large.png similarity index 100% rename from Inventory++/bags/textures/bags_large.png rename to bags/textures/bags_large.png diff --git a/Inventory++/bags/textures/bags_medium.png b/bags/textures/bags_medium.png similarity index 100% rename from Inventory++/bags/textures/bags_medium.png rename to bags/textures/bags_medium.png diff --git a/Inventory++/bags/textures/bags_small.png b/bags/textures/bags_small.png similarity index 100% rename from Inventory++/bags/textures/bags_small.png rename to bags/textures/bags_small.png diff --git a/Inventory++/bags/textures/inventory_plus_bags.png b/bags/textures/inventory_plus_bags.png similarity index 100% rename from Inventory++/bags/textures/inventory_plus_bags.png rename to bags/textures/inventory_plus_bags.png diff --git a/Inventory++/bookmarks_gui/LICENSE b/bookmarks_gui/LICENSE similarity index 100% rename from Inventory++/bookmarks_gui/LICENSE rename to bookmarks_gui/LICENSE diff --git a/Inventory++/bookmarks_gui/README.md b/bookmarks_gui/README.md similarity index 100% rename from Inventory++/bookmarks_gui/README.md rename to bookmarks_gui/README.md diff --git a/Inventory++/bookmarks_gui/depends.txt b/bookmarks_gui/depends.txt similarity index 100% rename from Inventory++/bookmarks_gui/depends.txt rename to bookmarks_gui/depends.txt diff --git a/Inventory++/bookmarks_gui/init.lua b/bookmarks_gui/init.lua similarity index 100% rename from Inventory++/bookmarks_gui/init.lua rename to bookmarks_gui/init.lua diff --git a/Inventory++/bookmarks_gui/textures/inventory_plus_bookmarks_gui.png b/bookmarks_gui/textures/inventory_plus_bookmarks_gui.png similarity index 100% rename from Inventory++/bookmarks_gui/textures/inventory_plus_bookmarks_gui.png rename to bookmarks_gui/textures/inventory_plus_bookmarks_gui.png diff --git a/Inventory++/bookmarks_gui/textures/license.txt b/bookmarks_gui/textures/license.txt similarity index 100% rename from Inventory++/bookmarks_gui/textures/license.txt rename to bookmarks_gui/textures/license.txt diff --git a/Inventory++/craftguide/LICENSE b/craftguide/LICENSE similarity index 100% rename from Inventory++/craftguide/LICENSE rename to craftguide/LICENSE diff --git a/Inventory++/craftguide/README.md b/craftguide/README.md similarity index 100% rename from Inventory++/craftguide/README.md rename to craftguide/README.md diff --git a/Inventory++/craftguide/depends.txt b/craftguide/depends.txt similarity index 51% rename from Inventory++/craftguide/depends.txt rename to craftguide/depends.txt index f4734e2..e69b933 100644 --- a/Inventory++/craftguide/depends.txt +++ b/craftguide/depends.txt @@ -1,2 +1 @@ -sfinv_buttons? inventory_plus? diff --git a/Inventory++/craftguide/description.txt b/craftguide/description.txt similarity index 100% rename from Inventory++/craftguide/description.txt rename to craftguide/description.txt diff --git a/Inventory++/craftguide/init.lua b/craftguide/init.lua similarity index 83% rename from Inventory++/craftguide/init.lua rename to craftguide/init.lua index e3fee68..23202c2 100644 --- a/Inventory++/craftguide/init.lua +++ b/craftguide/init.lua @@ -106,7 +106,7 @@ function craftguide:get_recipe(iY, xoffset, tooltip, item, recipe_num, recipes) if width == 0 then width = min(3, #items) end local rows = ceil(maxn(items) / width) - local btn_size, craftgrid_limit = 1, 5 + local btn_size, craftgrid_limit = 1, 3 if recipe_type == "normal" and width > craftgrid_limit or rows > craftgrid_limit then @@ -146,7 +146,7 @@ end function craftguide:get_formspec(player_name, is_fuel) local data = datas[player_name] - local iY = data.iX - 5 + local iY = data.iX -3 local ipp = data.iX * iY if not data.items then @@ -154,22 +154,17 @@ function craftguide:get_formspec(player_name, is_fuel) end data.pagemax = max(1, ceil(#data.items / ipp)) - local formspec = "size[" .. data.iX .. "," .. (iY + 3) .. ".6;]" .. [[ - background[1,1;1,1;craftguide_bg.png;true] + local formspec = "size[8,8.6]" .. [[ button[2.4,0.21;0.8,0.5;search;?] button[3.05,0.21;0.8,0.5;clear;X] tooltip[search;Search] tooltip[clear;Reset] - tooltip[size_inc;Increase window size] - tooltip[size_dec;Decrease window size] field_close_on_enter[filter;false] ]] .. - "button[" .. (data.iX / 2) .. ",-0.02;0.7,1;size_inc;+]" .. - "button[" .. ((data.iX / 2) + 0.5) .. - ",-0.02;0.7,1;size_dec;-]" .. - "button[" .. (data.iX - 3) .. ".4,0;0.8,0.95;prev;<]" .. - "label[" .. (data.iX - 2) .. ".1,0.18;" .. + default.gui_bg_img .. + "button[5,0;0.8,0.95;prev;<]" .. + "label[6,0.18;" .. colorize(data.pagenum) .. " / " .. data.pagemax .. "]" .. - "button[" .. (data.iX - 1) .. ".2,0;0.8,0.95;next;>]" .. + "button[7,0;0.8,0.95;next;>]" .. "field[0.3,0.32;2.5,1;filter;;" .. mt.formspec_escape(data.filter) .. "]" @@ -397,7 +392,7 @@ function craftguide:on_use(itemstack, user) local data = datas[player_name] if progressive_mode or not data then - datas[player_name] = {filter = "", pagenum = 1, iX = 9} + datas[player_name] = {filter = "", pagenum = 1, iX = 8} if progressive_mode then craftguide:get_filter_items(datas[player_name], user) end @@ -407,78 +402,6 @@ function craftguide:on_use(itemstack, user) end end -mt.register_craftitem("craftguide:book", { - description = "Crafting Guide", - inventory_image = "craftguide_book.png", - wield_image = "craftguide_book.png", - stack_max = 1, - groups = {book = 1}, - on_use = function(itemstack, user) - craftguide:on_use(itemstack, user) - end -}) - -mt.register_node("craftguide:sign", { - description = "Crafting Guide Sign", - drawtype = "nodebox", - tiles = {"craftguide_sign.png"}, - inventory_image = "craftguide_sign_inv.png", - wield_image = "craftguide_sign_inv.png", - paramtype = "light", - paramtype2 = "wallmounted", - sunlight_propagates = true, - groups = {wood = 1, oddly_breakable_by_hand = 1, flammable = 3}, - node_box = { - type = "wallmounted", - wall_top = {-0.4375, 0.4375, -0.3125, 0.4375, 0.5, 0.3125}, - wall_bottom = {-0.4375, -0.5, -0.3125, 0.4375, -0.4375, 0.3125}, - wall_side = {-0.5, -0.3125, -0.4375, -0.4375, 0.3125, 0.4375} - }, - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("infotext", "Crafting Guide Sign") - end, - on_rightclick = function(pos, node, user, itemstack) - craftguide:on_use(itemstack, user) - end -}) - -mt.register_craft({ - output = "craftguide:book", - type = "shapeless", - recipe = {"default:book"} -}) - -mt.register_craft({ - type = "fuel", - recipe = "craftguide:book", - burntime = 3 -}) - -mt.register_craft({ - output = "craftguide:sign", - type = "shapeless", - recipe = {"default:sign_wall_wood"} -}) - -mt.register_craft({ - type = "fuel", - recipe = "craftguide:sign", - burntime = 10 -}) - -if rawget(_G, "sfinv_buttons") then - sfinv_buttons.register_button("craftguide", { - title = "Crafting guide", - tooltip = "Shows a list of available crafting recipes, cooking recipes and fuels", - action = function(player) - craftguide:on_use(nil, player) - end, - image = "craftguide_book.png", - }) -end - - if rawget(_G, "inventory_plus") then minetest.register_on_joinplayer(function(player) inventory_plus.register_button(player,"craftguide", "Crafting guide") diff --git a/craftguide/mod.conf b/craftguide/mod.conf new file mode 100644 index 0000000..c32f714 --- /dev/null +++ b/craftguide/mod.conf @@ -0,0 +1 @@ +name = craftguide diff --git a/Inventory++/craftguide/textures/craftguide_arrow.png b/craftguide/textures/craftguide_arrow.png similarity index 100% rename from Inventory++/craftguide/textures/craftguide_arrow.png rename to craftguide/textures/craftguide_arrow.png diff --git a/Inventory++/craftguide/textures/craftguide_bg.png b/craftguide/textures/craftguide_bg.png similarity index 100% rename from Inventory++/craftguide/textures/craftguide_bg.png rename to craftguide/textures/craftguide_bg.png diff --git a/Inventory++/craftguide/textures/craftguide_fire.png b/craftguide/textures/craftguide_fire.png similarity index 100% rename from Inventory++/craftguide/textures/craftguide_fire.png rename to craftguide/textures/craftguide_fire.png diff --git a/Inventory++/craftguide/textures/craftguide_furnace.png b/craftguide/textures/craftguide_furnace.png similarity index 100% rename from Inventory++/craftguide/textures/craftguide_furnace.png rename to craftguide/textures/craftguide_furnace.png diff --git a/Inventory++/craftguide/textures/craftguide_shapeless.png b/craftguide/textures/craftguide_shapeless.png similarity index 100% rename from Inventory++/craftguide/textures/craftguide_shapeless.png rename to craftguide/textures/craftguide_shapeless.png diff --git a/Inventory++/craftguide/textures/inventory_plus_craftguide.png b/craftguide/textures/inventory_plus_craftguide.png similarity index 100% rename from Inventory++/craftguide/textures/inventory_plus_craftguide.png rename to craftguide/textures/inventory_plus_craftguide.png diff --git a/Inventory++/description.txt b/description.txt similarity index 100% rename from Inventory++/description.txt rename to description.txt diff --git a/Inventory++/home_gui/LICENSE b/home_gui/LICENSE similarity index 100% rename from Inventory++/home_gui/LICENSE rename to home_gui/LICENSE diff --git a/Inventory++/home_gui/README.md b/home_gui/README.md similarity index 100% rename from Inventory++/home_gui/README.md rename to home_gui/README.md diff --git a/Inventory++/home_gui/depends.txt b/home_gui/depends.txt similarity index 100% rename from Inventory++/home_gui/depends.txt rename to home_gui/depends.txt diff --git a/home_gui/init.lua b/home_gui/init.lua new file mode 100644 index 0000000..b1ccd82 --- /dev/null +++ b/home_gui/init.lua @@ -0,0 +1,80 @@ +--[[ +-- +-- Home GUI for Minetest +-- +-- Copyright (c) 2012 cornernote, Brett O'Donnell +-- Source Code: https://github.com/cornernote/minetest-home_gui +-- License: BSD-3-Clause https://raw.github.com/cornernote/minetest-home_gui/master/LICENSE +-- +-- +-- This is a modified verson of Home Gui mod by TenPlus1 +-- formspec edited by Napiophelios +-- +]]-- + +-- Add Home GUI +if minetest.get_modpath("sethome") and sethome then +-- static spawn position +local statspawn = (minetest.setting_get_pos("static_spawnpoint") or {x = 0, y = 12, z = 0}) +local home_gui = {} + +-- get_formspec +home_gui.get_formspec = function(player) + + local formspec = "size[8,8.6]" + .. default.gui_bg + .. default.gui_bg_img + .. default.gui_slots + .. "button[0,0;2,0.5;main;Back]" + .. "button_exit[0.5,2;2,0.5;home_gui_set;Set Home]" + .. "button_exit[3,2;2,0.5;home_gui_go;Go Home]" + .. "button_exit[5.5,2;2,0.5;home_gui_spawn;Spawn]" + .."list[current_player;main;0,4.7;8,1;]" + .."list[current_player;main;0,5.85;8,3;8]" + + local home = sethome.get( player:get_player_name() ) + + if home then + formspec = formspec + .."label[2.15,3.35;Home set to:]" + .."label[4.15,3.35;".. minetest.pos_to_string(vector.round(home)) .. "]" + end + + return formspec +end + +-- add inventory_plus page when player joins +minetest.register_on_joinplayer(function(player) + inventory_plus.register_button(player,"home_gui","Home Pos") +end) + +-- what to do when we press da buttons +minetest.register_on_player_receive_fields(function(player, formname, fields) + local privs = minetest.get_player_privs(player:get_player_name()).home + if privs and fields.home_gui_set then + sethome.set( player:get_player_name(), player:getpos() ) + inventory_plus.set_inventory_formspec(player, inventory_plus.get_formspec(player,"main")) + end + if privs and fields.home_gui_go then + sethome.go( player:get_player_name() ) + inventory_plus.set_inventory_formspec(player, inventory_plus.get_formspec(player,"main")) + end + if privs and fields.home_gui_spawn then + player:setpos(statspawn) + inventory_plus.set_inventory_formspec(player, inventory_plus.get_formspec(player,"main")) + end + if fields.home_gui then + inventory_plus.set_inventory_formspec(player, home_gui.get_formspec(player)) + end +end) + +-- spawn command +minetest.register_chatcommand("spawn", { + description = "Go to Spawn", + privs = {home = true}, + func = function(name) + local player = minetest.get_player_by_name(name) + player:setpos(statspawn) + end, +}) +end \ No newline at end of file diff --git a/Inventory++/home_gui/textures/License.txt b/home_gui/textures/License.txt similarity index 100% rename from Inventory++/home_gui/textures/License.txt rename to home_gui/textures/License.txt diff --git a/Inventory++/home_gui/textures/inventory_plus_home_gui.png b/home_gui/textures/inventory_plus_home_gui.png similarity index 100% rename from Inventory++/home_gui/textures/inventory_plus_home_gui.png rename to home_gui/textures/inventory_plus_home_gui.png diff --git a/Inventory++/inventory_plus/README.txt b/inventory_plus/README.txt similarity index 97% rename from Inventory++/inventory_plus/README.txt rename to inventory_plus/README.txt index ed1d6a7..0cc66b9 100644 --- a/Inventory++/inventory_plus/README.txt +++ b/inventory_plus/README.txt @@ -1,7 +1,7 @@ ---------------------------------- Inventory ++ for Minetest ---------------------------------- - Fork of Inventory Plus +Fork of Inventory Plus Copyright (c) 2012 cornernote, Brett O'Donnell Copyright (c) 2013 Zeg9 diff --git a/Inventory++/inventory_plus/depends.txt b/inventory_plus/depends.txt similarity index 74% rename from Inventory++/inventory_plus/depends.txt rename to inventory_plus/depends.txt index 7f7519e..5ac4bd4 100644 --- a/Inventory++/inventory_plus/depends.txt +++ b/inventory_plus/depends.txt @@ -1,4 +1,5 @@ default creative? +sethome? sfinv? diff --git a/inventory_plus/init.lua b/inventory_plus/init.lua new file mode 100644 index 0000000..7a5d2ac --- /dev/null +++ b/inventory_plus/init.lua @@ -0,0 +1,63 @@ +--[[ + +Inventory Plus+ for Minetest + +Copyright (c) 2012 cornernote, Brett O'Donnell +Copyright (c) 2013 Zeg9 +Source Code: https://github.com/Zeg9/minetest-inventory_plus +License: GPLv3 + +]]-- + +-- modify creative inventory homepage +local creative = rawget(_G, "creative") or rawget(_G, "creative_inventory") +if creative then +local old_homepage_name = sfinv.get_homepage_name +function sfinv.get_homepage_name(player) + if creative.is_enabled_for(player:get_player_name()) then + return "sfinv:crafting" + else + return old_homepage_name(player) + end +end +end + +-- modify sfinv crafting page +local sfinv = rawget(_G, "sfinv") +if sfinv then + +-- create detached inventory for trash +local trashInv = minetest.create_detached_inventory("crafting_trash", { + + on_put = function(inv, toList, toIndex, stack, player) + inv:set_stack(toList, toIndex, {})--ItemStack(nil)) + minetest.sound_play("default_cool_lava", {to_player=player_name, gain = 0.25}) + end +}) + +trashInv:set_size("main", 1) + + +sfinv.override_page("sfinv:crafting", { + title = "Crafting", + get = function(self, player, context) + return sfinv.make_formspec(player, context, [[ + button[7.25,0;0.8,0.8;page_reload;@] + tooltip[page_reload;Reload Inv++] + listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF] + image[5.75,1.5;1,1;gui_furnace_arrow_bg.png^[transformR270] + image[0.075,1.6;0.8,0.8;creative_trash_icon.png] + list[current_player;main;0,4.7;8,1;] + list[current_player;craft;2.5,0.5;3,3;] + listring[] + list[detached:crafting_trash;main;0,1.5;1,1;] + list[current_player;craftpreview;7,1.5;1,1;] + listring[current_player;main] + ..default.gui_bg ..default.gui_bg_img ..default.gui_slots + ]], true) + end +}) + +end + +dofile(minetest.get_modpath("inventory_plus").."/invplusplus.lua") \ No newline at end of file diff --git a/Inventory++/inventory_plus/init.lua b/inventory_plus/invplusplus.lua similarity index 85% rename from Inventory++/inventory_plus/init.lua rename to inventory_plus/invplusplus.lua index 00d93b0..2d6480f 100644 --- a/Inventory++/inventory_plus/init.lua +++ b/inventory_plus/invplusplus.lua @@ -1,21 +1,3 @@ ---[[ - -Inventory Plus+ for Minetest - -Copyright (c) 2012 cornernote, Brett O'Donnell -Copyright (c) 2013 Zeg9 -Source Code: https://github.com/Zeg9/minetest-inventory_plus -License: GPLv3 - -]]-- - ---[[ -TODO: - * Limit the number of buttons displayed, and then: - * Multiple button pages (inventory can only display 6 buttons) - * Fallback to text if no image is present ? -]]-- - -- expose api inventory_plus = {} @@ -127,6 +109,3 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) return end end) - --- log that we started -minetest.log("action", "[MOD]"..minetest.get_current_modname().." -- loaded from "..minetest.get_modpath(minetest.get_current_modname())) diff --git a/Inventory++/inventory_plus/license.txt b/inventory_plus/license.txt similarity index 100% rename from Inventory++/inventory_plus/license.txt rename to inventory_plus/license.txt diff --git a/inventory_plus/textures/License.txt b/inventory_plus/textures/License.txt new file mode 100644 index 0000000..e2896c7 --- /dev/null +++ b/inventory_plus/textures/License.txt @@ -0,0 +1,3 @@ +inventory_plus_home_gui.png by Gambit +from PixelBox Texture pack +License WTFPL \ No newline at end of file diff --git a/Inventory++/craftguide/textures/craftguide_book.png b/inventory_plus/textures/inventory_plus_home_gui.png similarity index 86% rename from Inventory++/craftguide/textures/craftguide_book.png rename to inventory_plus/textures/inventory_plus_home_gui.png index e46cd38..3636353 100644 Binary files a/Inventory++/craftguide/textures/craftguide_book.png and b/inventory_plus/textures/inventory_plus_home_gui.png differ diff --git a/Default_Inventory/modpack.txt b/modpack.txt similarity index 100% rename from Default_Inventory/modpack.txt rename to modpack.txt diff --git a/Default_Inventory/screenshot.png b/screenshot.png similarity index 100% rename from Default_Inventory/screenshot.png rename to screenshot.png diff --git a/Inventory++/skins/README b/skins/README similarity index 100% rename from Inventory++/skins/README rename to skins/README diff --git a/Inventory++/skins/depends.txt b/skins/depends.txt similarity index 100% rename from Inventory++/skins/depends.txt rename to skins/depends.txt diff --git a/Inventory++/skins/init.lua b/skins/init.lua similarity index 100% rename from Inventory++/skins/init.lua rename to skins/init.lua diff --git a/Inventory++/skins/meta.lua b/skins/meta.lua similarity index 100% rename from Inventory++/skins/meta.lua rename to skins/meta.lua diff --git a/Inventory++/skins/meta/character_1.txt b/skins/meta/character_1.txt similarity index 100% rename from Inventory++/skins/meta/character_1.txt rename to skins/meta/character_1.txt diff --git a/Inventory++/skins/meta/character_10.txt b/skins/meta/character_10.txt similarity index 100% rename from Inventory++/skins/meta/character_10.txt rename to skins/meta/character_10.txt diff --git a/Inventory++/skins/meta/character_11.txt b/skins/meta/character_11.txt similarity index 100% rename from Inventory++/skins/meta/character_11.txt rename to skins/meta/character_11.txt diff --git a/Inventory++/skins/meta/character_12.txt b/skins/meta/character_12.txt similarity index 100% rename from Inventory++/skins/meta/character_12.txt rename to skins/meta/character_12.txt diff --git a/Inventory++/skins/meta/character_13.txt b/skins/meta/character_13.txt similarity index 100% rename from Inventory++/skins/meta/character_13.txt rename to skins/meta/character_13.txt diff --git a/Inventory++/skins/meta/character_14.txt b/skins/meta/character_14.txt similarity index 100% rename from Inventory++/skins/meta/character_14.txt rename to skins/meta/character_14.txt diff --git a/Inventory++/skins/meta/character_15.txt b/skins/meta/character_15.txt similarity index 100% rename from Inventory++/skins/meta/character_15.txt rename to skins/meta/character_15.txt diff --git a/Inventory++/skins/meta/character_16.txt b/skins/meta/character_16.txt similarity index 100% rename from Inventory++/skins/meta/character_16.txt rename to skins/meta/character_16.txt diff --git a/Inventory++/skins/meta/character_17.txt b/skins/meta/character_17.txt similarity index 100% rename from Inventory++/skins/meta/character_17.txt rename to skins/meta/character_17.txt diff --git a/Inventory++/skins/meta/character_18.txt b/skins/meta/character_18.txt similarity index 100% rename from Inventory++/skins/meta/character_18.txt rename to skins/meta/character_18.txt diff --git a/Inventory++/skins/meta/character_19.txt b/skins/meta/character_19.txt similarity index 100% rename from Inventory++/skins/meta/character_19.txt rename to skins/meta/character_19.txt diff --git a/Inventory++/skins/meta/character_2.txt b/skins/meta/character_2.txt similarity index 100% rename from Inventory++/skins/meta/character_2.txt rename to skins/meta/character_2.txt diff --git a/Inventory++/skins/meta/character_20.txt b/skins/meta/character_20.txt similarity index 100% rename from Inventory++/skins/meta/character_20.txt rename to skins/meta/character_20.txt diff --git a/Inventory++/skins/meta/character_21.txt b/skins/meta/character_21.txt similarity index 100% rename from Inventory++/skins/meta/character_21.txt rename to skins/meta/character_21.txt diff --git a/Inventory++/skins/meta/character_22.txt b/skins/meta/character_22.txt similarity index 100% rename from Inventory++/skins/meta/character_22.txt rename to skins/meta/character_22.txt diff --git a/Inventory++/skins/meta/character_23.txt b/skins/meta/character_23.txt similarity index 100% rename from Inventory++/skins/meta/character_23.txt rename to skins/meta/character_23.txt diff --git a/Inventory++/skins/meta/character_24.txt b/skins/meta/character_24.txt similarity index 100% rename from Inventory++/skins/meta/character_24.txt rename to skins/meta/character_24.txt diff --git a/Inventory++/skins/meta/character_25.txt b/skins/meta/character_25.txt similarity index 100% rename from Inventory++/skins/meta/character_25.txt rename to skins/meta/character_25.txt diff --git a/Inventory++/skins/meta/character_26.txt b/skins/meta/character_26.txt similarity index 100% rename from Inventory++/skins/meta/character_26.txt rename to skins/meta/character_26.txt diff --git a/Inventory++/skins/meta/character_27.txt b/skins/meta/character_27.txt similarity index 100% rename from Inventory++/skins/meta/character_27.txt rename to skins/meta/character_27.txt diff --git a/Inventory++/skins/meta/character_28.txt b/skins/meta/character_28.txt similarity index 100% rename from Inventory++/skins/meta/character_28.txt rename to skins/meta/character_28.txt diff --git a/Inventory++/skins/meta/character_29.txt b/skins/meta/character_29.txt similarity index 100% rename from Inventory++/skins/meta/character_29.txt rename to skins/meta/character_29.txt diff --git a/Inventory++/skins/meta/character_3.txt b/skins/meta/character_3.txt similarity index 100% rename from Inventory++/skins/meta/character_3.txt rename to skins/meta/character_3.txt diff --git a/Inventory++/skins/meta/character_30.txt b/skins/meta/character_30.txt similarity index 100% rename from Inventory++/skins/meta/character_30.txt rename to skins/meta/character_30.txt diff --git a/Inventory++/skins/meta/character_4.txt b/skins/meta/character_4.txt similarity index 100% rename from Inventory++/skins/meta/character_4.txt rename to skins/meta/character_4.txt diff --git a/Inventory++/skins/meta/character_5.txt b/skins/meta/character_5.txt similarity index 100% rename from Inventory++/skins/meta/character_5.txt rename to skins/meta/character_5.txt diff --git a/Inventory++/skins/meta/character_6.txt b/skins/meta/character_6.txt similarity index 100% rename from Inventory++/skins/meta/character_6.txt rename to skins/meta/character_6.txt diff --git a/Inventory++/skins/meta/character_7.txt b/skins/meta/character_7.txt similarity index 100% rename from Inventory++/skins/meta/character_7.txt rename to skins/meta/character_7.txt diff --git a/Inventory++/skins/meta/character_8.txt b/skins/meta/character_8.txt similarity index 100% rename from Inventory++/skins/meta/character_8.txt rename to skins/meta/character_8.txt diff --git a/Inventory++/skins/meta/character_9.txt b/skins/meta/character_9.txt similarity index 100% rename from Inventory++/skins/meta/character_9.txt rename to skins/meta/character_9.txt diff --git a/Inventory++/skins/meta/player_1.txt b/skins/meta/player_1.txt similarity index 100% rename from Inventory++/skins/meta/player_1.txt rename to skins/meta/player_1.txt diff --git a/Inventory++/skins/meta/player_10.txt b/skins/meta/player_10.txt similarity index 100% rename from Inventory++/skins/meta/player_10.txt rename to skins/meta/player_10.txt diff --git a/Inventory++/skins/meta/player_11.txt b/skins/meta/player_11.txt similarity index 100% rename from Inventory++/skins/meta/player_11.txt rename to skins/meta/player_11.txt diff --git a/Inventory++/skins/meta/player_12.txt b/skins/meta/player_12.txt similarity index 100% rename from Inventory++/skins/meta/player_12.txt rename to skins/meta/player_12.txt diff --git a/Inventory++/skins/meta/player_2.txt b/skins/meta/player_2.txt similarity index 100% rename from Inventory++/skins/meta/player_2.txt rename to skins/meta/player_2.txt diff --git a/Inventory++/skins/meta/player_3.txt b/skins/meta/player_3.txt similarity index 100% rename from Inventory++/skins/meta/player_3.txt rename to skins/meta/player_3.txt diff --git a/Inventory++/skins/meta/player_4.txt b/skins/meta/player_4.txt similarity index 100% rename from Inventory++/skins/meta/player_4.txt rename to skins/meta/player_4.txt diff --git a/Inventory++/skins/meta/player_5.txt b/skins/meta/player_5.txt similarity index 100% rename from Inventory++/skins/meta/player_5.txt rename to skins/meta/player_5.txt diff --git a/Inventory++/skins/meta/player_6.txt b/skins/meta/player_6.txt similarity index 100% rename from Inventory++/skins/meta/player_6.txt rename to skins/meta/player_6.txt diff --git a/Inventory++/skins/meta/player_7.txt b/skins/meta/player_7.txt similarity index 100% rename from Inventory++/skins/meta/player_7.txt rename to skins/meta/player_7.txt diff --git a/Inventory++/skins/meta/player_8.txt b/skins/meta/player_8.txt similarity index 100% rename from Inventory++/skins/meta/player_8.txt rename to skins/meta/player_8.txt diff --git a/Inventory++/skins/meta/player_9.txt b/skins/meta/player_9.txt similarity index 100% rename from Inventory++/skins/meta/player_9.txt rename to skins/meta/player_9.txt diff --git a/Inventory++/skins/players.lua b/skins/players.lua similarity index 100% rename from Inventory++/skins/players.lua rename to skins/players.lua diff --git a/Inventory++/skins/skinlist.lua b/skins/skinlist.lua similarity index 100% rename from Inventory++/skins/skinlist.lua rename to skins/skinlist.lua diff --git a/Inventory++/skins/textures/character_1.png b/skins/textures/character_1.png similarity index 100% rename from Inventory++/skins/textures/character_1.png rename to skins/textures/character_1.png diff --git a/Inventory++/skins/textures/character_10.png b/skins/textures/character_10.png similarity index 100% rename from Inventory++/skins/textures/character_10.png rename to skins/textures/character_10.png diff --git a/Inventory++/skins/textures/character_10_preview.png b/skins/textures/character_10_preview.png similarity index 100% rename from Inventory++/skins/textures/character_10_preview.png rename to skins/textures/character_10_preview.png diff --git a/Inventory++/skins/textures/character_10_preview_back.png b/skins/textures/character_10_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_10_preview_back.png rename to skins/textures/character_10_preview_back.png diff --git a/Inventory++/skins/textures/character_11.png b/skins/textures/character_11.png similarity index 100% rename from Inventory++/skins/textures/character_11.png rename to skins/textures/character_11.png diff --git a/Inventory++/skins/textures/character_11_preview.png b/skins/textures/character_11_preview.png similarity index 100% rename from Inventory++/skins/textures/character_11_preview.png rename to skins/textures/character_11_preview.png diff --git a/Inventory++/skins/textures/character_11_preview_back.png b/skins/textures/character_11_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_11_preview_back.png rename to skins/textures/character_11_preview_back.png diff --git a/Inventory++/skins/textures/character_12.png b/skins/textures/character_12.png similarity index 100% rename from Inventory++/skins/textures/character_12.png rename to skins/textures/character_12.png diff --git a/Inventory++/skins/textures/character_12_preview.png b/skins/textures/character_12_preview.png similarity index 100% rename from Inventory++/skins/textures/character_12_preview.png rename to skins/textures/character_12_preview.png diff --git a/Inventory++/skins/textures/character_12_preview_back.png b/skins/textures/character_12_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_12_preview_back.png rename to skins/textures/character_12_preview_back.png diff --git a/Inventory++/skins/textures/character_13.png b/skins/textures/character_13.png similarity index 100% rename from Inventory++/skins/textures/character_13.png rename to skins/textures/character_13.png diff --git a/Inventory++/skins/textures/character_13_preview.png b/skins/textures/character_13_preview.png similarity index 100% rename from Inventory++/skins/textures/character_13_preview.png rename to skins/textures/character_13_preview.png diff --git a/Inventory++/skins/textures/character_13_preview_back.png b/skins/textures/character_13_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_13_preview_back.png rename to skins/textures/character_13_preview_back.png diff --git a/Inventory++/skins/textures/character_14.png b/skins/textures/character_14.png similarity index 100% rename from Inventory++/skins/textures/character_14.png rename to skins/textures/character_14.png diff --git a/Inventory++/skins/textures/character_14_preview.png b/skins/textures/character_14_preview.png similarity index 100% rename from Inventory++/skins/textures/character_14_preview.png rename to skins/textures/character_14_preview.png diff --git a/Inventory++/skins/textures/character_14_preview_back.png b/skins/textures/character_14_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_14_preview_back.png rename to skins/textures/character_14_preview_back.png diff --git a/Inventory++/skins/textures/character_15.png b/skins/textures/character_15.png similarity index 100% rename from Inventory++/skins/textures/character_15.png rename to skins/textures/character_15.png diff --git a/Inventory++/skins/textures/character_15_preview.png b/skins/textures/character_15_preview.png similarity index 100% rename from Inventory++/skins/textures/character_15_preview.png rename to skins/textures/character_15_preview.png diff --git a/Inventory++/skins/textures/character_15_preview_back.png b/skins/textures/character_15_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_15_preview_back.png rename to skins/textures/character_15_preview_back.png diff --git a/Inventory++/skins/textures/character_16.png b/skins/textures/character_16.png similarity index 100% rename from Inventory++/skins/textures/character_16.png rename to skins/textures/character_16.png diff --git a/Inventory++/skins/textures/character_16_preview.png b/skins/textures/character_16_preview.png similarity index 100% rename from Inventory++/skins/textures/character_16_preview.png rename to skins/textures/character_16_preview.png diff --git a/Inventory++/skins/textures/character_16_preview_back.png b/skins/textures/character_16_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_16_preview_back.png rename to skins/textures/character_16_preview_back.png diff --git a/Inventory++/skins/textures/character_17.png b/skins/textures/character_17.png similarity index 100% rename from Inventory++/skins/textures/character_17.png rename to skins/textures/character_17.png diff --git a/Inventory++/skins/textures/character_17_preview.png b/skins/textures/character_17_preview.png similarity index 100% rename from Inventory++/skins/textures/character_17_preview.png rename to skins/textures/character_17_preview.png diff --git a/Inventory++/skins/textures/character_17_preview_back.png b/skins/textures/character_17_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_17_preview_back.png rename to skins/textures/character_17_preview_back.png diff --git a/Inventory++/skins/textures/character_18.png b/skins/textures/character_18.png similarity index 100% rename from Inventory++/skins/textures/character_18.png rename to skins/textures/character_18.png diff --git a/Inventory++/skins/textures/character_18_preview.png b/skins/textures/character_18_preview.png similarity index 100% rename from Inventory++/skins/textures/character_18_preview.png rename to skins/textures/character_18_preview.png diff --git a/Inventory++/skins/textures/character_18_preview_back.png b/skins/textures/character_18_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_18_preview_back.png rename to skins/textures/character_18_preview_back.png diff --git a/Inventory++/skins/textures/character_19.png b/skins/textures/character_19.png similarity index 100% rename from Inventory++/skins/textures/character_19.png rename to skins/textures/character_19.png diff --git a/Inventory++/skins/textures/character_19_preview.png b/skins/textures/character_19_preview.png similarity index 100% rename from Inventory++/skins/textures/character_19_preview.png rename to skins/textures/character_19_preview.png diff --git a/Inventory++/skins/textures/character_19_preview_back.png b/skins/textures/character_19_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_19_preview_back.png rename to skins/textures/character_19_preview_back.png diff --git a/Inventory++/skins/textures/character_1_preview.png b/skins/textures/character_1_preview.png similarity index 100% rename from Inventory++/skins/textures/character_1_preview.png rename to skins/textures/character_1_preview.png diff --git a/Inventory++/skins/textures/character_1_preview_back.png b/skins/textures/character_1_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_1_preview_back.png rename to skins/textures/character_1_preview_back.png diff --git a/Inventory++/skins/textures/character_2.png b/skins/textures/character_2.png similarity index 100% rename from Inventory++/skins/textures/character_2.png rename to skins/textures/character_2.png diff --git a/Inventory++/skins/textures/character_20.png b/skins/textures/character_20.png similarity index 100% rename from Inventory++/skins/textures/character_20.png rename to skins/textures/character_20.png diff --git a/Inventory++/skins/textures/character_20_preview.png b/skins/textures/character_20_preview.png similarity index 100% rename from Inventory++/skins/textures/character_20_preview.png rename to skins/textures/character_20_preview.png diff --git a/Inventory++/skins/textures/character_20_preview_back.png b/skins/textures/character_20_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_20_preview_back.png rename to skins/textures/character_20_preview_back.png diff --git a/Inventory++/skins/textures/character_21.png b/skins/textures/character_21.png similarity index 100% rename from Inventory++/skins/textures/character_21.png rename to skins/textures/character_21.png diff --git a/Inventory++/skins/textures/character_21_preview.png b/skins/textures/character_21_preview.png similarity index 100% rename from Inventory++/skins/textures/character_21_preview.png rename to skins/textures/character_21_preview.png diff --git a/Inventory++/skins/textures/character_21_preview_back.png b/skins/textures/character_21_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_21_preview_back.png rename to skins/textures/character_21_preview_back.png diff --git a/Inventory++/skins/textures/character_22.png b/skins/textures/character_22.png similarity index 100% rename from Inventory++/skins/textures/character_22.png rename to skins/textures/character_22.png diff --git a/Inventory++/skins/textures/character_22_preview.png b/skins/textures/character_22_preview.png similarity index 100% rename from Inventory++/skins/textures/character_22_preview.png rename to skins/textures/character_22_preview.png diff --git a/Inventory++/skins/textures/character_22_preview_back.png b/skins/textures/character_22_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_22_preview_back.png rename to skins/textures/character_22_preview_back.png diff --git a/Inventory++/skins/textures/character_23.png b/skins/textures/character_23.png similarity index 100% rename from Inventory++/skins/textures/character_23.png rename to skins/textures/character_23.png diff --git a/Inventory++/skins/textures/character_23_preview.png b/skins/textures/character_23_preview.png similarity index 100% rename from Inventory++/skins/textures/character_23_preview.png rename to skins/textures/character_23_preview.png diff --git a/Inventory++/skins/textures/character_23_preview_back.png b/skins/textures/character_23_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_23_preview_back.png rename to skins/textures/character_23_preview_back.png diff --git a/Inventory++/skins/textures/character_24.png b/skins/textures/character_24.png similarity index 100% rename from Inventory++/skins/textures/character_24.png rename to skins/textures/character_24.png diff --git a/Inventory++/skins/textures/character_24_preview.png b/skins/textures/character_24_preview.png similarity index 100% rename from Inventory++/skins/textures/character_24_preview.png rename to skins/textures/character_24_preview.png diff --git a/Inventory++/skins/textures/character_24_preview_back.png b/skins/textures/character_24_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_24_preview_back.png rename to skins/textures/character_24_preview_back.png diff --git a/Inventory++/skins/textures/character_25.png b/skins/textures/character_25.png similarity index 100% rename from Inventory++/skins/textures/character_25.png rename to skins/textures/character_25.png diff --git a/Inventory++/skins/textures/character_25_preview.png b/skins/textures/character_25_preview.png similarity index 100% rename from Inventory++/skins/textures/character_25_preview.png rename to skins/textures/character_25_preview.png diff --git a/Inventory++/skins/textures/character_25_preview_back.png b/skins/textures/character_25_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_25_preview_back.png rename to skins/textures/character_25_preview_back.png diff --git a/Inventory++/skins/textures/character_26.png b/skins/textures/character_26.png similarity index 100% rename from Inventory++/skins/textures/character_26.png rename to skins/textures/character_26.png diff --git a/Inventory++/skins/textures/character_26_preview.png b/skins/textures/character_26_preview.png similarity index 100% rename from Inventory++/skins/textures/character_26_preview.png rename to skins/textures/character_26_preview.png diff --git a/Inventory++/skins/textures/character_26_preview_back.png b/skins/textures/character_26_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_26_preview_back.png rename to skins/textures/character_26_preview_back.png diff --git a/Inventory++/skins/textures/character_27.png b/skins/textures/character_27.png similarity index 100% rename from Inventory++/skins/textures/character_27.png rename to skins/textures/character_27.png diff --git a/Inventory++/skins/textures/character_27_preview.png b/skins/textures/character_27_preview.png similarity index 100% rename from Inventory++/skins/textures/character_27_preview.png rename to skins/textures/character_27_preview.png diff --git a/Inventory++/skins/textures/character_27_preview_back.png b/skins/textures/character_27_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_27_preview_back.png rename to skins/textures/character_27_preview_back.png diff --git a/Inventory++/skins/textures/character_28.png b/skins/textures/character_28.png similarity index 100% rename from Inventory++/skins/textures/character_28.png rename to skins/textures/character_28.png diff --git a/Inventory++/skins/textures/character_28_preview.png b/skins/textures/character_28_preview.png similarity index 100% rename from Inventory++/skins/textures/character_28_preview.png rename to skins/textures/character_28_preview.png diff --git a/Inventory++/skins/textures/character_28_preview_back.png b/skins/textures/character_28_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_28_preview_back.png rename to skins/textures/character_28_preview_back.png diff --git a/Inventory++/skins/textures/character_29.png b/skins/textures/character_29.png similarity index 100% rename from Inventory++/skins/textures/character_29.png rename to skins/textures/character_29.png diff --git a/Inventory++/skins/textures/character_29_preview.png b/skins/textures/character_29_preview.png similarity index 100% rename from Inventory++/skins/textures/character_29_preview.png rename to skins/textures/character_29_preview.png diff --git a/Inventory++/skins/textures/character_29_preview_back.png b/skins/textures/character_29_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_29_preview_back.png rename to skins/textures/character_29_preview_back.png diff --git a/Inventory++/skins/textures/character_2_preview.png b/skins/textures/character_2_preview.png similarity index 100% rename from Inventory++/skins/textures/character_2_preview.png rename to skins/textures/character_2_preview.png diff --git a/Inventory++/skins/textures/character_2_preview_back.png b/skins/textures/character_2_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_2_preview_back.png rename to skins/textures/character_2_preview_back.png diff --git a/Inventory++/skins/textures/character_3.png b/skins/textures/character_3.png similarity index 100% rename from Inventory++/skins/textures/character_3.png rename to skins/textures/character_3.png diff --git a/Inventory++/skins/textures/character_30.png b/skins/textures/character_30.png similarity index 100% rename from Inventory++/skins/textures/character_30.png rename to skins/textures/character_30.png diff --git a/Inventory++/skins/textures/character_30_preview.png b/skins/textures/character_30_preview.png similarity index 100% rename from Inventory++/skins/textures/character_30_preview.png rename to skins/textures/character_30_preview.png diff --git a/Inventory++/skins/textures/character_30_preview_back.png b/skins/textures/character_30_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_30_preview_back.png rename to skins/textures/character_30_preview_back.png diff --git a/Inventory++/skins/textures/character_3_preview.png b/skins/textures/character_3_preview.png similarity index 100% rename from Inventory++/skins/textures/character_3_preview.png rename to skins/textures/character_3_preview.png diff --git a/Inventory++/skins/textures/character_3_preview_back.png b/skins/textures/character_3_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_3_preview_back.png rename to skins/textures/character_3_preview_back.png diff --git a/Inventory++/skins/textures/character_4.png b/skins/textures/character_4.png similarity index 100% rename from Inventory++/skins/textures/character_4.png rename to skins/textures/character_4.png diff --git a/Inventory++/skins/textures/character_4_preview.png b/skins/textures/character_4_preview.png similarity index 100% rename from Inventory++/skins/textures/character_4_preview.png rename to skins/textures/character_4_preview.png diff --git a/Inventory++/skins/textures/character_4_preview_back.png b/skins/textures/character_4_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_4_preview_back.png rename to skins/textures/character_4_preview_back.png diff --git a/Inventory++/skins/textures/character_5.png b/skins/textures/character_5.png similarity index 100% rename from Inventory++/skins/textures/character_5.png rename to skins/textures/character_5.png diff --git a/Inventory++/skins/textures/character_5_preview.png b/skins/textures/character_5_preview.png similarity index 100% rename from Inventory++/skins/textures/character_5_preview.png rename to skins/textures/character_5_preview.png diff --git a/Inventory++/skins/textures/character_5_preview_back.png b/skins/textures/character_5_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_5_preview_back.png rename to skins/textures/character_5_preview_back.png diff --git a/Inventory++/skins/textures/character_6.png b/skins/textures/character_6.png similarity index 100% rename from Inventory++/skins/textures/character_6.png rename to skins/textures/character_6.png diff --git a/Inventory++/skins/textures/character_6_preview.png b/skins/textures/character_6_preview.png similarity index 100% rename from Inventory++/skins/textures/character_6_preview.png rename to skins/textures/character_6_preview.png diff --git a/Inventory++/skins/textures/character_6_preview_back.png b/skins/textures/character_6_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_6_preview_back.png rename to skins/textures/character_6_preview_back.png diff --git a/Inventory++/skins/textures/character_7.png b/skins/textures/character_7.png similarity index 100% rename from Inventory++/skins/textures/character_7.png rename to skins/textures/character_7.png diff --git a/Inventory++/skins/textures/character_7_preview.png b/skins/textures/character_7_preview.png similarity index 100% rename from Inventory++/skins/textures/character_7_preview.png rename to skins/textures/character_7_preview.png diff --git a/Inventory++/skins/textures/character_7_preview_back.png b/skins/textures/character_7_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_7_preview_back.png rename to skins/textures/character_7_preview_back.png diff --git a/Inventory++/skins/textures/character_8.png b/skins/textures/character_8.png similarity index 100% rename from Inventory++/skins/textures/character_8.png rename to skins/textures/character_8.png diff --git a/Inventory++/skins/textures/character_8_preview.png b/skins/textures/character_8_preview.png similarity index 100% rename from Inventory++/skins/textures/character_8_preview.png rename to skins/textures/character_8_preview.png diff --git a/Inventory++/skins/textures/character_8_preview_back.png b/skins/textures/character_8_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_8_preview_back.png rename to skins/textures/character_8_preview_back.png diff --git a/Inventory++/skins/textures/character_9.png b/skins/textures/character_9.png similarity index 100% rename from Inventory++/skins/textures/character_9.png rename to skins/textures/character_9.png diff --git a/Inventory++/skins/textures/character_9_preview.png b/skins/textures/character_9_preview.png similarity index 100% rename from Inventory++/skins/textures/character_9_preview.png rename to skins/textures/character_9_preview.png diff --git a/Inventory++/skins/textures/character_9_preview_back.png b/skins/textures/character_9_preview_back.png similarity index 100% rename from Inventory++/skins/textures/character_9_preview_back.png rename to skins/textures/character_9_preview_back.png diff --git a/Inventory++/skins/textures/inventory_plus_skins.png b/skins/textures/inventory_plus_skins.png similarity index 100% rename from Inventory++/skins/textures/inventory_plus_skins.png rename to skins/textures/inventory_plus_skins.png diff --git a/Inventory++/skins/textures/player_1.png b/skins/textures/player_1.png similarity index 100% rename from Inventory++/skins/textures/player_1.png rename to skins/textures/player_1.png diff --git a/Inventory++/skins/textures/player_10.png b/skins/textures/player_10.png similarity index 100% rename from Inventory++/skins/textures/player_10.png rename to skins/textures/player_10.png diff --git a/Inventory++/skins/textures/player_10_back.png b/skins/textures/player_10_back.png similarity index 100% rename from Inventory++/skins/textures/player_10_back.png rename to skins/textures/player_10_back.png diff --git a/Inventory++/skins/textures/player_11.png b/skins/textures/player_11.png similarity index 100% rename from Inventory++/skins/textures/player_11.png rename to skins/textures/player_11.png diff --git a/Inventory++/skins/textures/player_11_back.png b/skins/textures/player_11_back.png similarity index 100% rename from Inventory++/skins/textures/player_11_back.png rename to skins/textures/player_11_back.png diff --git a/Inventory++/skins/textures/player_12.png b/skins/textures/player_12.png similarity index 100% rename from Inventory++/skins/textures/player_12.png rename to skins/textures/player_12.png diff --git a/Inventory++/skins/textures/player_12_back.png b/skins/textures/player_12_back.png similarity index 100% rename from Inventory++/skins/textures/player_12_back.png rename to skins/textures/player_12_back.png diff --git a/Inventory++/skins/textures/player_1_back.png b/skins/textures/player_1_back.png similarity index 100% rename from Inventory++/skins/textures/player_1_back.png rename to skins/textures/player_1_back.png diff --git a/Inventory++/skins/textures/player_2.png b/skins/textures/player_2.png similarity index 100% rename from Inventory++/skins/textures/player_2.png rename to skins/textures/player_2.png diff --git a/Inventory++/skins/textures/player_2_back.png b/skins/textures/player_2_back.png similarity index 100% rename from Inventory++/skins/textures/player_2_back.png rename to skins/textures/player_2_back.png diff --git a/Inventory++/skins/textures/player_3.png b/skins/textures/player_3.png similarity index 100% rename from Inventory++/skins/textures/player_3.png rename to skins/textures/player_3.png diff --git a/Inventory++/skins/textures/player_3_back.png b/skins/textures/player_3_back.png similarity index 100% rename from Inventory++/skins/textures/player_3_back.png rename to skins/textures/player_3_back.png diff --git a/Inventory++/skins/textures/player_4.png b/skins/textures/player_4.png similarity index 100% rename from Inventory++/skins/textures/player_4.png rename to skins/textures/player_4.png diff --git a/Inventory++/skins/textures/player_4_back.png b/skins/textures/player_4_back.png similarity index 100% rename from Inventory++/skins/textures/player_4_back.png rename to skins/textures/player_4_back.png diff --git a/Inventory++/skins/textures/player_5.png b/skins/textures/player_5.png similarity index 100% rename from Inventory++/skins/textures/player_5.png rename to skins/textures/player_5.png diff --git a/Inventory++/skins/textures/player_5_back.png b/skins/textures/player_5_back.png similarity index 100% rename from Inventory++/skins/textures/player_5_back.png rename to skins/textures/player_5_back.png diff --git a/Inventory++/skins/textures/player_6.png b/skins/textures/player_6.png similarity index 100% rename from Inventory++/skins/textures/player_6.png rename to skins/textures/player_6.png diff --git a/Inventory++/skins/textures/player_6_back.png b/skins/textures/player_6_back.png similarity index 100% rename from Inventory++/skins/textures/player_6_back.png rename to skins/textures/player_6_back.png diff --git a/Inventory++/skins/textures/player_7.png b/skins/textures/player_7.png similarity index 100% rename from Inventory++/skins/textures/player_7.png rename to skins/textures/player_7.png diff --git a/Inventory++/skins/textures/player_7_back.png b/skins/textures/player_7_back.png similarity index 100% rename from Inventory++/skins/textures/player_7_back.png rename to skins/textures/player_7_back.png diff --git a/Inventory++/skins/textures/player_8.png b/skins/textures/player_8.png similarity index 100% rename from Inventory++/skins/textures/player_8.png rename to skins/textures/player_8.png diff --git a/Inventory++/skins/textures/player_8_back.png b/skins/textures/player_8_back.png similarity index 100% rename from Inventory++/skins/textures/player_8_back.png rename to skins/textures/player_8_back.png diff --git a/Inventory++/skins/textures/player_9.png b/skins/textures/player_9.png similarity index 100% rename from Inventory++/skins/textures/player_9.png rename to skins/textures/player_9.png diff --git a/Inventory++/skins/textures/player_9_back.png b/skins/textures/player_9_back.png similarity index 100% rename from Inventory++/skins/textures/player_9_back.png rename to skins/textures/player_9_back.png