diff --git a/.gitignore b/.gitignore index 5d3926ad..fc71fe5f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ Thumbs.db # Default test map src/testmap -bin/.gitignore +bin/ # CMake generated files CMakeCache.txt diff --git a/Makefile b/Makefile index 80070f82..b4872766 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,14 @@ -SUBDIRS = src plugins +SUBDIRS = src plugins files include subdir.mk -dist-tar: +dist-tar: LICENSE tar cvzf mineserver-latest-`uname`-bin.tar.gz ./bin/ ./LICENSE -dist-zip: +dist-zip: LICENSE zip -j mineserver-latest-`uname`-bin.zip ./bin/* ./LICENSE dist: dist-tar dist-zip + +clean: + rm -rf ./bin diff --git a/files/Makefile b/files/Makefile new file mode 100644 index 00000000..a65b97be --- /dev/null +++ b/files/Makefile @@ -0,0 +1,20 @@ +FILES = commands.cfg \ + config.cfg \ + item_alias.cfg \ + banned.txt \ + motd.txt \ + permissions.txt \ + roles.txt \ + rules.txt \ + whitelist.txt \ + +DIRS = recipes + +INSTALL_DIR = ../bin/ + +.PHONY: clean all install + +install: $(FILES) + mkdir -p $(INSTALL_DIR) + cp $(FILES) $(INSTALL_DIR) + cp -r $(DIRS) $(INSTALL_DIR) diff --git a/bin/banned.txt b/files/banned.txt similarity index 100% rename from bin/banned.txt rename to files/banned.txt diff --git a/bin/commands.cfg b/files/commands.cfg similarity index 100% rename from bin/commands.cfg rename to files/commands.cfg diff --git a/bin/config.cfg b/files/config.cfg similarity index 100% rename from bin/config.cfg rename to files/config.cfg diff --git a/bin/item_alias.cfg b/files/item_alias.cfg similarity index 100% rename from bin/item_alias.cfg rename to files/item_alias.cfg diff --git a/bin/motd.txt b/files/motd.txt similarity index 100% rename from bin/motd.txt rename to files/motd.txt diff --git a/bin/permissions.txt b/files/permissions.txt similarity index 100% rename from bin/permissions.txt rename to files/permissions.txt diff --git a/bin/recipes/ENABLED_RECIPES.cfg b/files/recipes/ENABLED_RECIPES.cfg similarity index 100% rename from bin/recipes/ENABLED_RECIPES.cfg rename to files/recipes/ENABLED_RECIPES.cfg diff --git a/bin/recipes/armour/boots_chain.recipe b/files/recipes/armour/boots_chain.recipe similarity index 100% rename from bin/recipes/armour/boots_chain.recipe rename to files/recipes/armour/boots_chain.recipe diff --git a/bin/recipes/armour/boots_diamond.recipe b/files/recipes/armour/boots_diamond.recipe similarity index 100% rename from bin/recipes/armour/boots_diamond.recipe rename to files/recipes/armour/boots_diamond.recipe diff --git a/bin/recipes/armour/boots_gold.recipe b/files/recipes/armour/boots_gold.recipe similarity index 100% rename from bin/recipes/armour/boots_gold.recipe rename to files/recipes/armour/boots_gold.recipe diff --git a/bin/recipes/armour/boots_iron.recipe b/files/recipes/armour/boots_iron.recipe similarity index 100% rename from bin/recipes/armour/boots_iron.recipe rename to files/recipes/armour/boots_iron.recipe diff --git a/bin/recipes/armour/boots_leather.recipe b/files/recipes/armour/boots_leather.recipe similarity index 100% rename from bin/recipes/armour/boots_leather.recipe rename to files/recipes/armour/boots_leather.recipe diff --git a/bin/recipes/armour/chestplate_chain.recipe b/files/recipes/armour/chestplate_chain.recipe similarity index 100% rename from bin/recipes/armour/chestplate_chain.recipe rename to files/recipes/armour/chestplate_chain.recipe diff --git a/bin/recipes/armour/chestplate_diamond.recipe b/files/recipes/armour/chestplate_diamond.recipe similarity index 100% rename from bin/recipes/armour/chestplate_diamond.recipe rename to files/recipes/armour/chestplate_diamond.recipe diff --git a/bin/recipes/armour/chestplate_gold.recipe b/files/recipes/armour/chestplate_gold.recipe similarity index 100% rename from bin/recipes/armour/chestplate_gold.recipe rename to files/recipes/armour/chestplate_gold.recipe diff --git a/bin/recipes/armour/chestplate_iron.recipe b/files/recipes/armour/chestplate_iron.recipe similarity index 100% rename from bin/recipes/armour/chestplate_iron.recipe rename to files/recipes/armour/chestplate_iron.recipe diff --git a/bin/recipes/armour/chestplate_leather.recipe b/files/recipes/armour/chestplate_leather.recipe similarity index 100% rename from bin/recipes/armour/chestplate_leather.recipe rename to files/recipes/armour/chestplate_leather.recipe diff --git a/bin/recipes/armour/helmet_chain.recipe b/files/recipes/armour/helmet_chain.recipe similarity index 100% rename from bin/recipes/armour/helmet_chain.recipe rename to files/recipes/armour/helmet_chain.recipe diff --git a/bin/recipes/armour/helmet_diamond.recipe b/files/recipes/armour/helmet_diamond.recipe similarity index 100% rename from bin/recipes/armour/helmet_diamond.recipe rename to files/recipes/armour/helmet_diamond.recipe diff --git a/bin/recipes/armour/helmet_gold.recipe b/files/recipes/armour/helmet_gold.recipe similarity index 100% rename from bin/recipes/armour/helmet_gold.recipe rename to files/recipes/armour/helmet_gold.recipe diff --git a/bin/recipes/armour/helmet_iron.recipe b/files/recipes/armour/helmet_iron.recipe similarity index 100% rename from bin/recipes/armour/helmet_iron.recipe rename to files/recipes/armour/helmet_iron.recipe diff --git a/bin/recipes/armour/helmet_leather.recipe b/files/recipes/armour/helmet_leather.recipe similarity index 100% rename from bin/recipes/armour/helmet_leather.recipe rename to files/recipes/armour/helmet_leather.recipe diff --git a/bin/recipes/armour/legging_chain.recipe b/files/recipes/armour/legging_chain.recipe similarity index 100% rename from bin/recipes/armour/legging_chain.recipe rename to files/recipes/armour/legging_chain.recipe diff --git a/bin/recipes/armour/legging_diamond.recipe b/files/recipes/armour/legging_diamond.recipe similarity index 100% rename from bin/recipes/armour/legging_diamond.recipe rename to files/recipes/armour/legging_diamond.recipe diff --git a/bin/recipes/armour/legging_gold.recipe b/files/recipes/armour/legging_gold.recipe similarity index 100% rename from bin/recipes/armour/legging_gold.recipe rename to files/recipes/armour/legging_gold.recipe diff --git a/bin/recipes/armour/legging_iron.recipe b/files/recipes/armour/legging_iron.recipe similarity index 100% rename from bin/recipes/armour/legging_iron.recipe rename to files/recipes/armour/legging_iron.recipe diff --git a/bin/recipes/armour/legging_leather.recipe b/files/recipes/armour/legging_leather.recipe similarity index 100% rename from bin/recipes/armour/legging_leather.recipe rename to files/recipes/armour/legging_leather.recipe diff --git a/bin/recipes/block/sand_hslab.recipe b/files/recipes/block/sand_hslab.recipe similarity index 100% rename from bin/recipes/block/sand_hslab.recipe rename to files/recipes/block/sand_hslab.recipe diff --git a/bin/recipes/block/smooth_hslab.recipe b/files/recipes/block/smooth_hslab.recipe similarity index 100% rename from bin/recipes/block/smooth_hslab.recipe rename to files/recipes/block/smooth_hslab.recipe diff --git a/bin/recipes/block/stone_hslab.recipe b/files/recipes/block/stone_hslab.recipe similarity index 100% rename from bin/recipes/block/stone_hslab.recipe rename to files/recipes/block/stone_hslab.recipe diff --git a/bin/recipes/block/wood_hslab.recipe b/files/recipes/block/wood_hslab.recipe similarity index 100% rename from bin/recipes/block/wood_hslab.recipe rename to files/recipes/block/wood_hslab.recipe diff --git a/bin/recipes/cloth/black.recipe b/files/recipes/cloth/black.recipe similarity index 100% rename from bin/recipes/cloth/black.recipe rename to files/recipes/cloth/black.recipe diff --git a/bin/recipes/cloth/blue.recipe b/files/recipes/cloth/blue.recipe similarity index 100% rename from bin/recipes/cloth/blue.recipe rename to files/recipes/cloth/blue.recipe diff --git a/bin/recipes/cloth/brown.recipe b/files/recipes/cloth/brown.recipe similarity index 100% rename from bin/recipes/cloth/brown.recipe rename to files/recipes/cloth/brown.recipe diff --git a/bin/recipes/cloth/cyan.recipe b/files/recipes/cloth/cyan.recipe similarity index 100% rename from bin/recipes/cloth/cyan.recipe rename to files/recipes/cloth/cyan.recipe diff --git a/bin/recipes/cloth/darkgreen.recipe b/files/recipes/cloth/darkgreen.recipe similarity index 100% rename from bin/recipes/cloth/darkgreen.recipe rename to files/recipes/cloth/darkgreen.recipe diff --git a/bin/recipes/cloth/grey.recipe b/files/recipes/cloth/grey.recipe similarity index 100% rename from bin/recipes/cloth/grey.recipe rename to files/recipes/cloth/grey.recipe diff --git a/bin/recipes/cloth/lightblue.recipe b/files/recipes/cloth/lightblue.recipe similarity index 100% rename from bin/recipes/cloth/lightblue.recipe rename to files/recipes/cloth/lightblue.recipe diff --git a/bin/recipes/cloth/lightgreen.recipe b/files/recipes/cloth/lightgreen.recipe similarity index 100% rename from bin/recipes/cloth/lightgreen.recipe rename to files/recipes/cloth/lightgreen.recipe diff --git a/bin/recipes/cloth/lightgrey.recipe b/files/recipes/cloth/lightgrey.recipe similarity index 100% rename from bin/recipes/cloth/lightgrey.recipe rename to files/recipes/cloth/lightgrey.recipe diff --git a/bin/recipes/cloth/magenta.recipe b/files/recipes/cloth/magenta.recipe similarity index 100% rename from bin/recipes/cloth/magenta.recipe rename to files/recipes/cloth/magenta.recipe diff --git a/bin/recipes/cloth/orange.recipe b/files/recipes/cloth/orange.recipe similarity index 100% rename from bin/recipes/cloth/orange.recipe rename to files/recipes/cloth/orange.recipe diff --git a/bin/recipes/cloth/pink.recipe b/files/recipes/cloth/pink.recipe similarity index 100% rename from bin/recipes/cloth/pink.recipe rename to files/recipes/cloth/pink.recipe diff --git a/bin/recipes/cloth/purple.recipe b/files/recipes/cloth/purple.recipe similarity index 100% rename from bin/recipes/cloth/purple.recipe rename to files/recipes/cloth/purple.recipe diff --git a/bin/recipes/cloth/red.recipe b/files/recipes/cloth/red.recipe similarity index 100% rename from bin/recipes/cloth/red.recipe rename to files/recipes/cloth/red.recipe diff --git a/bin/recipes/cloth/white.recipe b/files/recipes/cloth/white.recipe similarity index 100% rename from bin/recipes/cloth/white.recipe rename to files/recipes/cloth/white.recipe diff --git a/bin/recipes/cloth/yellow.recipe b/files/recipes/cloth/yellow.recipe similarity index 100% rename from bin/recipes/cloth/yellow.recipe rename to files/recipes/cloth/yellow.recipe diff --git a/bin/recipes/dyes/cyan.recipe b/files/recipes/dyes/cyan.recipe similarity index 100% rename from bin/recipes/dyes/cyan.recipe rename to files/recipes/dyes/cyan.recipe diff --git a/bin/recipes/dyes/grey.recipe b/files/recipes/dyes/grey.recipe similarity index 100% rename from bin/recipes/dyes/grey.recipe rename to files/recipes/dyes/grey.recipe diff --git a/bin/recipes/dyes/lightblue.recipe b/files/recipes/dyes/lightblue.recipe similarity index 100% rename from bin/recipes/dyes/lightblue.recipe rename to files/recipes/dyes/lightblue.recipe diff --git a/bin/recipes/dyes/lightgrey.recipe b/files/recipes/dyes/lightgrey.recipe similarity index 100% rename from bin/recipes/dyes/lightgrey.recipe rename to files/recipes/dyes/lightgrey.recipe diff --git a/bin/recipes/dyes/lime.recipe b/files/recipes/dyes/lime.recipe similarity index 100% rename from bin/recipes/dyes/lime.recipe rename to files/recipes/dyes/lime.recipe diff --git a/bin/recipes/dyes/magenta.recipe b/files/recipes/dyes/magenta.recipe similarity index 100% rename from bin/recipes/dyes/magenta.recipe rename to files/recipes/dyes/magenta.recipe diff --git a/bin/recipes/dyes/orange.recipe b/files/recipes/dyes/orange.recipe similarity index 100% rename from bin/recipes/dyes/orange.recipe rename to files/recipes/dyes/orange.recipe diff --git a/bin/recipes/dyes/pink.recipe b/files/recipes/dyes/pink.recipe similarity index 100% rename from bin/recipes/dyes/pink.recipe rename to files/recipes/dyes/pink.recipe diff --git a/bin/recipes/dyes/purple.recipe b/files/recipes/dyes/purple.recipe similarity index 100% rename from bin/recipes/dyes/purple.recipe rename to files/recipes/dyes/purple.recipe diff --git a/bin/recipes/dyes/red.recipe b/files/recipes/dyes/red.recipe similarity index 100% rename from bin/recipes/dyes/red.recipe rename to files/recipes/dyes/red.recipe diff --git a/bin/recipes/dyes/white.recipe b/files/recipes/dyes/white.recipe similarity index 100% rename from bin/recipes/dyes/white.recipe rename to files/recipes/dyes/white.recipe diff --git a/bin/recipes/dyes/yellow.recipe b/files/recipes/dyes/yellow.recipe similarity index 100% rename from bin/recipes/dyes/yellow.recipe rename to files/recipes/dyes/yellow.recipe diff --git a/bin/recipes/food/apple_golden.recipe b/files/recipes/food/apple_golden.recipe similarity index 100% rename from bin/recipes/food/apple_golden.recipe rename to files/recipes/food/apple_golden.recipe diff --git a/bin/recipes/food/bowls.recipe b/files/recipes/food/bowls.recipe similarity index 100% rename from bin/recipes/food/bowls.recipe rename to files/recipes/food/bowls.recipe diff --git a/bin/recipes/food/bread.recipe b/files/recipes/food/bread.recipe similarity index 100% rename from bin/recipes/food/bread.recipe rename to files/recipes/food/bread.recipe diff --git a/bin/recipes/food/cake.recipe b/files/recipes/food/cake.recipe similarity index 100% rename from bin/recipes/food/cake.recipe rename to files/recipes/food/cake.recipe diff --git a/bin/recipes/food/mushroomstew.recipe b/files/recipes/food/mushroomstew.recipe similarity index 100% rename from bin/recipes/food/mushroomstew.recipe rename to files/recipes/food/mushroomstew.recipe diff --git a/bin/recipes/food/sugar.recipe b/files/recipes/food/sugar.recipe similarity index 100% rename from bin/recipes/food/sugar.recipe rename to files/recipes/food/sugar.recipe diff --git a/bin/recipes/materials/block_brick.recipe b/files/recipes/materials/block_brick.recipe similarity index 100% rename from bin/recipes/materials/block_brick.recipe rename to files/recipes/materials/block_brick.recipe diff --git a/bin/recipes/materials/block_clay.recipe b/files/recipes/materials/block_clay.recipe similarity index 100% rename from bin/recipes/materials/block_clay.recipe rename to files/recipes/materials/block_clay.recipe diff --git a/bin/recipes/materials/block_diamond.recipe b/files/recipes/materials/block_diamond.recipe similarity index 100% rename from bin/recipes/materials/block_diamond.recipe rename to files/recipes/materials/block_diamond.recipe diff --git a/bin/recipes/materials/block_glowstone.recipe b/files/recipes/materials/block_glowstone.recipe similarity index 100% rename from bin/recipes/materials/block_glowstone.recipe rename to files/recipes/materials/block_glowstone.recipe diff --git a/bin/recipes/materials/block_gold.recipe b/files/recipes/materials/block_gold.recipe similarity index 100% rename from bin/recipes/materials/block_gold.recipe rename to files/recipes/materials/block_gold.recipe diff --git a/bin/recipes/materials/block_iron.recipe b/files/recipes/materials/block_iron.recipe similarity index 100% rename from bin/recipes/materials/block_iron.recipe rename to files/recipes/materials/block_iron.recipe diff --git a/bin/recipes/materials/block_sandstone.recipe b/files/recipes/materials/block_sandstone.recipe similarity index 100% rename from bin/recipes/materials/block_sandstone.recipe rename to files/recipes/materials/block_sandstone.recipe diff --git a/bin/recipes/materials/block_snow.recipe b/files/recipes/materials/block_snow.recipe similarity index 100% rename from bin/recipes/materials/block_snow.recipe rename to files/recipes/materials/block_snow.recipe diff --git a/bin/recipes/materials/block_wool.recipe b/files/recipes/materials/block_wool.recipe similarity index 100% rename from bin/recipes/materials/block_wool.recipe rename to files/recipes/materials/block_wool.recipe diff --git a/bin/recipes/materials/clay.recipe b/files/recipes/materials/clay.recipe similarity index 100% rename from bin/recipes/materials/clay.recipe rename to files/recipes/materials/clay.recipe diff --git a/bin/recipes/materials/ingots_diamond.recipe b/files/recipes/materials/ingots_diamond.recipe similarity index 100% rename from bin/recipes/materials/ingots_diamond.recipe rename to files/recipes/materials/ingots_diamond.recipe diff --git a/bin/recipes/materials/ingots_gold.recipe b/files/recipes/materials/ingots_gold.recipe similarity index 100% rename from bin/recipes/materials/ingots_gold.recipe rename to files/recipes/materials/ingots_gold.recipe diff --git a/bin/recipes/materials/ingots_iron.recipe b/files/recipes/materials/ingots_iron.recipe similarity index 100% rename from bin/recipes/materials/ingots_iron.recipe rename to files/recipes/materials/ingots_iron.recipe diff --git a/bin/recipes/materials/sticks.recipe b/files/recipes/materials/sticks.recipe similarity index 100% rename from bin/recipes/materials/sticks.recipe rename to files/recipes/materials/sticks.recipe diff --git a/bin/recipes/materials/tnt.recipe b/files/recipes/materials/tnt.recipe similarity index 100% rename from bin/recipes/materials/tnt.recipe rename to files/recipes/materials/tnt.recipe diff --git a/bin/recipes/materials/wood.recipe b/files/recipes/materials/wood.recipe similarity index 100% rename from bin/recipes/materials/wood.recipe rename to files/recipes/materials/wood.recipe diff --git a/bin/recipes/mechanism/button_stone.recipe b/files/recipes/mechanism/button_stone.recipe similarity index 100% rename from bin/recipes/mechanism/button_stone.recipe rename to files/recipes/mechanism/button_stone.recipe diff --git a/bin/recipes/mechanism/dispenser.recipe b/files/recipes/mechanism/dispenser.recipe similarity index 100% rename from bin/recipes/mechanism/dispenser.recipe rename to files/recipes/mechanism/dispenser.recipe diff --git a/bin/recipes/mechanism/door_iron.recipe b/files/recipes/mechanism/door_iron.recipe similarity index 100% rename from bin/recipes/mechanism/door_iron.recipe rename to files/recipes/mechanism/door_iron.recipe diff --git a/bin/recipes/mechanism/door_wood.recipe b/files/recipes/mechanism/door_wood.recipe similarity index 100% rename from bin/recipes/mechanism/door_wood.recipe rename to files/recipes/mechanism/door_wood.recipe diff --git a/bin/recipes/mechanism/lever.recipe b/files/recipes/mechanism/lever.recipe similarity index 100% rename from bin/recipes/mechanism/lever.recipe rename to files/recipes/mechanism/lever.recipe diff --git a/bin/recipes/mechanism/note_block.recipe b/files/recipes/mechanism/note_block.recipe similarity index 100% rename from bin/recipes/mechanism/note_block.recipe rename to files/recipes/mechanism/note_block.recipe diff --git a/bin/recipes/mechanism/pressure_stone.recipe b/files/recipes/mechanism/pressure_stone.recipe similarity index 100% rename from bin/recipes/mechanism/pressure_stone.recipe rename to files/recipes/mechanism/pressure_stone.recipe diff --git a/bin/recipes/mechanism/pressure_wood.recipe b/files/recipes/mechanism/pressure_wood.recipe similarity index 100% rename from bin/recipes/mechanism/pressure_wood.recipe rename to files/recipes/mechanism/pressure_wood.recipe diff --git a/bin/recipes/mechanism/torch_redstone.recipe b/files/recipes/mechanism/torch_redstone.recipe similarity index 100% rename from bin/recipes/mechanism/torch_redstone.recipe rename to files/recipes/mechanism/torch_redstone.recipe diff --git a/bin/recipes/misc/bed.recipe b/files/recipes/misc/bed.recipe similarity index 100% rename from bin/recipes/misc/bed.recipe rename to files/recipes/misc/bed.recipe diff --git a/bin/recipes/misc/book.recipe b/files/recipes/misc/book.recipe similarity index 100% rename from bin/recipes/misc/book.recipe rename to files/recipes/misc/book.recipe diff --git a/bin/recipes/misc/bookshelf.recipe b/files/recipes/misc/bookshelf.recipe similarity index 100% rename from bin/recipes/misc/bookshelf.recipe rename to files/recipes/misc/bookshelf.recipe diff --git a/bin/recipes/misc/chest.recipe b/files/recipes/misc/chest.recipe similarity index 100% rename from bin/recipes/misc/chest.recipe rename to files/recipes/misc/chest.recipe diff --git a/bin/recipes/misc/fence.recipe b/files/recipes/misc/fence.recipe similarity index 100% rename from bin/recipes/misc/fence.recipe rename to files/recipes/misc/fence.recipe diff --git a/bin/recipes/misc/furnace.recipe b/files/recipes/misc/furnace.recipe similarity index 100% rename from bin/recipes/misc/furnace.recipe rename to files/recipes/misc/furnace.recipe diff --git a/bin/recipes/misc/jackolantern.recipe b/files/recipes/misc/jackolantern.recipe similarity index 100% rename from bin/recipes/misc/jackolantern.recipe rename to files/recipes/misc/jackolantern.recipe diff --git a/bin/recipes/misc/jukebox.recipe b/files/recipes/misc/jukebox.recipe similarity index 100% rename from bin/recipes/misc/jukebox.recipe rename to files/recipes/misc/jukebox.recipe diff --git a/bin/recipes/misc/ladder.recipe b/files/recipes/misc/ladder.recipe similarity index 100% rename from bin/recipes/misc/ladder.recipe rename to files/recipes/misc/ladder.recipe diff --git a/bin/recipes/misc/painting.recipe b/files/recipes/misc/painting.recipe similarity index 100% rename from bin/recipes/misc/painting.recipe rename to files/recipes/misc/painting.recipe diff --git a/bin/recipes/misc/paper.recipe b/files/recipes/misc/paper.recipe similarity index 100% rename from bin/recipes/misc/paper.recipe rename to files/recipes/misc/paper.recipe diff --git a/bin/recipes/misc/sign.recipe b/files/recipes/misc/sign.recipe similarity index 100% rename from bin/recipes/misc/sign.recipe rename to files/recipes/misc/sign.recipe diff --git a/bin/recipes/misc/stairs_stone.recipe b/files/recipes/misc/stairs_stone.recipe similarity index 100% rename from bin/recipes/misc/stairs_stone.recipe rename to files/recipes/misc/stairs_stone.recipe diff --git a/bin/recipes/misc/stairs_wood.recipe b/files/recipes/misc/stairs_wood.recipe similarity index 100% rename from bin/recipes/misc/stairs_wood.recipe rename to files/recipes/misc/stairs_wood.recipe diff --git a/bin/recipes/misc/torch.recipe b/files/recipes/misc/torch.recipe similarity index 100% rename from bin/recipes/misc/torch.recipe rename to files/recipes/misc/torch.recipe diff --git a/bin/recipes/misc/workbench.recipe b/files/recipes/misc/workbench.recipe similarity index 100% rename from bin/recipes/misc/workbench.recipe rename to files/recipes/misc/workbench.recipe diff --git a/bin/recipes/tools/axe_diamond.recipe b/files/recipes/tools/axe_diamond.recipe similarity index 100% rename from bin/recipes/tools/axe_diamond.recipe rename to files/recipes/tools/axe_diamond.recipe diff --git a/bin/recipes/tools/axe_gold.recipe b/files/recipes/tools/axe_gold.recipe similarity index 100% rename from bin/recipes/tools/axe_gold.recipe rename to files/recipes/tools/axe_gold.recipe diff --git a/bin/recipes/tools/axe_iron.recipe b/files/recipes/tools/axe_iron.recipe similarity index 100% rename from bin/recipes/tools/axe_iron.recipe rename to files/recipes/tools/axe_iron.recipe diff --git a/bin/recipes/tools/axe_stone.recipe b/files/recipes/tools/axe_stone.recipe similarity index 100% rename from bin/recipes/tools/axe_stone.recipe rename to files/recipes/tools/axe_stone.recipe diff --git a/bin/recipes/tools/axe_wood.recipe b/files/recipes/tools/axe_wood.recipe similarity index 100% rename from bin/recipes/tools/axe_wood.recipe rename to files/recipes/tools/axe_wood.recipe diff --git a/bin/recipes/tools/bucket.recipe b/files/recipes/tools/bucket.recipe similarity index 100% rename from bin/recipes/tools/bucket.recipe rename to files/recipes/tools/bucket.recipe diff --git a/bin/recipes/tools/clock.recipe b/files/recipes/tools/clock.recipe similarity index 100% rename from bin/recipes/tools/clock.recipe rename to files/recipes/tools/clock.recipe diff --git a/bin/recipes/tools/compass.recipe b/files/recipes/tools/compass.recipe similarity index 100% rename from bin/recipes/tools/compass.recipe rename to files/recipes/tools/compass.recipe diff --git a/bin/recipes/tools/fishingrod.recipe b/files/recipes/tools/fishingrod.recipe similarity index 100% rename from bin/recipes/tools/fishingrod.recipe rename to files/recipes/tools/fishingrod.recipe diff --git a/bin/recipes/tools/flintsteel.recipe b/files/recipes/tools/flintsteel.recipe similarity index 100% rename from bin/recipes/tools/flintsteel.recipe rename to files/recipes/tools/flintsteel.recipe diff --git a/bin/recipes/tools/hoe_diamond.recipe b/files/recipes/tools/hoe_diamond.recipe similarity index 100% rename from bin/recipes/tools/hoe_diamond.recipe rename to files/recipes/tools/hoe_diamond.recipe diff --git a/bin/recipes/tools/hoe_gold.recipe b/files/recipes/tools/hoe_gold.recipe similarity index 100% rename from bin/recipes/tools/hoe_gold.recipe rename to files/recipes/tools/hoe_gold.recipe diff --git a/bin/recipes/tools/hoe_iron.recipe b/files/recipes/tools/hoe_iron.recipe similarity index 100% rename from bin/recipes/tools/hoe_iron.recipe rename to files/recipes/tools/hoe_iron.recipe diff --git a/bin/recipes/tools/hoe_stone.recipe b/files/recipes/tools/hoe_stone.recipe similarity index 100% rename from bin/recipes/tools/hoe_stone.recipe rename to files/recipes/tools/hoe_stone.recipe diff --git a/bin/recipes/tools/hoe_wood.recipe b/files/recipes/tools/hoe_wood.recipe similarity index 100% rename from bin/recipes/tools/hoe_wood.recipe rename to files/recipes/tools/hoe_wood.recipe diff --git a/bin/recipes/tools/pickaxe_diamond.recipe b/files/recipes/tools/pickaxe_diamond.recipe similarity index 100% rename from bin/recipes/tools/pickaxe_diamond.recipe rename to files/recipes/tools/pickaxe_diamond.recipe diff --git a/bin/recipes/tools/pickaxe_gold.recipe b/files/recipes/tools/pickaxe_gold.recipe similarity index 100% rename from bin/recipes/tools/pickaxe_gold.recipe rename to files/recipes/tools/pickaxe_gold.recipe diff --git a/bin/recipes/tools/pickaxe_iron.recipe b/files/recipes/tools/pickaxe_iron.recipe similarity index 100% rename from bin/recipes/tools/pickaxe_iron.recipe rename to files/recipes/tools/pickaxe_iron.recipe diff --git a/bin/recipes/tools/pickaxe_stone.recipe b/files/recipes/tools/pickaxe_stone.recipe similarity index 100% rename from bin/recipes/tools/pickaxe_stone.recipe rename to files/recipes/tools/pickaxe_stone.recipe diff --git a/bin/recipes/tools/pickaxe_wood.recipe b/files/recipes/tools/pickaxe_wood.recipe similarity index 100% rename from bin/recipes/tools/pickaxe_wood.recipe rename to files/recipes/tools/pickaxe_wood.recipe diff --git a/bin/recipes/tools/shovel_diamond.recipe b/files/recipes/tools/shovel_diamond.recipe similarity index 100% rename from bin/recipes/tools/shovel_diamond.recipe rename to files/recipes/tools/shovel_diamond.recipe diff --git a/bin/recipes/tools/shovel_gold.recipe b/files/recipes/tools/shovel_gold.recipe similarity index 100% rename from bin/recipes/tools/shovel_gold.recipe rename to files/recipes/tools/shovel_gold.recipe diff --git a/bin/recipes/tools/shovel_iron.recipe b/files/recipes/tools/shovel_iron.recipe similarity index 100% rename from bin/recipes/tools/shovel_iron.recipe rename to files/recipes/tools/shovel_iron.recipe diff --git a/bin/recipes/tools/shovel_stone.recipe b/files/recipes/tools/shovel_stone.recipe similarity index 100% rename from bin/recipes/tools/shovel_stone.recipe rename to files/recipes/tools/shovel_stone.recipe diff --git a/bin/recipes/tools/shovel_wood.recipe b/files/recipes/tools/shovel_wood.recipe similarity index 100% rename from bin/recipes/tools/shovel_wood.recipe rename to files/recipes/tools/shovel_wood.recipe diff --git a/bin/recipes/transport/boat.recipe b/files/recipes/transport/boat.recipe similarity index 100% rename from bin/recipes/transport/boat.recipe rename to files/recipes/transport/boat.recipe diff --git a/bin/recipes/transport/minecart.recipe b/files/recipes/transport/minecart.recipe similarity index 100% rename from bin/recipes/transport/minecart.recipe rename to files/recipes/transport/minecart.recipe diff --git a/bin/recipes/transport/minecart_powered.recipe b/files/recipes/transport/minecart_powered.recipe similarity index 100% rename from bin/recipes/transport/minecart_powered.recipe rename to files/recipes/transport/minecart_powered.recipe diff --git a/bin/recipes/transport/minecart_storage.recipe b/files/recipes/transport/minecart_storage.recipe similarity index 100% rename from bin/recipes/transport/minecart_storage.recipe rename to files/recipes/transport/minecart_storage.recipe diff --git a/bin/recipes/transport/minecart_tracks.recipe b/files/recipes/transport/minecart_tracks.recipe similarity index 100% rename from bin/recipes/transport/minecart_tracks.recipe rename to files/recipes/transport/minecart_tracks.recipe diff --git a/bin/recipes/weapons/arrows.recipe b/files/recipes/weapons/arrows.recipe similarity index 100% rename from bin/recipes/weapons/arrows.recipe rename to files/recipes/weapons/arrows.recipe diff --git a/bin/recipes/weapons/bow.recipe b/files/recipes/weapons/bow.recipe similarity index 100% rename from bin/recipes/weapons/bow.recipe rename to files/recipes/weapons/bow.recipe diff --git a/bin/recipes/weapons/sword_diamond.recipe b/files/recipes/weapons/sword_diamond.recipe similarity index 100% rename from bin/recipes/weapons/sword_diamond.recipe rename to files/recipes/weapons/sword_diamond.recipe diff --git a/bin/recipes/weapons/sword_gold.recipe b/files/recipes/weapons/sword_gold.recipe similarity index 100% rename from bin/recipes/weapons/sword_gold.recipe rename to files/recipes/weapons/sword_gold.recipe diff --git a/bin/recipes/weapons/sword_iron.recipe b/files/recipes/weapons/sword_iron.recipe similarity index 100% rename from bin/recipes/weapons/sword_iron.recipe rename to files/recipes/weapons/sword_iron.recipe diff --git a/bin/recipes/weapons/sword_stone.recipe b/files/recipes/weapons/sword_stone.recipe similarity index 100% rename from bin/recipes/weapons/sword_stone.recipe rename to files/recipes/weapons/sword_stone.recipe diff --git a/bin/recipes/weapons/sword_wood.recipe b/files/recipes/weapons/sword_wood.recipe similarity index 100% rename from bin/recipes/weapons/sword_wood.recipe rename to files/recipes/weapons/sword_wood.recipe diff --git a/bin/recipes/white.recipe b/files/recipes/white.recipe similarity index 100% rename from bin/recipes/white.recipe rename to files/recipes/white.recipe diff --git a/bin/roles.txt b/files/roles.txt similarity index 100% rename from bin/roles.txt rename to files/roles.txt diff --git a/bin/rules.txt b/files/rules.txt similarity index 100% rename from bin/rules.txt rename to files/rules.txt diff --git a/bin/whitelist.txt b/files/whitelist.txt similarity index 100% rename from bin/whitelist.txt rename to files/whitelist.txt diff --git a/plugins/plugins.mk b/plugins/plugins.mk index 6356da7f..16c37f64 100644 --- a/plugins/plugins.mk +++ b/plugins/plugins.mk @@ -4,7 +4,8 @@ OBJS = $(SRCS:.cpp=.o) all: $(OBJS) $(PLUGIN_NAME).so -install: +install: $(OBJS) $(PLUGIN_NAME).so + mkdir -p ../../bin/ cp $(PLUGIN_NAME).so ../../bin/$(PLUGIN_NAME).so $(OBJS): diff --git a/src/Makefile b/src/Makefile index cb4576b8..76bbb489 100644 --- a/src/Makefile +++ b/src/Makefile @@ -42,7 +42,8 @@ all: mineserver mineserver: $(OBJS) $(CXX) $(CXXFLAGS) $(BUILDFLAGS) $(ARCHFLAGS) $(LDFLAGS) $(OBJS) $(LIBRARIES) -o $@ -install: +install: mineserver + mkdir -p ../bin/ cp mineserver ../bin clean: