From 9d62704fba1f23977d092a6049891db8d6280409 Mon Sep 17 00:00:00 2001
From: Timo Ley <timo.ley@tilera.dev>
Date: Mon, 2 Jan 2023 11:11:00 +0100
Subject: [PATCH] feat: update atomic science and classic worldgen

---
 .gitignore                               |  2 +-
 addon.json                               |  4 +--
 src/modpack.json                         |  4 +--
 src/overrides/config/AtomicScience.cfg   | 21 ++++++++++++++
 src/overrides/config/ClassicWorldgen.cfg | 35 ++++++++++++++++++++++++
 5 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 src/overrides/config/AtomicScience.cfg
 create mode 100644 src/overrides/config/ClassicWorldgen.cfg

diff --git a/.gitignore b/.gitignore
index 364d8d1..9838034 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-build/
+build*
 .mpt
\ No newline at end of file
diff --git a/addon.json b/addon.json
index 823c4d2..c30f154 100644
--- a/addon.json
+++ b/addon.json
@@ -1043,7 +1043,7 @@
       {
         "qualifier": "mod-cwg",
         "link": [
-          "https://maven.tilera.xyz/dev/tilera/modding/cwg/1.3.0/cwg-1.3.0.jar"
+          "https://maven.tilera.xyz/dev/tilera/modding/cwg/1.4.0/cwg-1.4.0.jar"
         ],
         "flags": {
           "both": ["required"]
@@ -1133,7 +1133,7 @@
       {
         "qualifier": "mod-atomicscience",
         "link": [
-          "https://maven.tilera.xyz/universalelectricity/atomicscience/1.1.0/atomicscience-1.1.0.jar"
+          "https://maven.tilera.xyz/universalelectricity/atomicscience/1.1.1/atomicscience-1.1.1.jar"
         ],
         "flags": {
           "both": ["required"]
diff --git a/src/modpack.json b/src/modpack.json
index 3632659..da8a191 100644
--- a/src/modpack.json
+++ b/src/modpack.json
@@ -965,7 +965,7 @@
                 {
                     "id": "mod-cwg",
                     "file": {
-                        "link": "https://maven.tilera.xyz/dev/tilera/modding/cwg/1.3.0/cwg-1.3.0.jar",
+                        "link": "https://maven.tilera.xyz/dev/tilera/modding/cwg/1.4.0/cwg-1.4.0.jar",
                         "installer": "internal.dir:mods"
                     },
                     "type": "mod",
@@ -1049,7 +1049,7 @@
                 {
                     "id": "mod-atomicscience",
                     "file": {
-                        "link": "https://maven.tilera.xyz/universalelectricity/atomicscience/1.1.0/atomicscience-1.1.0.jar",
+                        "link": "https://maven.tilera.xyz/universalelectricity/atomicscience/1.1.1/atomicscience-1.1.1.jar",
                         "installer": "internal.dir:mods"
                     },
                     "type": "mod",
diff --git a/src/overrides/config/AtomicScience.cfg b/src/overrides/config/AtomicScience.cfg
new file mode 100644
index 0000000..4600cde
--- /dev/null
+++ b/src/overrides/config/AtomicScience.cfg
@@ -0,0 +1,21 @@
+# Configuration file
+
+general {
+    B:"Allow Layered Turbines"=true
+    B:"Allow Radioactive Ores"=true
+    B:"Allow Toxic Waste"=true
+    B:"Auto Disable Uranium If Exist"=false
+    B:"Disable IC2 Uranium Compression (Recommended)"=true
+    B:"Disable Radiation"=false
+    B:"Require Tritium"=true
+    I:"Steam Ratio"=120
+    D:"Turbine Output Multiplier"=15.0
+    I:"Uranium Hexafluoride Ratio"=200
+}
+
+
+ore_generation {
+    B:"Generate Uranium Ore"=true
+}
+
+
diff --git a/src/overrides/config/ClassicWorldgen.cfg b/src/overrides/config/ClassicWorldgen.cfg
new file mode 100644
index 0000000..59e0241
--- /dev/null
+++ b/src/overrides/config/ClassicWorldgen.cfg
@@ -0,0 +1,35 @@
+# Configuration file
+
+caves {
+    # enable classic (1.6) cavegen [default: false]
+    B:enableSwissCheeseCaves=true
+}
+
+
+commands {
+    # enable command to change the WorldType [default: false]
+    B:changeTypeCommand=false
+}
+
+
+tweaks {
+    # generate 1.6 extreme hills instead of 1.7 [default: false]
+    B:classicExtremeHills=true
+
+    # disable snow on mountains [default: false]
+    B:disableHeightTemperature=true
+
+    # prevent new 1.7 flowers from generating in swamps and plains [default: false]
+    B:disableNewFlowers=true
+}
+
+
+worldgen {
+    # generate new 1.7 vanilla biomes with classic/1.6 WorldType [default: false]
+    B:addNewVanillaBiomes=false
+
+    # prevent new 1.7 vanilla biomes from generating with classic/1.6 WorldType [default: true]
+    B:blockNewVanillaBiomes=true
+}
+
+