Merge pull request #4 from apexhosting/hotfixes/stable

Hotfixes
apexhosting · Aug 8, 2022 · 7bf6ec8 · 7bf6ec8
2 parents fc2064d + 40c5463
commit 7bf6ec8
Show file tree

Hide file tree

Showing 153 changed files with 19,092 additions and 1,421 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [3.0]
+
+- Reverted version.
+- Implemented 1.8-1.19 support.
+- Implemented custom TAB.
+- Implemented custom Scoreboard.
+- Tested gameplay.
+
 ## [2.5]
 
 ### Added
@@ -74,6 +82,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - Nothing
 
+[3.0]: https://github.com/apexhosting/UHC/releases/tag/3.0
 [2.4]: https://github.com/apexhosting/UHC/releases/tag/2.4
 [2.3]: https://github.com/apexhosting/UHC/releases/tag/2.3
 [2.2]: https://github.com/apexhosting/UHC/releases/tag/2.2

diff --git a/UHC_world/advancements/f0e7f028-4955-4dc8-8e40-d334ef0bd19a.json b/UHC_world/advancements/f0e7f028-4955-4dc8-8e40-d334ef0bd19a.json
@@ -0,0 +1,28 @@
+{
+  "minecraft:recipes/misc/iron_nugget_from_blasting": {
+    "criteria": {
+      "has_iron_sword": "2022-08-05 12:53:52 +0000"
+    },
+    "done": true
+  },
+  "minecraft:story/iron_tools": {
+    "criteria": {
+      "iron_pickaxe": "2022-08-05 12:53:52 +0000"
+    },
+    "done": true
+  },
+  "minecraft:recipes/misc/iron_nugget_from_smelting": {
+    "criteria": {
+      "has_iron_sword": "2022-08-05 12:53:52 +0000"
+    },
+    "done": true
+  },
+  "minecraft:adventure/adventuring_time": {
+    "criteria": {
+      "minecraft:wooded_mountains": "2022-08-05 12:53:53 +0000",
+      "minecraft:plains": "2022-08-05 12:53:52 +0000"
+    },
+    "done": false
+  },
+  "DataVersion": 2586
+}
diff --git a/UHC_world/data/raids.dat b/UHC_world/data/raids.dat
diff --git a/UHC_world/datapacks/bukkit/pack.mcmeta b/UHC_world/datapacks/bukkit/pack.mcmeta
@@ -0,0 +1,6 @@
+{
+    "pack": {
+        "description": "Data pack for resources provided by Bukkit plugins",
+        "pack_format": 6
+    }
+}
diff --git a/UHC_world/level.dat b/UHC_world/level.dat
diff --git a/UHC_world/level.dat_old b/UHC_world/level.dat_old
diff --git a/UHC_world/playerdata/f0e7f028-4955-4dc8-8e40-d334ef0bd19a.dat b/UHC_world/playerdata/f0e7f028-4955-4dc8-8e40-d334ef0bd19a.dat
diff --git a/UHC_world/playerdata/f0e7f028-4955-4dc8-8e40-d334ef0bd19a.dat_old b/UHC_world/playerdata/f0e7f028-4955-4dc8-8e40-d334ef0bd19a.dat_old
diff --git a/UHC_world/region/r.-1.-1.mca b/UHC_world/region/r.-1.-1.mca
diff --git a/UHC_world/region/r.-1.0.mca b/UHC_world/region/r.-1.0.mca
diff --git a/UHC_world/region/r.0.-1.mca b/UHC_world/region/r.0.-1.mca
diff --git a/UHC_world/region/r.0.0.mca b/UHC_world/region/r.0.0.mca
diff --git a/UHC_world/session.lock b/UHC_world/session.lock
@@ -0,0 +1 @@
+☃
diff --git a/UHC_world/stats/f0e7f028-4955-4dc8-8e40-d334ef0bd19a.json b/UHC_world/stats/f0e7f028-4955-4dc8-8e40-d334ef0bd19a.json
@@ -0,0 +1 @@
+{"stats":{"minecraft:custom":{"minecraft:time_since_rest":278,"minecraft:play_one_minute":278,"minecraft:leave_game":1,"minecraft:sprint_one_cm":21,"minecraft:time_since_death":278,"minecraft:walk_one_cm":1470}},"DataVersion":2586}
diff --git a/UHC_world/uid.dat b/UHC_world/uid.dat
@@ -0,0 +1 @@
+�5�g��D��l���K�
diff --git a/UHC_world_nether/DIM-1/data/raids.dat b/UHC_world_nether/DIM-1/data/raids.dat
diff --git a/UHC_world_nether/DIM-1/region/r.-1.-1.mca b/UHC_world_nether/DIM-1/region/r.-1.-1.mca
diff --git a/UHC_world_nether/DIM-1/region/r.-1.0.mca b/UHC_world_nether/DIM-1/region/r.-1.0.mca
diff --git a/UHC_world_nether/DIM-1/region/r.0.-1.mca b/UHC_world_nether/DIM-1/region/r.0.-1.mca
diff --git a/UHC_world_nether/DIM-1/region/r.0.0.mca b/UHC_world_nether/DIM-1/region/r.0.0.mca
diff --git a/UHC_world_nether/level.dat b/UHC_world_nether/level.dat
diff --git a/UHC_world_nether/level.dat_old b/UHC_world_nether/level.dat_old
diff --git a/UHC_world_nether/session.lock b/UHC_world_nether/session.lock
@@ -0,0 +1 @@
+☃
diff --git a/UHC_world_nether/uid.dat b/UHC_world_nether/uid.dat
@@ -0,0 +1 @@
+��b?Iu���nL"QB
diff --git a/UHC_world_the_end/DIM1/data/raids_end.dat b/UHC_world_the_end/DIM1/data/raids_end.dat
diff --git a/UHC_world_the_end/DIM1/region/r.-1.-1.mca b/UHC_world_the_end/DIM1/region/r.-1.-1.mca
diff --git a/UHC_world_the_end/DIM1/region/r.-1.0.mca b/UHC_world_the_end/DIM1/region/r.-1.0.mca
diff --git a/UHC_world_the_end/DIM1/region/r.0.-1.mca b/UHC_world_the_end/DIM1/region/r.0.-1.mca
diff --git a/UHC_world_the_end/DIM1/region/r.0.0.mca b/UHC_world_the_end/DIM1/region/r.0.0.mca
diff --git a/UHC_world_the_end/level.dat b/UHC_world_the_end/level.dat
diff --git a/UHC_world_the_end/level.dat_old b/UHC_world_the_end/level.dat_old
diff --git a/UHC_world_the_end/session.lock b/UHC_world_the_end/session.lock
@@ -0,0 +1 @@
+☃
diff --git a/UHC_world_the_end/uid.dat b/UHC_world_the_end/uid.dat
@@ -0,0 +1 @@
+����A�Oy�^�;'f��
diff --git a/bukkit.yml b/bukkit.yml
@@ -2,19 +2,18 @@
 # As you can see, there's actually not that much to configure without any plugins.
 # For a reference for any variable inside this file, check out the Bukkit Wiki at
 # https://www.spigotmc.org/go/bukkit-yml
