From 246f5e9312e4ec54f8e0c6a195edc8f277a6759b Mon Sep 17 00:00:00 2001
From: Timo Ley <timo@leyt.xyz>
Date: Wed, 19 Aug 2020 16:34:48 +0200
Subject: [PATCH] Removed live system

---
 src/modpack.json                 | 15 ---------
 src/overrides/config/nolives.cfg | 54 --------------------------------
 src/overrides/scripts/lives.zs   |  6 ----
 3 files changed, 75 deletions(-)
 delete mode 100644 src/overrides/config/nolives.cfg
 delete mode 100644 src/overrides/scripts/lives.zs

diff --git a/src/modpack.json b/src/modpack.json
index fe3e672..ad618e5 100644
--- a/src/modpack.json
+++ b/src/modpack.json
@@ -1591,21 +1591,6 @@
             "included"
           ]
         },
-        {
-          "id": "nolives",
-          "file": {
-            "installer": "internal.dir:mods",
-            "artifact": "curse.maven:281229:2807969",
-            "repository": "curse"
-          },
-          "type": "mod",
-          "options": [
-            "required",
-            "client",
-            "server",
-            "included"
-          ]
-        },
         {
           "id": "349214",
           "file": {
diff --git a/src/overrides/config/nolives.cfg b/src/overrides/config/nolives.cfg
deleted file mode 100644
index 3a175c7..0000000
--- a/src/overrides/config/nolives.cfg
+++ /dev/null
@@ -1,54 +0,0 @@
-# Configuration file
-
-general {
-    # If true, on a server the player who ran out of lives will be kicked and banned from the world
-    # On single player, the player will be kicked and the world will be deleted
-    # If false, the player will be put into spectator mode
-    B:banOnOutOfLives=true
-
-    # Whether you can use silk touch to pickup the Heart block
-    B:canSilkHarvestBlock=true
-
-    # The amount of lives a new player will start with
-    # Min: 1
-    # Max: 2147483647
-    I:defaultLives=5
-
-    # Set to true to drop Heart items from the block, or false to just give the player who broke it the lives directly
-    # The amount of items/lives is set by livesFromHeartBlock
-    B:dropItemsFromBlock=false
-
-    # Whether this mod is enabled
-    # Disabling will completely disable everything in this mod, but the item and block will still exist
-    B:enabled=true
-
-    # The amount of lives that will be given when a Heart block is broken by a player
-    # Min: 1
-    # Max: 2147483647
-    I:livesFromHeartBlock=5
-
-    # The amount of lives that will be given when a Heart item is used by a player
-    # Min: 1
-    # Max: 2147483647
-    I:livesFromHeartItem=1
-
-    # The maximum number of lives a player can have - only limits gaining through Heart items or blocks (no limit for commands)
-    # This value can be smaller than the defaultLives config
-    # A value of 0 will mean there is no limit
-    # Min: 0
-    # Max: 2147483647
-    I:maxLives=20
-
-    # The max amount of lives a player can gain from the regeneration (see the regenSeconds config)
-    # Min: 1
-    # Max: 2147483647
-    I:regenMaxLives=5
-
-    # The frequency at which players will regenerate lives (in seconds), up until the regenMaxLives config
-    # If set to 0, then players will not regen lives at all
-    # Min: 0
-    # Max: 2147483647
-    I:regenSeconds=3600
-}
-
-
diff --git a/src/overrides/scripts/lives.zs b/src/overrides/scripts/lives.zs
deleted file mode 100644
index 6d0eedf..0000000
--- a/src/overrides/scripts/lives.zs
+++ /dev/null
@@ -1,6 +0,0 @@
-recipes.addShaped(<nolives:heart>, [[<minecraft:redstone>, <minecraft:redstone>, <minecraft:redstone>],[<minecraft:redstone>, <nyx:fallen_star>, <minecraft:redstone>], [<minecraft:redstone>, <minecraft:redstone>, <minecraft:redstone>]]);
-mods.projecte.WorldTransmutation.add(<nolives:heart_block>, <nyx:star_block>);
-mods.extrautils2.Resonator.add(<nolives:heart>, <draconicevolution:dragon_heart>, 50);
-mods.extrautils2.Resonator.add(<nolives:heart>, <iceandfire:fire_dragon_heart>, 50);
-mods.extrautils2.Resonator.add(<nolives:heart>, <iceandfire:ice_dragon_heart>, 50);
-mods.extrautils2.Resonator.add(<nolives:heart>, <iceandfire:hydra_heart>, 50);