organised files, added some new things

src/functions/UHC_modules/events/normal.mcfunction

@@ -3,6 +3,7 @@ execute @s[tag=host,scores={settings_state=2,timer=11400}] ~~~ tellraw @a {"rawt
 execute @s[tag=host,scores={settings_state=2,timer=10800}] ~~~ tellraw @a {"rawtext":[{"text":"§ePVP will be turned on in §c1§e minute!"}]}
 execute @s[tag=host,scores={settings_state=2,timer=10200}] ~~~ tellraw @a {"rawtext":[{"text":"§ePVP has been turned on."}]}
 execute @s[tag=host,scores={settings_state=2,timer=10200}] ~~~ gamerule pvp true
+execute @a ~~~ enchant @s sharpness 2
 #heal
 execute @s[tag=host,scores={settings_state=2,settings_healing=1,timer=10800}] ~~~ effect @a saturation 1 255 true
 execute @s[tag=host,scores={settings_state=2,settings_healing=1,timer=10800}] ~~~ effect @a instant_health 1 255 true

src/functions/UHC_modules/loop.mcfunction

@@ -125,31 +125,27 @@ effect @a[tag=dead] weakness 1 255 true
 clear @a[tag=dead]
 
 execute @a[tag=host,scores={settings_state=2,timer=0..}] ~~~ scoreboard players remove @s spec_timeout 1
-execute @a[tag=host,scores={timer=0..,settings_state=2,spec_timeout=1..299}] ~~~ execute @a[tag=spec,rxm=-90,rx=-75] ~~~ tp @a[tag=dead] ^-0.5 ^ ^-1 facing ^-0.5 ^ ^1
-execute @a[tag=host,scores={timer=0..,settings_state=2,spec_timeout=1..299}] ~~~ execute @a[tag=spec,rxm=-74,rx=74] ~~~ tp @a[tag=dead] ^-0.5 ^0.5 ^-2 facing ^-0.5 ^0.5 ^1
-execute @a[tag=host,scores={timer=0..,settings_state=2,spec_timeout=1..299}] ~~~ execute @a[tag=spec,rxm=75,rx=90] ~~~ tp @a[tag=dead] ^-0.5 ^ ^-1 facing ^-0.5 ^ ^1
-execute @a[tag=host,scores={timer=0..,settings_state=2,spec_timeout=1..299}] ~~~ execute @a[tag=spec] ~~~ title @a[tag=dead] actionbar §lSpectating §e@s
-execute @a[tag=host,scores={timer=0..,settings_state=2,spec_timeout=..0}] ~~~ scoreboard players set @s spec_timeout 300
+execute @a[tag=host,scores={timer=1..,settings_state=2,spec_timeout=1..299}] ~~~ execute @a[tag=spec,rxm=-90,rx=-75] ~~~ tp @a[tag=dead] ^-0.5 ^ ^-1 facing ^-0.5 ^ ^1
+execute @a[tag=host,scores={timer=1..,settings_state=2,spec_timeout=1..299}] ~~~ execute @a[tag=spec,rxm=-74,rx=74] ~~~ tp @a[tag=dead] ^-0.5 ^0.5 ^-2 facing ^-0.5 ^0.5 ^1
+execute @a[tag=host,scores={timer=1..,settings_state=2,spec_timeout=1..299}] ~~~ execute @a[tag=spec,rxm=75,rx=90] ~~~ tp @a[tag=dead] ^-0.5 ^ ^-1 facing ^-0.5 ^ ^1
+execute @a[tag=host,scores={timer=1..,settings_state=2,spec_timeout=1..299}] ~~~ execute @a[tag=spec] ~~~ title @a[tag=dead] actionbar §lSpectating §e@s
+execute @a[tag=host,scores={timer=1..,settings_state=2,spec_timeout=..0}] ~~~ scoreboard players set @s spec_timeout 300
 
 #enchating stuff
-#melee
-enchant @s sharpness 2
 #pickaxe/axe/stuff
 enchant @s efficiency 2
 
 #removing ores/stones
 execute @a ~~~ fill ~7 90 ~7 ~-7 0 ~-7 iron_ore 0 replace lapis_ore
-execute @a ~~~ fill ~7 90 ~7 ~-7 0 ~-7 iron_ore 0 replace coal_ore
-execute @a ~~~ fill ~7 150 ~7 ~-7 90 ~-7 iron_ore 0 replace coal_ore
 execute @a ~~~ fill ~7 90 ~7 ~-7 0 ~-7 diamond_ore 0 replace redstone_ore
 execute @a ~~~ fill ~7 90 ~7 ~-7 0 ~-7 diamond_ore 0 replace emerald_ore
 execute @a ~~~ fill ~7 90 ~7 ~-7 0 ~-7 diamond_ore 0 replace gold_ore
-execute @a ~~~ fill ~7 90 ~7 ~-7 0 ~-7 stone 0 replace stone 1
-execute @a ~~~ fill ~7 90 ~7 ~-7 0 ~-7 stone 0 replace stone 3
-execute @a ~~~ fill ~7 90 ~7 ~-7 0 ~-7 stone 0 replace stone 5
-execute @a ~~~ fill ~7 150 ~7 ~-7 90 ~-7 stone 0 replace stone 1
-execute @a ~~~ fill ~7 150 ~7 ~-7 90 ~-7 stone 0 replace stone 3
-execute @a ~~~ fill ~7 150 ~7 ~-7 90 ~-7 stone 0 replace stone 5
+execute @a ~~~ fill ~7 90 ~7 ~-7 0 ~-7 diamond_ore replace stone 1
+execute @a ~~~ fill ~7 90 ~7 ~-7 0 ~-7 coal_ore 0 replace stone 3
+execute @a ~~~ fill ~7 90 ~7 ~-7 0 ~-7 iron_ore 0 replace stone 5
+execute @a ~~~ fill ~7 150 ~7 ~-7 90 ~-7 diamond_ore 0 replace stone 1
+execute @a ~~~ fill ~7 150 ~7 ~-7 90 ~-7 coal_ore 0 replace stone 3
+execute @a ~~~ fill ~7 150 ~7 ~-7 90 ~-7 iron_ore 0 replace stone 5
 
 #cutclean
 execute @a ~~~ execute @e[name="Желязна руда",r=5] ~~~ give @p iron_ingot

src/functions/UHC_setup.mcfunction

@@ -21,6 +21,7 @@ scoreboard players set @s settings_healing 1
 scoreboard players set @s settings_time 0
 scoreboard players set @s settings_gapple 1
 scoreboard players set @s settings_spec 1
+scoreboard players set @s autostart 0
 #tp to 0,0
 scoreboard objectives setdisplay sidebar display
 spreadplayers 0 0 1 2 @s

src/loot_tables/entities/chicken.json

@@ -0,0 +1,26 @@
+{
+    "pools": [
+        {
+            "rolls": 1,
+            "entries": [
+                {
+                    "type": "item",
+                    "name": "minecraft:chicken",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "furnace_smelt"
+                        },
+                        {
+                            "function": "looting_enchant",
+                            "count": {
+                                "min": 0,
+                                "max": 1
+                            }
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

src/loot_tables/entities/cow.json

@@ -0,0 +1,26 @@
+{
+    "pools": [
+        {
+            "rolls": 1,
+            "entries": [
+                {
+                    "type": "item",
+                    "name": "minecraft:beef",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "set_count",
+                            "count": {
+                                "min": 1,
+                                "max": 3
+                            }
+                        },
+                        {
+                            "function": "furnace_smelt"
+                        },
+                    ]
+                }
+            ]
+        }
+    ]
+}

src/loot_tables/entities/pig.json

@@ -0,0 +1,26 @@
+{
+    "pools": [
+        {
+            "rolls": 1,
+            "entries": [
+                {
+                    "type": "item",
+                    "name": "minecraft:porkchop",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "set_count",
+                            "count": {
+                                "min": 1,
+                                "max": 3
+                            }
+                        },
+                        {
+                            "function": "furnace_smelt"
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

src/loot_tables/entities/sheep.json

@@ -0,0 +1,26 @@
+{
+    "pools": [
+      {
+            "rolls": 1,
+            "entries": [
+                {
+                    "type": "item",
+                    "name": "minecraft:muttonRaw",
+                    "weight": 1,
+                    "functions": [
+                        {
+                            "function": "set_count",
+                            "count": {
+                                "min": 1,
+                                "max": 2
+                            }
+                        },
+                        {
+                            "function": "furnace_smelt"
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

src/recipes/enchanting_table.json

@@ -0,0 +1,26 @@
+{
+  "format_version": "1.12",
+  "minecraft:recipe_shaped": {
+    "description": {
+    "identifier": "minecraft:enchanting_table"
+    },
+
+
+    "tags": [ "crafting_table" ],
+    "pattern": [
+      "D#D",
+      "###"
+    ],
+    "key": {
+      "#": {
+        "item": "minecraft:diamond"
+      },
+      "D": {
+        "item": "minecraft:iron"
+      }
+    },
+    "result": {
+      "item": "minecraft:enchanting_table"
+    }
+  }
+}

src/spawn_rules/bat.json

@@ -0,0 +1,37 @@
+{
+  "format_version": "1.8.0",
+  "minecraft:spawn_rules": {
+    "description": {
+      "identifier": "minecraft:bat",
+      "population_control": "ambient"
+    },
+    "conditions": [
+      {
+        "minecraft:spawns_underground": {},
+        "minecraft:brightness_filter": {
+          "min": 0,
+          "max": 4,
+          "adjust_for_weather": true
+        },
+        "minecraft:height_filter": {
+          "min": 0,
+          "max": 63
+        },
+        "minecraft:weight": {
+          "default": 0
+        },
+        "minecraft:herd": {
+          "min_size": 2,
+          "max_size": 2
+        },
+        "minecraft:density_limit": {
+          "surface": 5
+        },
+
+        "minecraft:biome_filter": {
+          "test": "has_biome_tag", "operator":"==", "value": "animal"
+        }
+      }
+    ]
+  }
+}

src/spawn_rules/bee.json

@@ -0,0 +1,32 @@
+{
+    "format_version": "1.8.0",
+    "minecraft:spawn_rules": {
+      "description": {
+        "identifier": "minecraft:bee",
+        "population_control": "animal"
+      },
+      "conditions": [
+        {
+          "minecraft:spawns_on_surface": {},
+          "minecraft:brightness_filter": {
+            "min": 7,
+            "max": 15,
+            "adjust_for_weather": false
+          },
+          "minecraft:weight": {
+            "default": 0
+          },
+          "minecraft:herd": {
+            "min_size":1,
+            "max_size":1
+          },
+
+          "minecraft:biome_filter": [
+            { "test": "has_biome_tag", "operator":"==", "value": "plains" },
+            { "test": "has_biome_tag", "operator":"==", "value": "sunflower_plains" },
+            { "test": "has_biome_tag", "operator":"==", "value": "flower_forest" }
+          ]
+        }
+      ]
+    }
+  }

src/spawn_rules/cat.json

@@ -0,0 +1,13 @@
+{
+  "format_version": "1.8.0",
+  "minecraft:spawn_rules": {
+    "description": {
+      "identifier": "minecraft:cat",
+      "population_control": "cat"
+    },
+    "conditions": [{
+      "minecraft:weight": {
+        "default": 0
+      }
+  }]
+}}

src/spawn_rules/cod.json

@@ -0,0 +1,35 @@
+{
+  "format_version": "1.8.0",
+  "minecraft:spawn_rules": {
+    "description": {
+      "identifier": "minecraft:cod",
+      "population_control": "water_animal"
+    },
+    "conditions": [
+      {
+        "minecraft:spawns_on_surface": {},
+        "minecraft:spawns_underwater": {},
+
+        "minecraft:distance_filter": {
+          "min": 12,
+          "max": 32
+        },
+        "minecraft:weight": {
+          "default": 0
+        },
+        "minecraft:density_limit": {
+          "surface":20
+        },
+        "minecraft:herd": {
+          "min_size":4,
+          "max_size":7
+        },
+
+        "minecraft:biome_filter": [
+          {"test": "has_biome_tag", "operator":"==", "value": "ocean"},
+          {"test": "has_biome_tag", "operator":"!=", "value": "warm"}
+        ]
+      }
+    ]
+  }
+}

src/spawn_rules/creeper.json

@@ -0,0 +1,34 @@
+{
+  "format_version": "1.8.0",
+  "minecraft:spawn_rules": {
+    "description": {
+      "identifier": "minecraft:creeper",
+      "population_control": "monster"
+    },
+    "conditions": [
+      {
+        "minecraft:spawns_on_surface": {},
+        "minecraft:spawns_underground": {},
+        "minecraft:brightness_filter": {
+          "min": 0,
+          "max": 7,
+          "adjust_for_weather": true
+        },
+        "minecraft:difficulty_filter": {
+          "min": "easy",
+          "max": "hard"
+        },
+        "minecraft:weight": {
+          "default": 0
+        },
+        "minecraft:density_limit": {
+          "surface": 5
+        },
+
+        "minecraft:biome_filter": {
+          "test": "has_biome_tag", "operator":"==", "value": "monster"
+        }
+      }
+    ]
+  }
+}

src/spawn_rules/dolphin.json

@@ -0,0 +1,31 @@
+{
+  "format_version": "1.8.0",
+  "minecraft:spawn_rules": {
+    "description": {
+      "identifier": "minecraft:dolphin",
+      "population_control": "animal"
+    },
+    "conditions": [
+      {
+        "minecraft:spawns_on_surface": {},
+        "minecraft:spawns_underwater": {},
+
+        "minecraft:weight": {
+          "default": 0
+        },
+        "minecraft:herd": {
+          "min_size": 3,
+          "max_size": 5
+        },
+        "minecraft:density_limit": {
+          "surface": 5,
+          "underground": 0
+        },
+        "minecraft:biome_filter": [
+          { "test": "has_biome_tag", "operator": "==", "value": "ocean" },
+          { "test": "has_biome_tag", "operator": "!=", "value": "frozen"}
+        ]
+      }
+    ]
+  }
+}