-#
+# 
 # If you need help on this file, feel free to join us on irc or leave a message
 # on the forums asking for advice.
-#
+# 
 # IRC: #spigot @ irc.spi.gt
 #    (If this means nothing to you, just go to https://www.spigotmc.org/go/irc )
 # Forums: https://www.spigotmc.org/
 # Bug tracker: https://www.spigotmc.org/go/bugs
 
 
 settings:
-  minimum-api: none
-  allow-end: false
+  allow-end: true
   warn-on-overload: true
   permissions-file: permissions.yml
   update-folder: update
@@ -23,24 +22,20 @@ settings:
   query-plugins: true
   deprecated-verbose: default
   shutdown-message: Server closed
+  minimum-api: none
 spawn-limits:
-  axolotls: 5
-  water-underground-creature: 5
-  water-ambient: 20
   monsters: 70
   animals: 10
-  water-animals: 15
+  water-animals: 5
+  water-ambient: 20
   ambient: 15
 chunk-gc:
   period-in-ticks: 600
-  load-threshold: 0
 ticks-per:
-  axolotl-spawns: 1
-  water-underground-creature-spawns: 1
+  animal-spawns: 400
+  monster-spawns: 1
   water-spawns: 1
   water-ambient-spawns: 1
   ambient-spawns: 1
-  animal-spawns: 400
-  monster-spawns: 1
   autosave: 6000
 aliases: now-in-commands.yml
diff --git a/jar/gametype_uhc.jar → jar/UHC_gametype.jar b/jar/gametype_uhc.jar → jar/UHC_gametype.jar
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"stats":{"minecraft:custom":{"minecraft:time_since_rest":278,"minecraft:play_one_minute":278,"minecraft:leave_game":1,"minecraft:sprint_one_cm":21,"minecraft:time_since_death":278,"minecraft:walk_one_cm":1470}},"DataVersion":2586}