diff --git a/Nail Redux/DIM-1/data/raids.dat b/Nail Redux/DIM-1/data/raids.dat index 32c388c..640aa64 100644 Binary files a/Nail Redux/DIM-1/data/raids.dat and b/Nail Redux/DIM-1/data/raids.dat differ diff --git a/Nail Redux/DIM1/data/raids_end.dat b/Nail Redux/DIM1/data/raids_end.dat index 32c388c..640aa64 100644 Binary files a/Nail Redux/DIM1/data/raids_end.dat and b/Nail Redux/DIM1/data/raids_end.dat differ diff --git a/Nail Redux/advancements/b368187a-2842-4ded-b329-846d6251ac6d.json b/Nail Redux/advancements/b368187a-2842-4ded-b329-846d6251ac6d.json index 2b02d11..9eed5ac 100644 --- a/Nail Redux/advancements/b368187a-2842-4ded-b329-846d6251ac6d.json +++ b/Nail Redux/advancements/b368187a-2842-4ded-b329-846d6251ac6d.json @@ -1,10 +1,28 @@ { + "minecraft:recipes/misc/magenta_dye_from_blue_red_white_dye": { + "criteria": { + "has_white_dye": "2021-10-25 23:14:38 +0530" + }, + "done": true + }, "minecraft:recipes/redstone/oak_fence_gate": { "criteria": { "has_planks": "2021-10-25 11:07:58 +0530" }, "done": true }, + "minecraft:recipes/misc/pink_dye_from_red_white_dye": { + "criteria": { + "has_white_dye": "2021-10-25 23:14:38 +0530" + }, + "done": true + }, + "minecraft:recipes/redstone/tnt": { + "criteria": { + "has_gunpowder": "2021-10-25 23:24:49 +0530" + }, + "done": true + }, "minecraft:recipes/building_blocks/quartz_pillar": { "criteria": { "has_quartz_pillar": "2021-10-25 11:18:10 +0530" @@ -53,18 +71,42 @@ }, "done": true }, + "minecraft:recipes/decorations/yellow_stained_glass_pane_from_glass_pane": { + "criteria": { + "has_yellow_dye": "2021-10-25 23:14:56 +0530" + }, + "done": true + }, + "minecraft:recipes/building_blocks/chiseled_stone_bricks": { + "criteria": { + "has_stone_bricks": "2021-10-25 22:55:52 +0530" + }, + "done": true + }, "minecraft:recipes/redstone/target": { "criteria": { "has_redstone": "2021-10-25 11:02:49 +0530" }, "done": true }, + "minecraft:recipes/building_blocks/stone_brick_slab_from_stone_bricks_stonecutting": { + "criteria": { + "has_stone_bricks": "2021-10-25 22:55:52 +0530" + }, + "done": true + }, "minecraft:recipes/building_blocks/crimson_hyphae": { "criteria": { "has_log": "2021-10-25 19:44:08 +0530" }, "done": true }, + "minecraft:recipes/decorations/stone_brick_wall_from_stone_bricks_stonecutting": { + "criteria": { + "has_stone_bricks": "2021-10-25 22:55:52 +0530" + }, + "done": true + }, "minecraft:recipes/decorations/stonecutter": { "criteria": { "has_stone": "2021-10-25 11:33:11 +0530" @@ -77,6 +119,12 @@ }, "done": true }, + "minecraft:recipes/misc/gray_dye": { + "criteria": { + "has_white_dye": "2021-10-25 23:14:38 +0530" + }, + "done": true + }, "minecraft:recipes/decorations/crafting_table": { "criteria": { "has_planks": "2021-10-25 11:07:58 +0530" @@ -95,6 +143,12 @@ }, "done": true }, + "minecraft:recipes/building_blocks/chiseled_stone_bricks_from_stone_bricks_stonecutting": { + "criteria": { + "has_stone_bricks": "2021-10-25 22:55:52 +0530" + }, + "done": true + }, "minecraft:recipes/building_blocks/smooth_stone": { "criteria": { "has_stone": "2021-10-25 11:33:11 +0530" @@ -107,6 +161,12 @@ }, "done": true }, + "minecraft:recipes/building_blocks/stone_brick_slab": { + "criteria": { + "has_stone_bricks": "2021-10-25 22:55:52 +0530" + }, + "done": true + }, "minecraft:recipes/transportation/birch_boat": { "criteria": { "in_water": "2021-10-25 10:58:07 +0530" @@ -215,6 +275,12 @@ }, "done": true }, + "minecraft:recipes/building_blocks/cracked_stone_bricks": { + "criteria": { + "has_stone_bricks": "2021-10-25 22:55:52 +0530" + }, + "done": true + }, "minecraft:recipes/decorations/stone_brick_walls_from_stone_stonecutting": { "criteria": { "has_stone": "2021-10-25 11:33:11 +0530" @@ -245,6 +311,12 @@ }, "done": true }, + "minecraft:recipes/misc/light_gray_dye_from_gray_white_dye": { + "criteria": { + "has_white_dye": "2021-10-25 23:14:38 +0530" + }, + "done": true + }, "minecraft:recipes/redstone/redstone_block": { "criteria": { "has_redstone": "2021-10-25 11:02:49 +0530" @@ -263,6 +335,12 @@ }, "done": true }, + "minecraft:recipes/decorations/stone_brick_wall": { + "criteria": { + "has_stone_bricks": "2021-10-25 22:55:52 +0530" + }, + "done": true + }, "minecraft:recipes/building_blocks/stone_stairs": { "criteria": { "has_stone": "2021-10-25 11:33:11 +0530" @@ -281,12 +359,36 @@ }, "done": true }, + "minecraft:recipes/decorations/white_stained_glass_pane_from_glass_pane": { + "criteria": { + "has_white_dye": "2021-10-25 23:14:38 +0530" + }, + "done": true + }, + "minecraft:recipes/building_blocks/stone_brick_stairs_from_stone_bricks_stonecutting": { + "criteria": { + "has_stone_bricks": "2021-10-25 22:55:52 +0530" + }, + "done": true + }, + "minecraft:recipes/decorations/yellow_carpet_from_white_carpet": { + "criteria": { + "has_yellow_dye": "2021-10-25 23:14:56 +0530" + }, + "done": true + }, "minecraft:recipes/redstone/note_block": { "criteria": { "has_redstone": "2021-10-25 11:02:49 +0530" }, "done": true }, + "minecraft:recipes/misc/light_blue_dye_from_blue_white_dye": { + "criteria": { + "has_white_dye": "2021-10-25 23:14:38 +0530" + }, + "done": true + }, "minecraft:recipes/building_blocks/polished_blackstone_brick_stairs_from_polished_blackstone_bricks_stonecutting": { "criteria": { "has_polished_blackstone_bricks": "2021-10-25 10:51:01 +0530" @@ -323,6 +425,12 @@ }, "done": true }, + "minecraft:recipes/misc/orange_dye_from_red_yellow": { + "criteria": { + "has_yellow_dye": "2021-10-25 23:14:56 +0530" + }, + "done": true + }, "minecraft:recipes/decorations/oak_sign": { "criteria": { "has_oak_planks": "2021-10-25 11:07:58 +0530" @@ -341,5 +449,23 @@ }, "done": true }, + "minecraft:recipes/misc/lime_dye": { + "criteria": { + "has_white_dye": "2021-10-25 23:14:38 +0530" + }, + "done": true + }, + "minecraft:recipes/misc/light_gray_dye_from_black_white_dye": { + "criteria": { + "has_white_dye": "2021-10-25 23:14:38 +0530" + }, + "done": true + }, + "minecraft:recipes/building_blocks/stone_brick_stairs": { + "criteria": { + "has_stone_bricks": "2021-10-25 22:55:52 +0530" + }, + "done": true + }, "DataVersion": 2586 } \ No newline at end of file diff --git a/Nail Redux/data/raids.dat b/Nail Redux/data/raids.dat index 51c4e20..79d144a 100644 Binary files a/Nail Redux/data/raids.dat and b/Nail Redux/data/raids.dat differ diff --git a/Nail Redux/data/scoreboard.dat b/Nail Redux/data/scoreboard.dat index 90d1720..54b9758 100644 Binary files a/Nail Redux/data/scoreboard.dat and b/Nail Redux/data/scoreboard.dat differ diff --git a/Nail Redux/datapacks/Hammer/data/hammer/functions/gamerulereset.mcfunction b/Nail Redux/datapacks/Hammer/data/hammer/functions/gamerulereset.mcfunction index 3ae5511..e3e46f0 100644 --- a/Nail Redux/datapacks/Hammer/data/hammer/functions/gamerulereset.mcfunction +++ b/Nail Redux/datapacks/Hammer/data/hammer/functions/gamerulereset.mcfunction @@ -4,6 +4,8 @@ gamerule doMobLoot true gamerule doMobSpawning false difficulty peaceful gamerule doTileDrops true -gamerule keepInventory false +gamerule keepInventory true gamerule mobGriefing true +team modify def friendlyFire false +team modify inv friendlyFire false tellraw @a ["",{"text":"[NAIL]","color":"green"},{"text":" Gamerules Reset"}] \ No newline at end of file diff --git a/Nail Redux/datapacks/Hammer/data/hammer/functions/regen.mcfunction b/Nail Redux/datapacks/Hammer/data/hammer/functions/regen.mcfunction new file mode 100644 index 0000000..a0f34c9 --- /dev/null +++ b/Nail Redux/datapacks/Hammer/data/hammer/functions/regen.mcfunction @@ -0,0 +1,15 @@ +setblock 11 36 -21 structure_block{mode: "LOAD", name: "hammer:redux1", ignoreEntities: false} destroy +setblock 58 36 -21 structure_block{mode: "LOAD", name: "hammer:redux2", ignoreEntities: false} destroy +setblock 105 36 -21 structure_block{mode: "LOAD", name: "hammer:redux3", ignoreEntities: false} destroy +setblock 152 36 -21 structure_block{mode: "LOAD", name: "hammer:redux4", ignoreEntities: false} destroy +setblock 199 36 -21 structure_block{mode: "LOAD", name: "hammer:redux5", ignoreEntities: false} destroy +setblock 11 37 -21 redstone_block +setblock 58 37 -21 redstone_block +setblock 105 37 -21 redstone_block +setblock 152 37 -21 redstone_block +setblock 199 37 -21 redstone_block +setblock 11 37 -21 air +setblock 58 37 -21 air +setblock 105 37 -21 air +setblock 152 37 -21 air +setblock 199 37 -21 air \ No newline at end of file diff --git a/Nail Redux/datapacks/Hammer/data/hammer/functions/reset.mcfunction b/Nail Redux/datapacks/Hammer/data/hammer/functions/reset.mcfunction new file mode 100644 index 0000000..47b7ff0 --- /dev/null +++ b/Nail Redux/datapacks/Hammer/data/hammer/functions/reset.mcfunction @@ -0,0 +1,12 @@ +team leave @a +spawnpoint @a 0 61 0 +gamemode survival @a +kill @a +function hammer:gamerulereset +function hammer:regen +scoreboard players set @e[type=minecraft:armor_stand] Timer 1200 +scoreboard players set Timer Game 1200 +scoreboard objectives setdisplay sidebar +setblock 19 53 1 redstone_block +fill 16 60 -4 16 60 3 blue_concrete +fill 14 60 -4 14 60 3 red_concrete diff --git a/Nail Redux/datapacks/Hammer/data/hammer/structures/redux1.nbt b/Nail Redux/datapacks/Hammer/data/hammer/structures/redux1.nbt new file mode 100644 index 0000000..038fa3d Binary files /dev/null and b/Nail Redux/datapacks/Hammer/data/hammer/structures/redux1.nbt differ diff --git a/Nail Redux/datapacks/Hammer/data/hammer/structures/redux2.nbt b/Nail Redux/datapacks/Hammer/data/hammer/structures/redux2.nbt new file mode 100644 index 0000000..916a6ec Binary files /dev/null and b/Nail Redux/datapacks/Hammer/data/hammer/structures/redux2.nbt differ diff --git a/Nail Redux/datapacks/Hammer/data/hammer/structures/redux3.nbt b/Nail Redux/datapacks/Hammer/data/hammer/structures/redux3.nbt new file mode 100644 index 0000000..e1594a8 Binary files /dev/null and b/Nail Redux/datapacks/Hammer/data/hammer/structures/redux3.nbt differ diff --git a/Nail Redux/datapacks/Hammer/data/hammer/structures/redux4.nbt b/Nail Redux/datapacks/Hammer/data/hammer/structures/redux4.nbt new file mode 100644 index 0000000..0c8bf1a Binary files /dev/null and b/Nail Redux/datapacks/Hammer/data/hammer/structures/redux4.nbt differ diff --git a/Nail Redux/datapacks/Hammer/data/hammer/structures/redux5.nbt b/Nail Redux/datapacks/Hammer/data/hammer/structures/redux5.nbt new file mode 100644 index 0000000..c75dbcc Binary files /dev/null and b/Nail Redux/datapacks/Hammer/data/hammer/structures/redux5.nbt differ diff --git a/Nail Redux/generated/hammer/structures/redux1.nbt b/Nail Redux/generated/hammer/structures/redux1.nbt new file mode 100644 index 0000000..038fa3d Binary files /dev/null and b/Nail Redux/generated/hammer/structures/redux1.nbt differ diff --git a/Nail Redux/generated/hammer/structures/redux2.nbt b/Nail Redux/generated/hammer/structures/redux2.nbt new file mode 100644 index 0000000..916a6ec Binary files /dev/null and b/Nail Redux/generated/hammer/structures/redux2.nbt differ diff --git a/Nail Redux/generated/hammer/structures/redux3.nbt b/Nail Redux/generated/hammer/structures/redux3.nbt new file mode 100644 index 0000000..e1594a8 Binary files /dev/null and b/Nail Redux/generated/hammer/structures/redux3.nbt differ diff --git a/Nail Redux/generated/hammer/structures/redux4.nbt b/Nail Redux/generated/hammer/structures/redux4.nbt new file mode 100644 index 0000000..0c8bf1a Binary files /dev/null and b/Nail Redux/generated/hammer/structures/redux4.nbt differ diff --git a/Nail Redux/generated/hammer/structures/redux5.nbt b/Nail Redux/generated/hammer/structures/redux5.nbt new file mode 100644 index 0000000..c75dbcc Binary files /dev/null and b/Nail Redux/generated/hammer/structures/redux5.nbt differ diff --git a/Nail Redux/level.dat b/Nail Redux/level.dat index eadab09..62d713f 100644 Binary files a/Nail Redux/level.dat and b/Nail Redux/level.dat differ diff --git a/Nail Redux/level.dat_old b/Nail Redux/level.dat_old index 7c96ab0..998cb1b 100644 Binary files a/Nail Redux/level.dat_old and b/Nail Redux/level.dat_old differ diff --git a/Nail Redux/playerdata/b368187a-2842-4ded-b329-846d6251ac6d.dat b/Nail Redux/playerdata/b368187a-2842-4ded-b329-846d6251ac6d.dat index 04b502a..6dd3484 100644 Binary files a/Nail Redux/playerdata/b368187a-2842-4ded-b329-846d6251ac6d.dat and b/Nail Redux/playerdata/b368187a-2842-4ded-b329-846d6251ac6d.dat differ diff --git a/Nail Redux/playerdata/b368187a-2842-4ded-b329-846d6251ac6d.dat_old b/Nail Redux/playerdata/b368187a-2842-4ded-b329-846d6251ac6d.dat_old index 04b502a..6dd3484 100644 Binary files a/Nail Redux/playerdata/b368187a-2842-4ded-b329-846d6251ac6d.dat_old and b/Nail Redux/playerdata/b368187a-2842-4ded-b329-846d6251ac6d.dat_old differ diff --git a/Nail Redux/poi/r.0.-1.mca b/Nail Redux/poi/r.0.-1.mca index f9c500f..907b415 100644 Binary files a/Nail Redux/poi/r.0.-1.mca and b/Nail Redux/poi/r.0.-1.mca differ diff --git a/Nail Redux/poi/r.0.0.mca b/Nail Redux/poi/r.0.0.mca index 5d23965..9f4caaf 100644 Binary files a/Nail Redux/poi/r.0.0.mca and b/Nail Redux/poi/r.0.0.mca differ diff --git a/Nail Redux/region/r.-1.-1.mca b/Nail Redux/region/r.-1.-1.mca index 2e859a8..d67524d 100644 Binary files a/Nail Redux/region/r.-1.-1.mca and b/Nail Redux/region/r.-1.-1.mca differ diff --git a/Nail Redux/region/r.-1.0.mca b/Nail Redux/region/r.-1.0.mca index e3cfe11..a39408a 100644 Binary files a/Nail Redux/region/r.-1.0.mca and b/Nail Redux/region/r.-1.0.mca differ diff --git a/Nail Redux/region/r.0.-1.mca b/Nail Redux/region/r.0.-1.mca index 0ab9d29..b481ffd 100644 Binary files a/Nail Redux/region/r.0.-1.mca and b/Nail Redux/region/r.0.-1.mca differ diff --git a/Nail Redux/region/r.0.0.mca b/Nail Redux/region/r.0.0.mca index e55171d..5702e1c 100644 Binary files a/Nail Redux/region/r.0.0.mca and b/Nail Redux/region/r.0.0.mca differ diff --git a/Nail Redux/stats/b368187a-2842-4ded-b329-846d6251ac6d.json b/Nail Redux/stats/b368187a-2842-4ded-b329-846d6251ac6d.json index f9c8a83..a0e5fde 100644 --- a/Nail Redux/stats/b368187a-2842-4ded-b329-846d6251ac6d.json +++ b/Nail Redux/stats/b368187a-2842-4ded-b329-846d6251ac6d.json @@ -1 +1 @@ -{"stats":{"minecraft:custom":{"minecraft:time_since_rest":113226,"minecraft:sprint_one_cm":11062,"minecraft:damage_taken":280,"minecraft:walk_one_cm":86345,"minecraft:fly_one_cm":1060412,"minecraft:open_barrel":9,"minecraft:open_chest":8,"minecraft:play_one_minute":113342,"minecraft:crouch_one_cm":6033,"minecraft:open_shulker_box":4,"minecraft:deaths":1,"minecraft:sneak_time":6937,"minecraft:walk_under_water_one_cm":13671,"minecraft:jump":177,"minecraft:leave_game":3,"minecraft:time_since_death":113224,"minecraft:walk_on_water_one_cm":5837,"minecraft:climb_one_cm":2665},"minecraft:used":{"minecraft:crimson_stem":3,"minecraft:quartz_bricks":4,"minecraft:sea_lantern":14,"minecraft:crimson_button":1,"minecraft:lever":13,"minecraft:cobblestone_stairs":12,"minecraft:quartz_pillar":4,"minecraft:dropper":1,"minecraft:command_block":18,"minecraft:birch_slab":5,"minecraft:light_gray_concrete":133,"minecraft:red_concrete":17,"minecraft:spruce_slab":12,"minecraft:barrier":110,"minecraft:oak_planks":11,"minecraft:ladder":2,"minecraft:stone_button":10,"minecraft:stone":2,"minecraft:redstone_block":3,"minecraft:polished_blackstone_bricks":2,"minecraft:oak_leaves":2,"minecraft:bedrock":20,"minecraft:dirt":9,"minecraft:chain_command_block":8,"minecraft:chiseled_quartz_block":8,"minecraft:crimson_pressure_plate":1,"minecraft:gray_concrete":79,"minecraft:blue_concrete":16,"minecraft:cobweb":4},"minecraft:picked_up":{"minecraft:repeater":1,"minecraft:ladder":2,"minecraft:stone_button":3,"minecraft:redstone":10,"minecraft:oak_sign":14,"minecraft:redstone_torch":25}},"DataVersion":2586} \ No newline at end of file +{"stats":{"minecraft:used":{"minecraft:crimson_stem":3,"minecraft:quartz_bricks":4,"minecraft:crimson_button":1,"minecraft:sea_lantern":16,"minecraft:lever":13,"minecraft:cobblestone_stairs":12,"minecraft:quartz_pillar":4,"minecraft:dropper":1,"minecraft:command_block":23,"minecraft:birch_slab":5,"minecraft:light_gray_concrete":234,"minecraft:red_concrete":17,"minecraft:spruce_slab":12,"minecraft:dark_oak_sign":1,"minecraft:barrier":110,"minecraft:ladder":2,"minecraft:oak_planks":11,"minecraft:stone_button":20,"minecraft:stone":2,"minecraft:redstone_block":3,"minecraft:warped_sign":12,"minecraft:structure_block":6,"minecraft:stone_bricks":5,"minecraft:polished_blackstone_bricks":2,"minecraft:oak_leaves":2,"minecraft:bedrock":24,"minecraft:blue_carpet":29,"minecraft:polished_blackstone_pressure_plate":2,"minecraft:red_carpet":29,"minecraft:dirt":9,"minecraft:birch_sign":11,"minecraft:chain_command_block":8,"minecraft:chiseled_quartz_block":8,"minecraft:crimson_pressure_plate":1,"minecraft:painting":2,"minecraft:gray_concrete":182,"minecraft:blue_concrete":16,"minecraft:cobweb":4},"minecraft:dropped":{"minecraft:stone_bricks":1,"minecraft:structure_block":1},"minecraft:picked_up":{"minecraft:repeater":1,"minecraft:ladder":2,"minecraft:stone_button":6,"minecraft:redstone":10,"minecraft:red_carpet":1,"minecraft:oak_sign":14,"minecraft:painting":17,"minecraft:redstone_torch":25},"minecraft:custom":{"minecraft:time_since_rest":103,"minecraft:sprint_one_cm":16445,"minecraft:damage_taken":280,"minecraft:walk_one_cm":135985,"minecraft:drop":2,"minecraft:fly_one_cm":1649828,"minecraft:open_barrel":9,"minecraft:open_chest":11,"minecraft:play_one_minute":163128,"minecraft:crouch_one_cm":10841,"minecraft:open_shulker_box":4,"minecraft:deaths":6,"minecraft:sneak_time":10674,"minecraft:walk_under_water_one_cm":13671,"minecraft:jump":249,"minecraft:leave_game":7,"minecraft:time_since_death":102,"minecraft:walk_on_water_one_cm":5837,"minecraft:climb_one_cm":2665,"minecraft:fall_one_cm":269}},"DataVersion":2586} \ No newline at end of file