More relocations

Slimefun · Aug 15, 2020 · 1fcbbed · 1fcbbed
1 parent c6f77f9
commit 1fcbbed
Show file tree

Hide file tree

Showing 50 changed files with 51 additions and 0 deletions.
diff --git a/...raft/textures/slimefun/ender_backpack.png → ...res/slimefun/backpacks/ender_backpack.png b/...raft/textures/slimefun/ender_backpack.png → ...res/slimefun/backpacks/ender_backpack.png
diff --git a/...aft/textures/slimefun/gilded_backpack.png → ...es/slimefun/backpacks/gilded_backpack.png b/...aft/textures/slimefun/gilded_backpack.png → ...es/slimefun/backpacks/gilded_backpack.png
diff --git a/...raft/textures/slimefun/large_backpack.png → ...res/slimefun/backpacks/large_backpack.png b/...raft/textures/slimefun/large_backpack.png → ...res/slimefun/backpacks/large_backpack.png
diff --git a/...aft/textures/slimefun/medium_backpack.png → ...es/slimefun/backpacks/medium_backpack.png b/...aft/textures/slimefun/medium_backpack.png → ...es/slimefun/backpacks/medium_backpack.png
diff --git a/...ft/textures/slimefun/radiant_backpack.png → ...s/slimefun/backpacks/radiant_backpack.png b/...ft/textures/slimefun/radiant_backpack.png → ...s/slimefun/backpacks/radiant_backpack.png
diff --git a/...t/textures/slimefun/restored_backpack.png → .../slimefun/backpacks/restored_backpack.png b/...t/textures/slimefun/restored_backpack.png → .../slimefun/backpacks/restored_backpack.png
diff --git a/...raft/textures/slimefun/small_backpack.png → ...res/slimefun/backpacks/small_backpack.png b/...raft/textures/slimefun/small_backpack.png → ...res/slimefun/backpacks/small_backpack.png
diff --git a/...raft/textures/slimefun/bound_backpack.png → ...slimefun/backpacks/soulbound_backpack.png b/...raft/textures/slimefun/bound_backpack.png → ...slimefun/backpacks/soulbound_backpack.png
diff --git a/...raft/textures/slimefun/woven_backpack.png → ...res/slimefun/backpacks/woven_backpack.png b/...raft/textures/slimefun/woven_backpack.png → ...res/slimefun/backpacks/woven_backpack.png
diff --git a/...necraft/textures/slimefun/armor_forge.png → ...ures/slimefun/multiblocks/armor_forge.png b/...necraft/textures/slimefun/armor_forge.png → ...ures/slimefun/multiblocks/armor_forge.png
diff --git a/...es/slimefun/automated_panning_machine.png → ...multiblocks/automated_panning_machine.png b/...es/slimefun/automated_panning_machine.png → ...multiblocks/automated_panning_machine.png
diff --git a/...inecraft/textures/slimefun/compressor.png → ...tures/slimefun/multiblocks/compressor.png b/...inecraft/textures/slimefun/compressor.png → ...tures/slimefun/multiblocks/compressor.png
diff --git a/...ures/slimefun/enhanced_crafting_table.png → ...n/multiblocks/enhanced_crafting_table.png b/...ures/slimefun/enhanced_crafting_table.png → ...n/multiblocks/enhanced_crafting_table.png
diff --git a/...necraft/textures/slimefun/grind_stone.png → ...ures/slimefun/multiblocks/grind_stone.png b/...necraft/textures/slimefun/grind_stone.png → ...ures/slimefun/multiblocks/grind_stone.png
diff --git a/...ts/minecraft/textures/slimefun/juicer.png → .../textures/slimefun/multiblocks/juicer.png b/...ts/minecraft/textures/slimefun/juicer.png → .../textures/slimefun/multiblocks/juicer.png
diff --git a/...aft/textures/slimefun/magic_workbench.png → .../slimefun/multiblocks/magic_workbench.png b/...aft/textures/slimefun/magic_workbench.png → .../slimefun/multiblocks/magic_workbench.png
diff --git a/.../textures/slimefun/makeshift_smeltery.png → ...imefun/multiblocks/makeshift_smeltery.png b/.../textures/slimefun/makeshift_smeltery.png → ...imefun/multiblocks/makeshift_smeltery.png
diff --git a/...necraft/textures/slimefun/ore_crusher.png → ...ures/slimefun/multiblocks/ore_crusher.png b/...necraft/textures/slimefun/ore_crusher.png → ...ures/slimefun/multiblocks/ore_crusher.png
diff --git a/...inecraft/textures/slimefun/ore_washer.png → ...tures/slimefun/multiblocks/ore_washer.png b/...inecraft/textures/slimefun/ore_washer.png → ...tures/slimefun/multiblocks/ore_washer.png
diff --git a/.../minecraft/textures/slimefun/smeltery.png → ...extures/slimefun/multiblocks/smeltery.png b/.../minecraft/textures/slimefun/smeltery.png → ...extures/slimefun/multiblocks/smeltery.png
diff --git a/...raft/textures/slimefun/angel_talisman.png → ...res/slimefun/talismans/angel_talisman.png b/...raft/textures/slimefun/angel_talisman.png → ...res/slimefun/talismans/angel_talisman.png
diff --git a/...raft/textures/slimefun/anvil_talisman.png → ...res/slimefun/talismans/anvil_talisman.png b/...raft/textures/slimefun/anvil_talisman.png → ...res/slimefun/talismans/anvil_talisman.png
diff --git a/...aft/textures/slimefun/common_talisman.png → ...es/slimefun/talismans/common_talisman.png b/...aft/textures/slimefun/common_talisman.png → ...es/slimefun/talismans/common_talisman.png
diff --git a/...extures/slimefun/ender_angel_talisman.png → ...imefun/talismans/ender_angel_talisman.png b/...extures/slimefun/ender_angel_talisman.png → ...imefun/talismans/ender_angel_talisman.png
diff --git a/...extures/slimefun/ender_anvil_talisman.png → ...imefun/talismans/ender_anvil_talisman.png b/...extures/slimefun/ender_anvil_talisman.png → ...imefun/talismans/ender_anvil_talisman.png
diff --git a/...textures/slimefun/ender_fire_talisman.png → ...limefun/talismans/ender_fire_talisman.png b/...textures/slimefun/ender_fire_talisman.png → ...limefun/talismans/ender_fire_talisman.png
diff --git a/...xtures/slimefun/ender_hunter_talisman.png → ...mefun/talismans/ender_hunter_talisman.png b/...xtures/slimefun/ender_hunter_talisman.png → ...mefun/talismans/ender_hunter_talisman.png
diff --git a/...xtures/slimefun/ender_knight_talisman.png → ...mefun/talismans/ender_knight_talisman.png b/...xtures/slimefun/ender_knight_talisman.png → ...mefun/talismans/ender_knight_talisman.png
diff --git a/...textures/slimefun/ender_lava_talisman.png → ...limefun/talismans/ender_lava_talisman.png b/...textures/slimefun/ender_lava_talisman.png → ...limefun/talismans/ender_lava_talisman.png
diff --git a/...ures/slimefun/ender_magician_talisman.png → ...fun/talismans/ender_magician_talisman.png b/...ures/slimefun/ender_magician_talisman.png → ...fun/talismans/ender_magician_talisman.png
diff --git a/...extures/slimefun/ender_miner_talisman.png → ...imefun/talismans/ender_miner_talisman.png b/...extures/slimefun/ender_miner_talisman.png → ...imefun/talismans/ender_miner_talisman.png
diff --git a/...raft/textures/slimefun/ender_talisman.png → ...res/slimefun/talismans/ender_talisman.png b/...raft/textures/slimefun/ender_talisman.png → ...res/slimefun/talismans/ender_talisman.png
diff --git a/...res/slimefun/ender_traveller_talisman.png → ...un/talismans/ender_traveller_talisman.png b/...res/slimefun/ender_traveller_talisman.png → ...un/talismans/ender_traveller_talisman.png
diff --git a/...tures/slimefun/ender_warrior_talisman.png → ...efun/talismans/ender_warrior_talisman.png b/...tures/slimefun/ender_warrior_talisman.png → ...efun/talismans/ender_warrior_talisman.png
diff --git a/...extures/slimefun/ender_water_talisman.png → ...imefun/talismans/ender_water_talisman.png b/...extures/slimefun/ender_water_talisman.png → ...imefun/talismans/ender_water_talisman.png
diff --git a/...res/slimefun/ender_whirlwind_talisman.png → ...un/talismans/ender_whirlwind_talisman.png b/...res/slimefun/ender_whirlwind_talisman.png → ...un/talismans/ender_whirlwind_talisman.png
diff --git a/...xtures/slimefun/ender_wizard_talisman.png → ...mefun/talismans/ender_wizard_talisman.png b/...xtures/slimefun/ender_wizard_talisman.png → ...mefun/talismans/ender_wizard_talisman.png
diff --git a/...craft/textures/slimefun/fire_talisman.png → ...ures/slimefun/talismans/fire_talisman.png b/...craft/textures/slimefun/fire_talisman.png → ...ures/slimefun/talismans/fire_talisman.png
diff --git a/...aft/textures/slimefun/hunter_talisman.png → ...es/slimefun/talismans/hunter_talisman.png b/...aft/textures/slimefun/hunter_talisman.png → ...es/slimefun/talismans/hunter_talisman.png
diff --git a/...aft/textures/slimefun/knight_talisman.png → ...es/slimefun/talismans/knight_talisman.png b/...aft/textures/slimefun/knight_talisman.png → ...es/slimefun/talismans/knight_talisman.png
diff --git a/...craft/textures/slimefun/lava_talisman.png → ...ures/slimefun/talismans/lava_talisman.png b/...craft/textures/slimefun/lava_talisman.png → ...ures/slimefun/talismans/lava_talisman.png
diff --git a/...t/textures/slimefun/magician_talisman.png → .../slimefun/talismans/magician_talisman.png b/...t/textures/slimefun/magician_talisman.png → .../slimefun/talismans/magician_talisman.png
diff --git a/...raft/textures/slimefun/miner_talisman.png → ...res/slimefun/talismans/miner_talisman.png b/...raft/textures/slimefun/miner_talisman.png → ...res/slimefun/talismans/miner_talisman.png
diff --git a/.../textures/slimefun/traveller_talisman.png → ...slimefun/talismans/traveller_talisman.png b/.../textures/slimefun/traveller_talisman.png → ...slimefun/talismans/traveller_talisman.png
diff --git a/...ft/textures/slimefun/warrior_talisman.png → ...s/slimefun/talismans/warrior_talisman.png b/...ft/textures/slimefun/warrior_talisman.png → ...s/slimefun/talismans/warrior_talisman.png
diff --git a/...raft/textures/slimefun/water_talisman.png → ...res/slimefun/talismans/water_talisman.png b/...raft/textures/slimefun/water_talisman.png → ...res/slimefun/talismans/water_talisman.png
diff --git a/.../textures/slimefun/whirlwind_talisman.png → ...slimefun/talismans/whirlwind_talisman.png b/.../textures/slimefun/whirlwind_talisman.png → ...slimefun/talismans/whirlwind_talisman.png
diff --git a/...aft/textures/slimefun/wizard_talisman.png → ...es/slimefun/talismans/wizard_talisman.png b/...aft/textures/slimefun/wizard_talisman.png → ...es/slimefun/talismans/wizard_talisman.png
diff --git a/src/generate.js b/src/generate.js
@@ -6,6 +6,9 @@ const templates = require('./templates.js');
 
 Promise.all([
     fs.mkdir("assets/minecraft/models/item", {recursive:true}),
+    fs.mkdir("assets/minecraft/models/slimefun/backpacks", {recursive:true}),
+    fs.mkdir("assets/minecraft/models/slimefun/talismans", {recursive:true}),
+    fs.mkdir("assets/minecraft/models/slimefun/multiblocks", {recursive:true}),
     fs.mkdir("assets/minecraft/models/slimefun/gui/flags", {recursive:true})
 ]).then(() => fs.readFile("src/models.json", "UTF-8").then(models => {
     let json = JSON.parse(models);

diff --git a/src/models.json b/src/models.json
@@ -678,41 +678,49 @@
 		"data": 4001
 	},
 	"COMMON_TALISMAN": {
+	    "id": "talismans/common_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4000
 	},
 	"ENDER_TALISMAN": {
+	    "id": "talismans/ender_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4001
 	},
 	"ANVIL_TALISMAN": {
+	    "id": "talismans/anvil_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4002
 	},
 	"MINER_TALISMAN": {
+	    "id": "talismans/miner_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4003
 	},
 	"HUNTER_TALISMAN": {
+	    "id": "talismans/hunter_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4004
 	},
 	"LAVA_TALISMAN": {
+	    "id": "talismans/lava_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4005
 	},
 	"WATER_TALISMAN": {
+	    "id": "talismans/water_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4006
 	},
 	"ANGEL_TALISMAN": {
+	    "id": "talismans/angel_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4007
@@ -738,16 +746,19 @@
 		"data": 4014
 	},
 	"TRAVELLER_TALISMAN": {
+	    "id": "talismans/traveller_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4008
 	},
 	"WARRIOR_TALISMAN": {
+	    "id": "talismans/warrior_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4009
 	},
 	"FIRE_TALISMAN": {
+	    "id": "talismans/fire_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4010
@@ -876,141 +887,169 @@
 		"data": 4000
 	},
 	"ENHANCED_CRAFTING_TABLE": {
+	    "id": "multiblocks/enhanced_crafting_table",
 		"item": "crafting_table",
 		"template": "BLOCK",
 		"data": 4000
 	},
 	"MAGIC_WORKBENCH": {
+	    "id": "multiblocks/magic_workbench",
 		"item": "crafting_table",
 		"template": "BLOCK",
 		"data": 4001
 	},
 	"GRIND_STONE": {
+	    "id": "multiblocks/grind_stone",
 		"item": "dispenser",
 		"template": "BLOCK",
 		"data": 4000
 	},
 	"ORE_CRUSHER": {
+	    "id": "multiblocks/ore_crusher",
 		"item": "dispenser",
 		"template": "BLOCK",
 		"data": 4001
 	},
 	"ARMOR_FORGE": {
+	    "id": "multiblocks/armor_forge",
 		"item": "anvil",
 		"template": "BLOCK",
 		"data": 4000
 	},
 	"JUICER": {
+	    "id": "multiblocks/juicer",
 		"item": "glass_bottle",
 		"template": "ITEM",
 		"data": 4000
 	},
 	"COMPRESSOR": {
+	    "id": "multiblocks/compressor",
 		"item": "piston",
 		"template": "PISTON",
 		"data": 4000
 	},
 	"SMELTERY": {
+	    "id": "multiblocks/smeltery",
 		"item": "furnace",
 		"template": "BLOCK",
 		"data": 4000
 	},
 	"MAKESHIFT_SMELTERY": {
+	    "id": "multiblocks/makeshift_smeltery",
 		"item": "blast_furnace",
 		"template": "BLOCK",
 		"data": 4000
 	},
 	"AUTOMATED_PANNING_MACHINE": {
+	    "id": "multiblocks/automated_panning_machine",
 		"item": "bowl",
 		"template": "ITEM",
 		"data": 4002
 	},
 	"ORE_WASHER": {
+	    "id": "multiblocks/ore_washer",
 		"item": "cauldron",
 		"template": "ITEM",
 		"data": 4000
 	},
 	"KNIGHT_TALISMAN": {
+	    "id": "talismans/knight_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4012
 	},
 	"WIZARD_TALISMAN": {
+	    "id": "talismans/wizard_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4013
 	},
 	"MAGICIAN_TALISMAN": {
+	    "id": "talismans/magician_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4014
 	},
 	"WHIRLWIND_TALISMAN": {
+	    "id": "talismans/whirlwind_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4015
 	},
 	"ENDER_ANVIL_TALISMAN": {
+	    "id": "talismans/ender_anvil_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4016
 	},
 	"ENDER_MINER_TALISMAN": {
+	    "id": "talismans/ender_miner_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4017
 	},
 	"ENDER_HUNTER_TALISMAN": {
+	    "id": "talismans/ender_hunter_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4018
 	},
 	"ENDER_LAVA_TALISMAN": {
+	    "id": "talismans/ender_lava_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4019
 	},
 	"ENDER_WATER_TALISMAN": {
+	    "id": "talismans/ender_water_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4020
 	},
 	"ENDER_ANGEL_TALISMAN": {
+	    "id": "talismans/ender_angel_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4021
 	},
 	"ENDER_KNIGHT_TALISMAN": {
+	    "id": "talismans/ender_knight_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4022
 	},
 	"ENDER_WIZARD_TALISMAN": {
+	    "id": "talismans/ender_wizard_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4023
 	},
 	"ENDER_MAGICIAN_TALISMAN": {
+	    "id": "talismans/ender_magician_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4024
 	},
 	"ENDER_WHIRLWIND_TALISMAN": {
+	    "id": "talismans/ender_whirlwind_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4025
 	},
 	"ENDER_TRAVELLER_TALISMAN": {
+	    "id": "talismans/ender_traveller_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4026
 	},
 	"ENDER_WARRIOR_TALISMAN": {
+	    "id": "talismans/ender_warrior_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4027
 	},
 	"ENDER_FIRE_TALISMAN": {
+	    "id": "talismans/ender_fire_talisman",
 		"item": "emerald",
 		"template": "ITEM",
 		"data": 4028
@@ -1046,36 +1085,43 @@
 		"data": 4043
 	},
 	"SMALL_BACKPACK": {
+	    "id": "backpacks/small_backpack",
 		"item": "player_head",
 		"template": "SKULL",
 		"data": 4044
 	},
 	"MEDIUM_BACKPACK": {
+	    "id": "backpacks/medium_backpack",
 		"item": "player_head",
 		"template": "SKULL",
 		"data": 4045
 	},
 	"LARGE_BACKPACK": {
+	    "id": "backpacks/large_backpack",
 		"item": "player_head",
 		"template": "SKULL",
 		"data": 4046
 	},
 	"WOVEN_BACKPACK": {
+	    "id": "backpacks/woven_backpack",
 		"item": "player_head",
 		"template": "SKULL",
 		"data": 4047
 	},
 	"GILDED_BACKPACK": {
+	    "id": "backpacks/gilded_backpack",
 		"item": "player_head",
 		"template": "SKULL",
 		"data": 4048
 	},
 	"RADIANT_BACKPACK": {
+	    "id": "backpacks/radiant_backpack",
 		"item": "player_head",
 		"template": "SKULL",
 		"data": 4049
 	},
 	"RESTORED_BACKPACK": {
+	    "id": "backpacks/restored_backpack",
 		"item": "player_head",
 		"template": "SKULL",
 		"data": 4050
@@ -1086,11 +1132,13 @@
 		"data": 4051
 	},
 	"ENDER_BACKPACK": {
+	    "id": "backpacks/ender_backpack",
 		"item": "player_head",
 		"template": "SKULL",
 		"data": 4052
 	},
 	"BOUND_BACKPACK": {
+	    "id": "backpacks/soulbound_backpack",
 		"item": "player_head",
 		"template": "SKULL",
 		"data": 4053