diff --git a/config/appliedenergistics2-client.toml b/config/appliedenergistics2-client.toml index 1fef68f..22f756e 100644 --- a/config/appliedenergistics2-client.toml +++ b/config/appliedenergistics2-client.toml @@ -52,7 +52,7 @@ #Allowed Values: TALL, FULL, SMALL terminalStyle = "TALL" #Allowed Values: AUTOSEARCH, AUTOSEARCH_KEEP, MANUAL_SEARCH, MANUAL_SEARCH_KEEP, JEI_AUTOSEARCH, JEI_AUTOSEARCH_KEEP, JEI_MANUAL_SEARCH, JEI_MANUAL_SEARCH_KEEP - terminalSearchMode = "AUTOSEARCH" + terminalSearchMode = "MANUAL_SEARCH" #Should tooltips be searched. Performance impact #Allowed Values: YES, NO, UNDECIDED searchTooltips = "YES" diff --git a/config/environmental/core/components/frames/frames.json b/config/environmental/core/components/frames/frames.json index 0ee359e..fa9718b 100644 --- a/config/environmental/core/components/frames/frames.json +++ b/config/environmental/core/components/frames/frames.json @@ -1,10 +1,58 @@ { - "ma:litherite_frame": {}, - "ma:erodium_frame": {}, - "ma:kyronite_frame": {}, - "ma:pladium_frame": {}, - "ma:ionite_frame": {}, - "ma:aethium_frame": {}, - "ma:nanorite_frame": {}, - "ma:xerothium_frame": {} + "ma:litherite_frame": { + "ma:default_base_color": { + "in:r:[0~255]": 255, + "in:g:[0~255]": 255, + "in:b:[0~255]": 255 + } + }, + "ma:erodium_frame": { + "ma:default_base_color": { + "in:r:[0~255]": 247, + "in:g:[0~255]": 247, + "in:b:[0~255]": 247 + } + }, + "ma:kyronite_frame": { + "ma:default_base_color": { + "in:r:[0~255]": 239, + "in:g:[0~255]": 239, + "in:b:[0~255]": 239 + } + }, + "ma:pladium_frame": { + "ma:default_base_color": { + "in:r:[0~255]": 231, + "in:g:[0~255]": 231, + "in:b:[0~255]": 231 + } + }, + "ma:ionite_frame": { + "ma:default_base_color": { + "in:r:[0~255]": 223, + "in:g:[0~255]": 223, + "in:b:[0~255]": 223 + } + }, + "ma:aethium_frame": { + "ma:default_base_color": { + "in:r:[0~255]": 215, + "in:g:[0~255]": 215, + "in:b:[0~255]": 215 + } + }, + "ma:nanorite_frame": { + "ma:default_base_color": { + "in:r:[0~255]": 207, + "in:g:[0~255]": 207, + "in:b:[0~255]": 207 + } + }, + "ma:xerothium_frame": { + "ma:default_base_color": { + "in:r:[0~255]": 199, + "in:g:[0~255]": 199, + "in:b:[0~255]": 199 + } + } } \ No newline at end of file diff --git a/config/environmental/core/components/frames/frames.txt b/config/environmental/core/components/frames/frames.txt index e1dc8ad..08109af 100644 --- a/config/environmental/core/components/frames/frames.txt +++ b/config/environmental/core/components/frames/frames.txt @@ -4,17 +4,17 @@ ┃┃┃┏╸in:r ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:g ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:b ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┗╸ ┃┗╸ @@ -23,17 +23,17 @@ ┃┃┃┏╸in:r ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 247 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:g ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 247 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:b ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 247 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┗╸ ┃┗╸ @@ -42,17 +42,17 @@ ┃┃┃┏╸in:r ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 239 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:g ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 239 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:b ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 239 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┗╸ ┃┗╸ @@ -61,17 +61,17 @@ ┃┃┃┏╸in:r ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 231 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:g ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 231 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:b ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 231 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┗╸ ┃┗╸ @@ -80,17 +80,17 @@ ┃┃┃┏╸in:r ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 223 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:g ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 223 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:b ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 223 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┗╸ ┃┗╸ @@ -99,17 +99,17 @@ ┃┃┃┏╸in:r ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 215 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:g ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 215 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:b ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 215 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┗╸ ┃┗╸ @@ -118,17 +118,17 @@ ┃┃┃┏╸in:r ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 207 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:g ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 207 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:b ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 207 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┗╸ ┃┗╸ @@ -137,17 +137,17 @@ ┃┃┃┏╸in:r ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 199 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:g ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 199 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:b ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 199 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┗╸ ┃┗╸ diff --git a/config/environmental/core/components/modifiers/modifiers.json b/config/environmental/core/components/modifiers/modifiers.json index 10cc602..d2310c2 100644 --- a/config/environmental/core/components/modifiers/modifiers.json +++ b/config/environmental/core/components/modifiers/modifiers.json @@ -1,10 +1,58 @@ { - "ma:null": {}, - "ma:amplification": {}, - "ma:bandwidth": {}, - "ma:frequency": {}, - "ma:radiant": {}, - "ma:thermal": {}, - "ma:piezo": {}, - "ma:electrostatic": {} + "ma:null": { + "ma:default_base_color": { + "in:r:[0~255]": 255, + "in:g:[0~255]": 255, + "in:b:[0~255]": 255 + } + }, + "ma:amplification": { + "ma:default_base_color": { + "in:r:[0~255]": 255, + "in:g:[0~255]": 255, + "in:b:[0~255]": 255 + } + }, + "ma:bandwidth": { + "ma:default_base_color": { + "in:r:[0~255]": 255, + "in:g:[0~255]": 255, + "in:b:[0~255]": 255 + } + }, + "ma:frequency": { + "ma:default_base_color": { + "in:r:[0~255]": 255, + "in:g:[0~255]": 255, + "in:b:[0~255]": 255 + } + }, + "ma:radiant": { + "ma:default_base_color": { + "in:r:[0~255]": 255, + "in:g:[0~255]": 255, + "in:b:[0~255]": 255 + } + }, + "ma:thermal": { + "ma:default_base_color": { + "in:r:[0~255]": 255, + "in:g:[0~255]": 255, + "in:b:[0~255]": 255 + } + }, + "ma:piezo": { + "ma:default_base_color": { + "in:r:[0~255]": 255, + "in:g:[0~255]": 255, + "in:b:[0~255]": 255 + } + }, + "ma:electrostatic": { + "ma:default_base_color": { + "in:r:[0~255]": 255, + "in:g:[0~255]": 255, + "in:b:[0~255]": 255 + } + } } \ No newline at end of file diff --git a/config/environmental/core/components/modifiers/modifiers.txt b/config/environmental/core/components/modifiers/modifiers.txt index 262eb4b..a86685e 100644 --- a/config/environmental/core/components/modifiers/modifiers.txt +++ b/config/environmental/core/components/modifiers/modifiers.txt @@ -4,17 +4,17 @@ ┃┃┃┏╸in:r ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:g ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:b ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┗╸ ┃┗╸ @@ -23,17 +23,17 @@ ┃┃┃┏╸in:r ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:g ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:b ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┗╸ ┃┗╸ @@ -42,17 +42,17 @@ ┃┃┃┏╸in:r ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:g ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:b ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┗╸ ┃┗╸ @@ -61,17 +61,17 @@ ┃┃┃┏╸in:r ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:g ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:b ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┗╸ ┃┗╸ @@ -80,17 +80,17 @@ ┃┃┃┏╸in:r ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:g ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:b ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┗╸ ┃┗╸ @@ -99,17 +99,17 @@ ┃┃┃┏╸in:r ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:g ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:b ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┗╸ ┃┗╸ @@ -118,17 +118,17 @@ ┃┃┃┏╸in:r ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:g ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:b ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┗╸ ┃┗╸ @@ -137,17 +137,17 @@ ┃┃┃┏╸in:r ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:g ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:b ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┗╸ ┃┗╸ diff --git a/config/environmental/core/components/panels/panels.json b/config/environmental/core/components/panels/panels.json index e1c3410..87aed16 100644 --- a/config/environmental/core/components/panels/panels.json +++ b/config/environmental/core/components/panels/panels.json @@ -1,4 +1,16 @@ { - "ma:panel": {}, - "ma:clear_panel": {} + "ma:panel": { + "ma:default_base_color": { + "in:r:[0~255]": 255, + "in:g:[0~255]": 255, + "in:b:[0~255]": 255 + } + }, + "ma:clear_panel": { + "ma:default_base_color": { + "in:r:[0~255]": 255, + "in:g:[0~255]": 255, + "in:b:[0~255]": 255 + } + } } \ No newline at end of file diff --git a/config/environmental/core/components/panels/panels.txt b/config/environmental/core/components/panels/panels.txt index 0fa49c1..a01450b 100644 --- a/config/environmental/core/components/panels/panels.txt +++ b/config/environmental/core/components/panels/panels.txt @@ -4,17 +4,17 @@ ┃┃┃┏╸in:r ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:g ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:b ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┗╸ ┃┗╸ @@ -23,17 +23,17 @@ ┃┃┃┏╸in:r ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:g ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┃┏╸in:b ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┗╸ ┃┃┗╸ ┃┗╸ diff --git a/config/environmental/energy/solar/solar.json b/config/environmental/energy/solar/solar.json index cd25d58..a4c559b 100644 --- a/config/environmental/energy/solar/solar.json +++ b/config/environmental/energy/solar/solar.json @@ -1,8 +1,169 @@ { "bo:enabled": true, - "ma:cells": {}, + "ma:cells": { + "ma:litherite": { + "ma:default_base_color": { + "in:r:[0~255]": 255, + "in:g:[0~255]": 255, + "in:b:[0~255]": 255 + } + }, + "ma:erodium": { + "ma:default_base_color": { + "in:r:[0~255]": 247, + "in:g:[0~255]": 247, + "in:b:[0~255]": 247 + } + }, + "ma:kyronite": { + "ma:default_base_color": { + "in:r:[0~255]": 239, + "in:g:[0~255]": 239, + "in:b:[0~255]": 239 + } + }, + "ma:pladium": { + "ma:default_base_color": { + "in:r:[0~255]": 231, + "in:g:[0~255]": 231, + "in:b:[0~255]": 231 + } + }, + "ma:ionite": { + "ma:default_base_color": { + "in:r:[0~255]": 223, + "in:g:[0~255]": 223, + "in:b:[0~255]": 223 + } + }, + "ma:aethium": { + "ma:default_base_color": { + "in:r:[0~255]": 215, + "in:g:[0~255]": 215, + "in:b:[0~255]": 215 + } + }, + "ma:nanorite": { + "ma:default_base_color": { + "in:r:[0~255]": 207, + "in:g:[0~255]": 207, + "in:b:[0~255]": 207 + } + }, + "ma:xerothium": { + "ma:default_base_color": { + "in:r:[0~255]": 199, + "in:g:[0~255]": 199, + "in:b:[0~255]": 199 + } + } + }, "ma:ccus": { "do:production_power:[4.9E-324~1.7976931348623157E308]": 2.2, - "in:production_rate:[-2147483648~2147483647]": 128 + "in:production_rate:[-2147483648~2147483647]": 128, + "ma:litherite": { + "ma:default_base_color": { + "in:r:[0~255]": 255, + "in:g:[0~255]": 255, + "in:b:[0~255]": 255 + }, + "ma:default_core_color": { + "in:r:[0~254]": 40, + "in:g:[0~255]": 180, + "in:b:[0~255]": 232 + }, + "fl:max_efficiency:[0.0~1.0]": 0.56 + }, + "ma:erodium": { + "ma:default_base_color": { + "in:r:[0~255]": 247, + "in:g:[0~255]": 247, + "in:b:[0~255]": 247 + }, + "ma:default_core_color": { + "in:r:[0~254]": 40, + "in:g:[0~255]": 180, + "in:b:[0~255]": 232 + }, + "fl:max_efficiency:[0.0~1.0]": 0.64 + }, + "ma:kyronite": { + "ma:default_base_color": { + "in:r:[0~255]": 239, + "in:g:[0~255]": 239, + "in:b:[0~255]": 239 + }, + "ma:default_core_color": { + "in:r:[0~254]": 40, + "in:g:[0~255]": 180, + "in:b:[0~255]": 232 + }, + "fl:max_efficiency:[0.0~1.0]": 0.64 + }, + "ma:pladium": { + "ma:default_base_color": { + "in:r:[0~255]": 231, + "in:g:[0~255]": 231, + "in:b:[0~255]": 231 + }, + "ma:default_core_color": { + "in:r:[0~254]": 40, + "in:g:[0~255]": 180, + "in:b:[0~255]": 232 + }, + "fl:max_efficiency:[0.0~1.0]": 0.64 + }, + "ma:ionite": { + "ma:default_base_color": { + "in:r:[0~255]": 223, + "in:g:[0~255]": 223, + "in:b:[0~255]": 223 + }, + "ma:default_core_color": { + "in:r:[0~254]": 40, + "in:g:[0~255]": 180, + "in:b:[0~255]": 232 + }, + "fl:max_efficiency:[0.0~1.0]": 0.64 + }, + "ma:aethium": { + "ma:default_base_color": { + "in:r:[0~255]": 215, + "in:g:[0~255]": 215, + "in:b:[0~255]": 215 + }, + "ma:default_core_color": { + "in:r:[0~254]": 40, + "in:g:[0~255]": 180, + "in:b:[0~255]": 232 + }, + "fl:max_efficiency:[0.0~1.0]": 0.64 + }, + "ma:nanorite": { + "ma:default_base_color": { + "in:r:[0~255]": 207, + "in:g:[0~255]": 207, + "in:b:[0~255]": 207 + }, + "ma:default_core_color": { + "in:r:[0~254]": 40, + "in:g:[0~255]": 180, + "in:b:[0~255]": 232 + }, + "fl:max_efficiency:[0.0~1.0]": 0.64 + }, + "ma:xerothium": { + "ma:default_base_color": { + "in:r:[0~255]": 199, + "in:g:[0~255]": 199, + "in:b:[0~255]": 199 + }, + "ma:default_core_color": { + "in:r:[0~254]": 40, + "in:g:[0~255]": 180, + "in:b:[0~255]": 232 + }, + "fl:max_efficiency:[0.0~1.0]": 0.64 + } } } \ No newline at end of file diff --git a/config/environmental/energy/solar/solar.txt b/config/environmental/energy/solar/solar.txt index 1060fa9..3ef52fb 100644 --- a/config/environmental/energy/solar/solar.txt +++ b/config/environmental/energy/solar/solar.txt @@ -9,17 +9,17 @@ ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 255 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 255 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 255 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┗╸ @@ -28,17 +28,17 @@ ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 247 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 247 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 247 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┗╸ @@ -47,17 +47,17 @@ ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 239 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 239 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 239 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┗╸ @@ -66,17 +66,17 @@ ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 231 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 231 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 231 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┗╸ @@ -85,17 +85,17 @@ ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 223 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 223 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 223 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┗╸ @@ -104,17 +104,17 @@ ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 215 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 215 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 215 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┗╸ @@ -123,17 +123,17 @@ ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 207 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 207 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 207 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┗╸ @@ -142,17 +142,17 @@ ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 199 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 199 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 199 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┗╸ @@ -173,328 +173,336 @@ ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 255 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 255 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 255 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸ma:default_core_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 40 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~254] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 180 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 232 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸fl:max_efficiency ┃┃┃┣> Variable Type: java.lang.Float ┃┃┃┣> Default: 0.56 -┃┃┃┣> label.valkyrielib.requirements: [1.4E-45~3.4028235E38] -┃┃┃┗╸ +┃┃┃┣> label.valkyrielib.requirements: [0.0~1.0] +┃┃┃┣> The maximum efficiency accepted from solar cells. +┃┃┃┗> Anything above this value will not result in more energy. ┃┃┗╸ ┃┃┏╸ma:erodium ┃┃┃┏╸ma:default_base_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 247 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 247 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 247 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸ma:default_core_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 40 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~254] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 180 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 232 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸fl:max_efficiency ┃┃┃┣> Variable Type: java.lang.Float ┃┃┃┣> Default: 0.64 -┃┃┃┣> label.valkyrielib.requirements: [1.4E-45~3.4028235E38] -┃┃┃┗╸ +┃┃┃┣> label.valkyrielib.requirements: [0.0~1.0] +┃┃┃┣> The maximum efficiency accepted from solar cells. +┃┃┃┗> Anything above this value will not result in more energy. ┃┃┗╸ ┃┃┏╸ma:kyronite ┃┃┃┏╸ma:default_base_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 239 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 239 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 239 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸ma:default_core_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 40 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~254] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 180 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 232 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸fl:max_efficiency ┃┃┃┣> Variable Type: java.lang.Float ┃┃┃┣> Default: 0.64 -┃┃┃┣> label.valkyrielib.requirements: [1.4E-45~3.4028235E38] -┃┃┃┗╸ +┃┃┃┣> label.valkyrielib.requirements: [0.0~1.0] +┃┃┃┣> The maximum efficiency accepted from solar cells. +┃┃┃┗> Anything above this value will not result in more energy. ┃┃┗╸ ┃┃┏╸ma:pladium ┃┃┃┏╸ma:default_base_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 231 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 231 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 231 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸ma:default_core_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 40 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~254] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 180 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 232 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸fl:max_efficiency ┃┃┃┣> Variable Type: java.lang.Float ┃┃┃┣> Default: 0.64 -┃┃┃┣> label.valkyrielib.requirements: [1.4E-45~3.4028235E38] -┃┃┃┗╸ +┃┃┃┣> label.valkyrielib.requirements: [0.0~1.0] +┃┃┃┣> The maximum efficiency accepted from solar cells. +┃┃┃┗> Anything above this value will not result in more energy. ┃┃┗╸ ┃┃┏╸ma:ionite ┃┃┃┏╸ma:default_base_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 223 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 223 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 223 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸ma:default_core_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 40 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~254] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 180 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 232 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸fl:max_efficiency ┃┃┃┣> Variable Type: java.lang.Float ┃┃┃┣> Default: 0.64 -┃┃┃┣> label.valkyrielib.requirements: [1.4E-45~3.4028235E38] -┃┃┃┗╸ +┃┃┃┣> label.valkyrielib.requirements: [0.0~1.0] +┃┃┃┣> The maximum efficiency accepted from solar cells. +┃┃┃┗> Anything above this value will not result in more energy. ┃┃┗╸ ┃┃┏╸ma:aethium ┃┃┃┏╸ma:default_base_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 215 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 215 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 215 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸ma:default_core_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 40 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~254] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 180 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 232 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸fl:max_efficiency ┃┃┃┣> Variable Type: java.lang.Float ┃┃┃┣> Default: 0.64 -┃┃┃┣> label.valkyrielib.requirements: [1.4E-45~3.4028235E38] -┃┃┃┗╸ +┃┃┃┣> label.valkyrielib.requirements: [0.0~1.0] +┃┃┃┣> The maximum efficiency accepted from solar cells. +┃┃┃┗> Anything above this value will not result in more energy. ┃┃┗╸ ┃┃┏╸ma:nanorite ┃┃┃┏╸ma:default_base_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 207 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 207 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 207 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸ma:default_core_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 40 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~254] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 180 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 232 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸fl:max_efficiency ┃┃┃┣> Variable Type: java.lang.Float ┃┃┃┣> Default: 0.64 -┃┃┃┣> label.valkyrielib.requirements: [1.4E-45~3.4028235E38] -┃┃┃┗╸ +┃┃┃┣> label.valkyrielib.requirements: [0.0~1.0] +┃┃┃┣> The maximum efficiency accepted from solar cells. +┃┃┃┗> Anything above this value will not result in more energy. ┃┃┗╸ ┃┃┏╸ma:xerothium ┃┃┃┏╸ma:default_base_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 199 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 199 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 199 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸ma:default_core_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 40 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~254] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 180 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 232 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸fl:max_efficiency ┃┃┃┣> Variable Type: java.lang.Float ┃┃┃┣> Default: 0.64 -┃┃┃┣> label.valkyrielib.requirements: [1.4E-45~3.4028235E38] -┃┃┃┗╸ +┃┃┃┣> label.valkyrielib.requirements: [0.0~1.0] +┃┃┃┣> The maximum efficiency accepted from solar cells. +┃┃┃┗> Anything above this value will not result in more energy. ┃┃┗╸ ┃┗╸ ┗╸ diff --git a/config/environmental/tech/void_miner/void_miner.json b/config/environmental/tech/void_miner/void_miner.json index bf72466..1302269 100644 --- a/config/environmental/tech/void_miner/void_miner.json +++ b/config/environmental/tech/void_miner/void_miner.json @@ -1,4 +1,101 @@ { "bo:enabled": true, - "ma:ccus": {} + "ma:ccus": { + "ma:litherite": { + "ma:default_base_color": { + "in:r:[0~255]": 255, + "in:g:[0~255]": 255, + "in:b:[0~255]": 255 + }, + "ma:default_core_color": { + "in:r:[0~254]": 120, + "in:g:[0~255]": 232, + "in:b:[0~255]": 255 + } + }, + "ma:erodium": { + "ma:default_base_color": { + "in:r:[0~255]": 247, + "in:g:[0~255]": 247, + "in:b:[0~255]": 247 + }, + "ma:default_core_color": { + "in:r:[0~254]": 120, + "in:g:[0~255]": 232, + "in:b:[0~255]": 255 + } + }, + "ma:kyronite": { + "ma:default_base_color": { + "in:r:[0~255]": 239, + "in:g:[0~255]": 239, + "in:b:[0~255]": 239 + }, + "ma:default_core_color": { + "in:r:[0~254]": 120, + "in:g:[0~255]": 232, + "in:b:[0~255]": 255 + } + }, + "ma:pladium": { + "ma:default_base_color": { + "in:r:[0~255]": 231, + "in:g:[0~255]": 231, + "in:b:[0~255]": 231 + }, + "ma:default_core_color": { + "in:r:[0~254]": 120, + "in:g:[0~255]": 232, + "in:b:[0~255]": 255 + } + }, + "ma:ionite": { + "ma:default_base_color": { + "in:r:[0~255]": 223, + "in:g:[0~255]": 223, + "in:b:[0~255]": 223 + }, + "ma:default_core_color": { + "in:r:[0~254]": 120, + "in:g:[0~255]": 232, + "in:b:[0~255]": 255 + } + }, + "ma:aethium": { + "ma:default_base_color": { + "in:r:[0~255]": 215, + "in:g:[0~255]": 215, + "in:b:[0~255]": 215 + }, + "ma:default_core_color": { + "in:r:[0~254]": 120, + "in:g:[0~255]": 232, + "in:b:[0~255]": 255 + } + }, + "ma:nanorite": { + "ma:default_base_color": { + "in:r:[0~255]": 207, + "in:g:[0~255]": 207, + "in:b:[0~255]": 207 + }, + "ma:default_core_color": { + "in:r:[0~254]": 120, + "in:g:[0~255]": 232, + "in:b:[0~255]": 255 + } + }, + "ma:xerothium": { + "ma:default_base_color": { + "in:r:[0~255]": 199, + "in:g:[0~255]": 199, + "in:b:[0~255]": 199 + }, + "ma:default_core_color": { + "in:r:[0~254]": 120, + "in:g:[0~255]": 232, + "in:b:[0~255]": 255 + } + } + } } \ No newline at end of file diff --git a/config/environmental/tech/void_miner/void_miner.txt b/config/environmental/tech/void_miner/void_miner.txt index b654447..b899f1c 100644 --- a/config/environmental/tech/void_miner/void_miner.txt +++ b/config/environmental/tech/void_miner/void_miner.txt @@ -9,34 +9,34 @@ ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 255 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 255 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 255 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸ma:default_core_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 120 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~254] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 232 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 255 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┗╸ @@ -45,34 +45,34 @@ ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 247 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 247 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 247 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸ma:default_core_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 120 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~254] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 232 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 255 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┗╸ @@ -81,34 +81,34 @@ ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 239 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 239 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 239 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸ma:default_core_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 120 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~254] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 232 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 255 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┗╸ @@ -117,34 +117,34 @@ ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 231 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 231 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 231 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸ma:default_core_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 120 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~254] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 232 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 255 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┗╸ @@ -153,34 +153,34 @@ ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 223 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 223 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 223 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸ma:default_core_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 120 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~254] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 232 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 255 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┗╸ @@ -189,34 +189,34 @@ ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 215 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 215 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 215 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸ma:default_core_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 120 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~254] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 232 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 255 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┗╸ @@ -225,34 +225,34 @@ ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 207 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 207 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 207 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸ma:default_core_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 120 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~254] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 232 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 255 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┗╸ @@ -261,34 +261,34 @@ ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 199 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 199 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 199 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┃┏╸ma:default_core_color ┃┃┃┃┏╸in:r ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 120 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~254] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:g ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 232 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┃┏╸in:b ┃┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┃┣> Default: 255 -┃┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] +┃┃┃┃┣> label.valkyrielib.requirements: [0~255] ┃┃┃┃┗╸ ┃┃┃┗╸ ┃┃┗╸ diff --git a/config/jei/bookmarks.ini b/config/jei/bookmarks.ini new file mode 100644 index 0000000..2fc597b --- /dev/null +++ b/config/jei/bookmarks.ini @@ -0,0 +1 @@ +T:{id:"thermal:potato_block",Count:1b} diff --git a/config/jei/ingredient-list-mod-sort-order.ini b/config/jei/ingredient-list-mod-sort-order.ini index 8ab4f95..144bdfd 100644 --- a/config/jei/ingredient-list-mod-sort-order.ini +++ b/config/jei/ingredient-list-mod-sort-order.ini @@ -4,7 +4,6 @@ AE2 Extras Additional Lights Apotheosis Applied Energistics 2 -Ars Nouveau Astral Sorcery Biomes O' Plenty Blood Magic @@ -114,5 +113,3 @@ ValkyrieLib Waystones Wither Skeleton Tweaks XNet -FTB Quests -Item Filters diff --git a/config/jei/recipe-category-sort-order.ini b/config/jei/recipe-category-sort-order.ini index 268d6c6..579d165 100644 --- a/config/jei/recipe-category-sort-order.ini +++ b/config/jei/recipe-category-sort-order.ini @@ -13,8 +13,6 @@ apotheosis:spawner_modification appliedenergistics2:appliedenergistics2.inscriber appliedenergistics2:condenser appliedenergistics2:grinder -ars_nouveau:apparatus -ars_nouveau:glyph_recipe astralsorcery:altar_attunement astralsorcery:altar_constellation astralsorcery:altar_discovery diff --git a/config/quark-common.toml b/config/quark-common.toml index 3903ae4..bf57f7c 100644 --- a/config/quark-common.toml +++ b/config/quark-common.toml @@ -1729,6 +1729,8 @@ Stonelings = true Foxhound = true Toretoise = true + Forgotten = true + Wraith = true [mobs.stonelings] "Cautious Stonelings" = true @@ -1867,6 +1869,35 @@ "Biome Categories" = ["swamp"] "Is Blacklist" = false + [mobs.forgotten] + # + #1 in this many Skeletons that spawn under the threshold are replaced with Forgotten. + "Forgotten Spawn Rate" = 0.05 + "Max Height For Spawn" = 20 + + [mobs.wraith] + # + #List of sound sets to use with wraiths. + #Three sounds must be provided per entry, separated by | (in the format idle|hurt|death). Leave blank for no sound (i.e. if a mob has no ambient noise) + "Wraith Sounds" = ["entity.sheep.ambient|entity.sheep.hurt|entity.sheep.death", "entity.cow.ambient|entity.cow.hurt|entity.cow.death", "entity.pig.ambient|entity.pig.hurt|entity.pig.death", "entity.chicken.ambient|entity.chicken.hurt|entity.chicken.death", "entity.horse.ambient|entity.horse.hurt|entity.horse.death", "entity.cat.ambient|entity.cat.hurt|entity.cat.death", "entity.wolf.ambient|entity.wolf.hurt|entity.wolf.death", "entity.villager.ambient|entity.villager.hurt|entity.villager.death", "entity.polar_bear.ambient|entity.polar_bear.hurt|entity.polar_bear.death", "entity.zombie.ambient|entity.zombie.hurt|entity.zombie.death", "entity.skeleton.ambient|entity.skeleton.hurt|entity.skeleton.death", "entity.spider.ambient|entity.spider.hurt|entity.spider.death", "|entity.creeper.hurt|entity.creeper.death", "entity.endermen.ambient|entity.endermen.hurt|entity.endermen.death", "entity.zombie_pig.ambient|entity.zombie_pig.hurt|entity.zombie_pig.death", "entity.witch.ambient|entity.witch.hurt|entity.witch.death", "entity.blaze.ambient|entity.blaze.hurt|entity.blaze.death", "entity.llama.ambient|entity.llama.hurt|entity.llama.death", "|quark:entity.stoneling.cry|quark:entity.stoneling.die", "quark:entity.frog.idle|quark:entity.frog.hurt|quark:entity.frog.die"] + + [mobs.wraith.spawn_config] + "Max Cost" = 0.7 + "Spawn Cost" = 0.15 + # + #Allowed values: (0,) + "Spawn Weight" = 8 + # + #Allowed values: [1,) + "Min Group Size" = 1 + # + #Allowed values: [1,) + "Max Group Size" = 3 + + [mobs.wraith.spawn_config.biomes] + Biomes = ["minecraft:soul_sand_valley"] + "Is Blacklist" = false + [client] "Greener Grass" = true "Variant Animal Textures" = true diff --git a/config/sidebar_buttons.json b/config/sidebar_buttons.json index 8be0b03..411cd36 100644 --- a/config/sidebar_buttons.json +++ b/config/sidebar_buttons.json @@ -1,7 +1,4 @@ { - "ftbquests": { - "quests": true - }, "ftbguilibrary": { "toggle.gamemode": true, "toggle.rain": true, diff --git a/config/worldedit/worldedit.properties b/config/worldedit/worldedit.properties index 1b02f36..253882d 100644 --- a/config/worldedit/worldedit.properties +++ b/config/worldedit/worldedit.properties @@ -1,11 +1,11 @@ #Don't put comments; they get removed -#Fri Jan 29 23:33:25 CET 2021 +#Sun Jan 31 10:53:58 CET 2021 default-locale=default super-pickaxe-many-drop-items=true max-calculation-timeout=300 super-pickaxe-drop-items=true -snapshots-experimental=false craftscript-dir=craftscripts +snapshots-experimental=false max-brush-radius=6 scripting-timeout=3000 butcher-max-radius=-1 @@ -34,11 +34,11 @@ default-vertical-height=256 max-changed-blocks=-1 default-max-changed-blocks=-1 max-polyhedron-points=20 -extended-y-limit=false allow-symbolic-links=false +extended-y-limit=false calculation-timeout=100 -use-in-creative=false disallowed-blocks=minecraft\:oak_sapling,minecraft\:jungle_sapling,minecraft\:dark_oak_sapling,minecraft\:spruce_sapling,minecraft\:birch_sapling,minecraft\:acacia_sapling,minecraft\:black_bed,minecraft\:blue_bed,minecraft\:brown_bed,minecraft\:cyan_bed,minecraft\:gray_bed,minecraft\:green_bed,minecraft\:light_blue_bed,minecraft\:light_gray_bed,minecraft\:lime_bed,minecraft\:magenta_bed,minecraft\:orange_bed,minecraft\:pink_bed,minecraft\:purple_bed,minecraft\:red_bed,minecraft\:white_bed,minecraft\:yellow_bed,minecraft\:powered_rail,minecraft\:detector_rail,minecraft\:grass,minecraft\:dead_bush,minecraft\:moving_piston,minecraft\:piston_head,minecraft\:sunflower,minecraft\:rose_bush,minecraft\:dandelion,minecraft\:poppy,minecraft\:brown_mushroom,minecraft\:red_mushroom,minecraft\:tnt,minecraft\:torch,minecraft\:fire,minecraft\:redstone_wire,minecraft\:wheat,minecraft\:potatoes,minecraft\:carrots,minecraft\:melon_stem,minecraft\:pumpkin_stem,minecraft\:beetroots,minecraft\:rail,minecraft\:lever,minecraft\:redstone_torch,minecraft\:redstone_wall_torch,minecraft\:repeater,minecraft\:comparator,minecraft\:stone_button,minecraft\:birch_button,minecraft\:acacia_button,minecraft\:dark_oak_button,minecraft\:jungle_button,minecraft\:oak_button,minecraft\:spruce_button,minecraft\:cactus,minecraft\:sugar_cane,minecraft\:bedrock +use-in-creative=false log-commands=false log-file= max-super-pickaxe-size=5 diff --git a/config[client]/appliedenergistics2-client.toml b/config[client]/appliedenergistics2-client.toml new file mode 100644 index 0000000..22f756e --- /dev/null +++ b/config[client]/appliedenergistics2-client.toml @@ -0,0 +1,59 @@ + +[client] + #Controls buttons on Level Emitter Screen + #Range: 1 ~ 9 + levelByStacks0 = 1 + #Controls buttons on Priority Screen + #Range: 1 ~ 99 + priorityByStacks1 = 10 + #Controls buttons on Priority Screen + #Range: 1 ~ 9 + priorityByStacks0 = 1 + #Controls buttons on Level Emitter Screen + #Range: 1 ~ 99 + levelByStacks1 = 10 + #Controls buttons on Level Emitter Screen + #Range: 1 ~ 999 + levelByStacks2 = 100 + #Controls buttons on Priority Screen + #Range: 1 ~ 9999 + priorityByStacks3 = 1000 + #Controls buttons on Priority Screen + #Range: 1 ~ 999 + priorityByStacks2 = 100 + #Controls buttons on Level Emitter Screen + #Range: 1 ~ 9999 + levelByStacks3 = 1000 + #TODO + useTerminalUseLargeFont = false + #TODO + disableColoredCableRecipesInJEI = true + #Controls buttons on Crafting Screen + #Range: 1 ~ 99 + craftByStacks1 = 10 + #Controls buttons on Crafting Screen + #Range: 1 ~ 9 + craftByStacks0 = 1 + #TODO + useColoredCraftingStatus = true + #Controls buttons on Crafting Screen + #Range: 1 ~ 9999 + craftByStacks3 = 1000 + #Controls buttons on Crafting Screen + #Range: 1 ~ 999 + craftByStacks2 = 100 + #TODO + enableEffects = true + #Power unit shown in AE UIs + #Allowed Values: AE, EU, RF + PowerUnit = "AE" + +[terminals] + #Allowed Values: TALL, FULL, SMALL + terminalStyle = "TALL" + #Allowed Values: AUTOSEARCH, AUTOSEARCH_KEEP, MANUAL_SEARCH, MANUAL_SEARCH_KEEP, JEI_AUTOSEARCH, JEI_AUTOSEARCH_KEEP, JEI_MANUAL_SEARCH, JEI_MANUAL_SEARCH_KEEP + terminalSearchMode = "MANUAL_SEARCH" + #Should tooltips be searched. Performance impact + #Allowed Values: YES, NO, UNDECIDED + searchTooltips = "YES" + diff --git a/config[common]/quark-common.toml b/config[common]/quark-common.toml index 3903ae4..bf57f7c 100644 --- a/config[common]/quark-common.toml +++ b/config[common]/quark-common.toml @@ -1729,6 +1729,8 @@ Stonelings = true Foxhound = true Toretoise = true + Forgotten = true + Wraith = true [mobs.stonelings] "Cautious Stonelings" = true @@ -1867,6 +1869,35 @@ "Biome Categories" = ["swamp"] "Is Blacklist" = false + [mobs.forgotten] + # + #1 in this many Skeletons that spawn under the threshold are replaced with Forgotten. + "Forgotten Spawn Rate" = 0.05 + "Max Height For Spawn" = 20 + + [mobs.wraith] + # + #List of sound sets to use with wraiths. + #Three sounds must be provided per entry, separated by | (in the format idle|hurt|death). Leave blank for no sound (i.e. if a mob has no ambient noise) + "Wraith Sounds" = ["entity.sheep.ambient|entity.sheep.hurt|entity.sheep.death", "entity.cow.ambient|entity.cow.hurt|entity.cow.death", "entity.pig.ambient|entity.pig.hurt|entity.pig.death", "entity.chicken.ambient|entity.chicken.hurt|entity.chicken.death", "entity.horse.ambient|entity.horse.hurt|entity.horse.death", "entity.cat.ambient|entity.cat.hurt|entity.cat.death", "entity.wolf.ambient|entity.wolf.hurt|entity.wolf.death", "entity.villager.ambient|entity.villager.hurt|entity.villager.death", "entity.polar_bear.ambient|entity.polar_bear.hurt|entity.polar_bear.death", "entity.zombie.ambient|entity.zombie.hurt|entity.zombie.death", "entity.skeleton.ambient|entity.skeleton.hurt|entity.skeleton.death", "entity.spider.ambient|entity.spider.hurt|entity.spider.death", "|entity.creeper.hurt|entity.creeper.death", "entity.endermen.ambient|entity.endermen.hurt|entity.endermen.death", "entity.zombie_pig.ambient|entity.zombie_pig.hurt|entity.zombie_pig.death", "entity.witch.ambient|entity.witch.hurt|entity.witch.death", "entity.blaze.ambient|entity.blaze.hurt|entity.blaze.death", "entity.llama.ambient|entity.llama.hurt|entity.llama.death", "|quark:entity.stoneling.cry|quark:entity.stoneling.die", "quark:entity.frog.idle|quark:entity.frog.hurt|quark:entity.frog.die"] + + [mobs.wraith.spawn_config] + "Max Cost" = 0.7 + "Spawn Cost" = 0.15 + # + #Allowed values: (0,) + "Spawn Weight" = 8 + # + #Allowed values: [1,) + "Min Group Size" = 1 + # + #Allowed values: [1,) + "Max Group Size" = 3 + + [mobs.wraith.spawn_config.biomes] + Biomes = ["minecraft:soul_sand_valley"] + "Is Blacklist" = false + [client] "Greener Grass" = true "Variant Animal Textures" = true diff --git a/config[common]/sidebar_buttons.json b/config[common]/sidebar_buttons.json new file mode 100644 index 0000000..411cd36 --- /dev/null +++ b/config[common]/sidebar_buttons.json @@ -0,0 +1,11 @@ +{ + "ftbguilibrary": { + "toggle.gamemode": true, + "toggle.rain": true, + "toggle.day": true, + "toggle.night": true + }, + "ftbchunks": { + "chunks": true + } +} \ No newline at end of file diff --git a/kubejs/assets/kubejs/textures/blocks/aluminum_ore_deposit.png b/kubejs/assets/kubejs/textures/blocks/aluminum_ore_deposit.png new file mode 100644 index 0000000..e64c56a Binary files /dev/null and b/kubejs/assets/kubejs/textures/blocks/aluminum_ore_deposit.png differ diff --git a/kubejs/assets/kubejs/textures/blocks/coal_ore_deposit.png b/kubejs/assets/kubejs/textures/blocks/coal_ore_deposit.png new file mode 100644 index 0000000..8464d1e Binary files /dev/null and b/kubejs/assets/kubejs/textures/blocks/coal_ore_deposit.png differ diff --git a/kubejs/assets/kubejs/textures/blocks/copper_ore_deposit.png b/kubejs/assets/kubejs/textures/blocks/copper_ore_deposit.png new file mode 100644 index 0000000..dcef952 Binary files /dev/null and b/kubejs/assets/kubejs/textures/blocks/copper_ore_deposit.png differ diff --git a/kubejs/assets/kubejs/textures/blocks/diamond_ore_deposit.png b/kubejs/assets/kubejs/textures/blocks/diamond_ore_deposit.png new file mode 100644 index 0000000..ee792c2 Binary files /dev/null and b/kubejs/assets/kubejs/textures/blocks/diamond_ore_deposit.png differ diff --git a/kubejs/assets/kubejs/textures/blocks/emerald_ore_deposit.png b/kubejs/assets/kubejs/textures/blocks/emerald_ore_deposit.png new file mode 100644 index 0000000..fe5f83a Binary files /dev/null and b/kubejs/assets/kubejs/textures/blocks/emerald_ore_deposit.png differ diff --git a/kubejs/assets/kubejs/textures/blocks/gold_ore_deposit.png b/kubejs/assets/kubejs/textures/blocks/gold_ore_deposit.png new file mode 100644 index 0000000..1dd3e2a Binary files /dev/null and b/kubejs/assets/kubejs/textures/blocks/gold_ore_deposit.png differ diff --git a/kubejs/assets/kubejs/textures/blocks/iron_ore_deposit.png b/kubejs/assets/kubejs/textures/blocks/iron_ore_deposit.png new file mode 100644 index 0000000..494cdb6 Binary files /dev/null and b/kubejs/assets/kubejs/textures/blocks/iron_ore_deposit.png differ diff --git a/kubejs/assets/kubejs/textures/blocks/lapis_ore_deposit.png b/kubejs/assets/kubejs/textures/blocks/lapis_ore_deposit.png new file mode 100644 index 0000000..e70e1dd Binary files /dev/null and b/kubejs/assets/kubejs/textures/blocks/lapis_ore_deposit.png differ diff --git a/kubejs/assets/kubejs/textures/blocks/lead_ore_deposit.png b/kubejs/assets/kubejs/textures/blocks/lead_ore_deposit.png new file mode 100644 index 0000000..231a82f Binary files /dev/null and b/kubejs/assets/kubejs/textures/blocks/lead_ore_deposit.png differ diff --git a/kubejs/assets/kubejs/textures/blocks/nickel_ore_deposit.png b/kubejs/assets/kubejs/textures/blocks/nickel_ore_deposit.png new file mode 100644 index 0000000..da4d925 Binary files /dev/null and b/kubejs/assets/kubejs/textures/blocks/nickel_ore_deposit.png differ diff --git a/kubejs/assets/kubejs/textures/blocks/redstone_ore_deposit.png b/kubejs/assets/kubejs/textures/blocks/redstone_ore_deposit.png new file mode 100644 index 0000000..a0d7d2e Binary files /dev/null and b/kubejs/assets/kubejs/textures/blocks/redstone_ore_deposit.png differ diff --git a/kubejs/assets/kubejs/textures/blocks/silver_ore_deposit.png b/kubejs/assets/kubejs/textures/blocks/silver_ore_deposit.png new file mode 100644 index 0000000..a1934a3 Binary files /dev/null and b/kubejs/assets/kubejs/textures/blocks/silver_ore_deposit.png differ diff --git a/kubejs/assets/kubejs/textures/blocks/tin_ore_deposit.png b/kubejs/assets/kubejs/textures/blocks/tin_ore_deposit.png new file mode 100644 index 0000000..24a553e Binary files /dev/null and b/kubejs/assets/kubejs/textures/blocks/tin_ore_deposit.png differ diff --git a/kubejs/assets/kubejs/textures/blocks/uranium_ore_deposit.png b/kubejs/assets/kubejs/textures/blocks/uranium_ore_deposit.png new file mode 100644 index 0000000..3e656d9 Binary files /dev/null and b/kubejs/assets/kubejs/textures/blocks/uranium_ore_deposit.png differ diff --git a/kubejs/client_scripts/jei_hide_items.js b/kubejs/client_scripts/jei_hide_items.js new file mode 100644 index 0000000..4569dc3 --- /dev/null +++ b/kubejs/client_scripts/jei_hide_items.js @@ -0,0 +1,3 @@ +events.listen('jei.hide.items', (event) => { + event.hide('#appliedenergistics2:facade'); +}); \ No newline at end of file diff --git a/kubejs/client_scripts/script.js b/kubejs/client_scripts/script.js index ceb40ba..d8b1a2d 100644 --- a/kubejs/client_scripts/script.js +++ b/kubejs/client_scripts/script.js @@ -1,8 +1 @@ -// priority: 0 - -console.info('Hello, World! (You will see this line every time client resources reload)') - -onEvent('jei.hide.items', event => { - // Hide items in JEI here - // event.hide('minecraft:cobblestone') -}) \ No newline at end of file +// priority: 0 \ No newline at end of file diff --git a/kubejs/server_scripts/constants.js b/kubejs/server_scripts/constants.js deleted file mode 100644 index e69de29..0000000 diff --git a/kubejs/server_scripts/fellies/kubejs/functions.js b/kubejs/server_scripts/fellies/kubejs/functions.js new file mode 100644 index 0000000..f318fde --- /dev/null +++ b/kubejs/server_scripts/fellies/kubejs/functions.js @@ -0,0 +1,94 @@ +const air = 'minecraft:air'; + +function unificationBlacklistEntry(material, type) { + return { material: material, type: type }; +} + +function entryIsBlacklisted(material, type) { + for (var i = 0; i < unificationBlacklist.length; i++) { + if (unificationBlacklist[i].material === material && unificationBlacklist[i].type === type) { + return true; + } + } + return false; +} + +function getPreferredItemInTag(tag) { + const pref = wrapArray(tag.stacks).sort(({ mod: a }, { mod: b }) => compareIndices(a, b, tag))[0] || item.of(air); + return pref; +} + +function compareIndices(a, b, tag) { + if (a == b) return 0; // iff a == b, they'll be found at the same position in modPriorities + + for (let mod of modPriorities) { + if (mod == a) return -1; // if a comes before b, then idx(a) < idx(b), so -1 + if (mod == b) return 1; // if a comes after b, then idx(a) > idx(b), so 1 + } + + console.error('[' + a + ', ' + b + '] were both unaccounted for in mod unification' + (tag ? ' for ' + tag : '!')); + return 0; +} + +function wrapArray(array) { + return utils.listOf(array).toArray(); +} + +function tagIsEmpty(tag) { + return getPreferredItemInTag(ingredient.of(tag)).id == air; +} + +function gear_unification(event, material, ingot, gem, gear) { + if (gear == air) { + return; + } + + var output = gear, + input, + mold = 'immersiveengineering:mold_gear'; + + if (ingot != air) { + input = '#forge:ingots/' + material; + } else if (gem != air) { + input = '#forge:gems/' + material; + } else { + return; + } + + event.recipes.immersiveengineering.metal_press(output, ingredient.of(input, 4), mold); + event.shaped(gear, [' B ', 'BAB', ' B '], { + A: '#forge:nuggets/iron', + B: input + }); +} + +function rod_unification(event, material, ingot, gem, rod) { + if (rod == air) { + return; + } + + event.remove({ type: 'minecraft:crafting_shaped', output: rod }); + + var output = item.of(rod, 2), + input, + mold = 'immersiveengineering:mold_rod'; + + if (ingot != air) { + input = '#forge:ingots/' + material; + } else if (gem != air) { + input = '#forge:gems/' + material; + } else { + return; + } + + event.recipes.thermal.press(output, [input, mold]).energy(2400); + event.recipes.immersiveengineering.metal_press(output, input, mold); + event.shaped(output, [' A ', ' A ', ' '], { + A: input + }); +} + +const unificationBlacklist = [ + unificationBlacklistEntry('quartz', 'gem'), + unificationBlacklistEntry('quartz', 'storage_block') +]; \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/globals.js b/kubejs/server_scripts/fellies/kubejs/globals.js new file mode 100644 index 0000000..b349cc1 --- /dev/null +++ b/kubejs/server_scripts/fellies/kubejs/globals.js @@ -0,0 +1,95 @@ +const materialsToUnify = [ + 'iron', + 'gold', + 'copper', + 'silver', + 'zinc', + 'brass', + 'lead', + 'tin', + 'compressed_iron', + 'nickel', + 'aluminum', + 'uranium', + 'bronze', + 'electrum', + 'constantan', + 'steel', + 'osmium', + 'diamond', + 'lapis', + 'emerald', + 'quartz', + 'coal', + 'charcoal', + 'obsidian', + 'ender', + 'fluix', + 'saltpeter', + 'fluorite', + 'invar', + 'signalum', + 'lumium', + 'enderium', + 'sulfur', + 'cinnabar', + 'niter', + 'potassium_nitrate', + 'saltpeter', + 'apatite', + 'bitumen', + 'redstone', + 'glowstone', + 'arcane', + 'mana', + 'certus_quartz', + 'charged_certus_quartz', + 'iesnium', + 'dimensional', + 'cloggrum', + 'froststeel', + 'regalium', + 'utherium', + 'coal_coke', + 'starmetal' +]; + +const typesToUnify = [ + 'nugget', + 'ingot', + 'gem', + 'storage_block', + 'ore', + 'dust', + 'gear', + 'plate', + 'rod' +]; + +const modPriorities = [ + 'emendatusenigmatica', + 'minecraft', + 'immersiveengineering', + 'thermal', + 'mekanism', + 'jaopca', + 'kubejs', + 'pneumaticcraft', + 'create', + 'occultism', + 'tmechworks', + 'industrialforegoing', + 'botania', + 'quark', + 'pedestals', + 'refinedstorage', + 'mapperbase', + 'bloodmagic', + 'eidolon', + 'morevanillalib', + 'titanium' +]; + +global.materialsToUnify = materialsToUnify; +global.typesToUnify = typesToUnify; +global.modPriorities = modPriorities; \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/remove.js b/kubejs/server_scripts/fellies/kubejs/recipes/remove.js new file mode 100644 index 0000000..a801b73 --- /dev/null +++ b/kubejs/server_scripts/fellies/kubejs/recipes/remove.js @@ -0,0 +1,77 @@ +events.listen('recipes', (event) => { + // Additional Lights + event.remove({output: 'additional_lights:fire_for_standing_torch_s'}); + event.remove({output: 'additional_lights:fire_for_standing_torch_l'}); + event.remove({output: 'additional_lights:fire_for_fire_pit_s'}); + event.remove({output: 'additional_lights:fire_for_fire_pit_l'}); + event.remove({output: 'additional_lights:soul_fire_for_standing_torch_s'}); + event.remove({output: 'additional_lights:soul_fire_for_standing_torch_l'}); + event.remove({output: 'additional_lights:soul_fire_for_fire_pit_s'}); + event.remove({output: 'additional_lights:soul_fire_for_fire_pit_l'}); + + // Environmental Core + event.remove({input: 'envirocore:aethium', output: 'envirocore:aethium'}); + event.remove({input: 'envirocore:litherite', output: 'envirocore:litherite'}); + + // Extra Storage + event.remove({id: 'extrastorage:part/storagepart_256k'}); + event.remove({id: 'extrastorage:part/storagepart_1024k'}); + event.remove({id: 'extrastorage:part/storagepart_4096k'}); + event.remove({id: 'extrastorage:part/storagepart_16384k'}); + event.remove({id: 'extrastorage:part/storagepart_16384k_fluid'}); + event.remove({id: 'extrastorage:part/storagepart_65536k_fluid'}); + event.remove({id: 'extrastorage:part/storagepart_262144k_fluid'}); + event.remove({id: 'extrastorage:part/storagepart_1048576k_fluid'}); + event.remove({id: 'extrastorage:disk/shaped/disk_256k'}); + event.remove({id: 'extrastorage:disk/shaped/disk_1024k'}); + event.remove({id: 'extrastorage:disk/shaped/disk_4096k'}); + event.remove({id: 'extrastorage:disk/shaped/disk_16384k'}); + event.remove({id: 'extrastorage:disk/shaped/disk_16384k_fluid'}); + event.remove({id: 'extrastorage:disk/shaped/disk_65536k_fluid'}); + event.remove({id: 'extrastorage:disk/shaped/disk_262144k_fluid'}); + event.remove({id: 'extrastorage:disk/shaped/disk_1048576k_fluid'}); + event.remove({id: 'extrastorage:disk/shapeless/disk_256k'}); + event.remove({id: 'extrastorage:disk/shapeless/disk_1024k'}); + event.remove({id: 'extrastorage:disk/shapeless/disk_4096k'}); + event.remove({id: 'extrastorage:disk/shapeless/disk_16384k'}); + event.remove({id: 'extrastorage:disk/shapeless/disk_16384k_fluid'}); + event.remove({id: 'extrastorage:disk/shapeless/disk_65536k_fluid'}); + event.remove({id: 'extrastorage:disk/shapeless/disk_262144k_fluid'}); + event.remove({id: 'extrastorage:disk/shapeless/disk_1048576k_fluid'}); + + + // Iron Rods + event.remove({id: 'immersiveengineering:crafting/stick_iron'}); + + // Mekanism + event.remove({id: 'mekanism:storage_blocks/charcoal'}); + + // Pams + event.remove({id: 'pamhc2foodextended:pralinesitem'}); + + // Thermal Series + event.remove({id: 'thermal:parts/emerald_gear'}); + event.remove({id: 'thermal:storage/bamboo_block'}); + event.remove({id: 'thermal:storage/gunpowder_block'}); + event.remove({id: 'thermal:storage/sugar_cane_block'}); + event.remove({id: 'thermal:storage/beetroot_block'}); + event.remove({id: 'thermal:storage/apple_block'}); + event.remove({id: 'thermal:storage/potato_block'}); + event.remove({id: 'thermal:storage/carrot_block'}); + event.remove({id: 'thermal:storage/charcoal_block'}); + event.remove({id: 'thermal:storage/sawdust_block'}); + event.remove({id: 'thermal:machine/press/packing3x3/press_bamboo_packing'}); + event.remove({id: 'thermal:machine/press/packing3x3/press_gunpowder_packing'}); + event.remove({id: 'thermal:machine/press/packing3x3/press_sugar_cane_packing'}); + event.remove({id: 'thermal:machine/press/packing3x3/press_beetroot_packing'}); + event.remove({id: 'thermal:machine/press/packing3x3/press_apple_packing'}); + event.remove({id: 'thermal:machine/press/packing3x3/press_potato_packing'}); + event.remove({id: 'thermal:machine/press/packing3x3/press_carrot_packing'}); + event.remove({id: 'thermal:machine/press/packing3x3/press_charcoal_packing'}); + event.remove({id: 'thermal:machine/press/packing3x3/press_sawdust_packing'}); + + // Xreliquary + event.remove({id: 'xreliquary:items/uncrafting/redstone'}); + event.remove({id: 'xreliquary:items/uncrafting/gunpowder_witch_hat'}); + event.remove({id: 'xreliquary:items/uncrafting/glowstone_dust'}); +}); \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/replace.js b/kubejs/server_scripts/fellies/kubejs/recipes/replace.js new file mode 100644 index 0000000..ea2d2d6 --- /dev/null +++ b/kubejs/server_scripts/fellies/kubejs/recipes/replace.js @@ -0,0 +1,11 @@ +events.listen('recipes', (event) => { + // Immersive Engineering + // event.replaceInput({}, '#minecraft:planks', 'minecraft:gold_nugget'); + // event.replaceOutput({}, 'minecraft:stick', 'minecraft:oak_sapling'); + + // Extra Storage + // event.replaceInput({}, 'extrastorage:storagepart_256k', 'extradisks:256k_storage_part'); + // event.replaceInput({}, 'extrastorage:storagepart_1024k', 'extradisks:1024k_storage_part'); + // event.replaceInput({}, 'extrastorage:storagepart_4096k', 'extradisks:4096k_storage_part'); + // event.replaceInput({}, 'extrastorage:storagepart_16384k', 'extradisks:16384k_storage_part'); +}); \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/shaped.js b/kubejs/server_scripts/fellies/kubejs/recipes/shaped.js new file mode 100644 index 0000000..de82b06 --- /dev/null +++ b/kubejs/server_scripts/fellies/kubejs/recipes/shaped.js @@ -0,0 +1,27 @@ +events.listen('recipes', (event) => { + // Xreliquary + event.shaped(Item.of('minecraft:glowstone_dust', 6), [ + 'H ', + ' H ', + ' H' + ], { + H: 'xreliquary:witch_hat' + }); + + event.shaped(Item.of('minecraft:gunpowder', 6), [ + ' H ', + ' H ', + ' H ' + ], { + H: 'xreliquary:witch_hat' + }); + + event.shaped(Item.of('minecraft:redstone', 6), [ + 'H ', + ' H ', + 'H ' + ], { + H: 'xreliquary:witch_hat' + }); +}); + diff --git a/kubejs/server_scripts/recipes/shapeless.js b/kubejs/server_scripts/fellies/kubejs/recipes/shapeless.js similarity index 100% rename from kubejs/server_scripts/recipes/shapeless.js rename to kubejs/server_scripts/fellies/kubejs/recipes/shapeless.js diff --git a/kubejs/server_scripts/settings.js b/kubejs/server_scripts/fellies/kubejs/settings.js similarity index 100% rename from kubejs/server_scripts/settings.js rename to kubejs/server_scripts/fellies/kubejs/settings.js diff --git a/kubejs/server_scripts/tags/fellies.js b/kubejs/server_scripts/fellies/kubejs/tags/fellies.js similarity index 100% rename from kubejs/server_scripts/tags/fellies.js rename to kubejs/server_scripts/fellies/kubejs/tags/fellies.js diff --git a/kubejs/server_scripts/fellies/kubejs/unification/additions.js b/kubejs/server_scripts/fellies/kubejs/unification/additions.js new file mode 100644 index 0000000..a3cc367 --- /dev/null +++ b/kubejs/server_scripts/fellies/kubejs/unification/additions.js @@ -0,0 +1,844 @@ +//priority: 900 +events.listen('recipes', function (event) { + materialsToUnify.forEach(function (material) { + var ore = getPreferredItemInTag(ingredient.of('#forge:ores/' + material)).id; + var ingot = getPreferredItemInTag(ingredient.of('#forge:ingots/' + material)).id; + var gem = getPreferredItemInTag(ingredient.of('#forge:gems/' + material)).id; + + var crushedOre = getPreferredItemInTag(ingredient.of('#create:crushed_ores/' + material)).id; + var dust = getPreferredItemInTag(ingredient.of('#forge:dusts/' + material)).id; + + var plate = getPreferredItemInTag(ingredient.of('#forge:plates/' + material)).id; + var gear = getPreferredItemInTag(ingredient.of('#forge:gears/' + material)).id; + var rod = getPreferredItemInTag(ingredient.of('#forge:rods/' + material)).id; + var wire = getPreferredItemInTag(ingredient.of('#forge:wires/' + material)).id; + + gear_unification(event, material, ingot, gem, gear); + rod_unification(event, material, ingot, gem, rod); + + // astralsorcery_ore_processing_infuser(event, material, ore, ingot, gem); + + // bloodmagic_ore_processing_alchemy(event, material, ore, dust, gem); + // bloodmagic_ore_processing_arc(event, material, ore, dust, gem); + + // create_ore_processing_with_secondary_outputs(event, material, crushedOre); + // create_gem_processing(event, material, ore, gem, dust); + // create_ingot_gem_milling(event, material, ingot, dust, gem); + // create_press_plates(event, material, gem, plate); + + // emendatus_hammer_crushing(event, material, ore, dust); + + // immersiveengineering_gem_crushing(event, material, dust, gem); + // immersiveengineering_ingot_crushing(event, material, dust, ingot); + // immersiveengineering_ore_processing(event, material, ore, gem); + // immersiveengineering_press_plates(event, material, ingot, gem, plate); + + // occultism_ore_crushing(event, material, ore, dust, gem); + // occultism_ingot_gem_crushing(event, material, ingot, dust, gem); + + // pedestals_ore_crushing(event, material, ore, dust, gem); + // pedestals_ingot_gem_crushing(event, material, ingot, dust, gem); + + // thermal_press_wires(event, material, wire); + // thermal_press_plates(event, material, gem, plate); + }); + + // dyeSources.forEach((recipe) => { + // botania_dye_pestle_mortar(event, recipe); + // create_dye_milling(event, recipe); + // immersiveengineering_dye_crusher(event, recipe); + // mekanism_dye_enriching(event, recipe); + // pedestals_dye_crushing(event, recipe); + // thermal_dye_centrifuge(event, recipe); + // }); +}); + +// function getPreferredItemInTag(tag) { +// const pref = wrapArray(tag.stacks).sort(({ mod: a }, { mod: b }) => compareIndices(a, b, tag))[0] || item.of(air); +// // console.info('Preferred item: ' + tag + ' => ' + pref); +// return pref; +// } + +// function tagIsEmpty(tag) { +// return getPreferredItemInTag(ingredient.of(tag)).id == air; +// } + +// //material unification functions +// function gear_unification(event, material, ingot, gem, gear) { +// if (gear == air) { +// return; +// } + +// var output = gear, +// input, +// mold = 'immersiveengineering:mold_gear'; + +// if (ingot != air) { +// input = '#forge:ingots/' + material; +// } else if (gem != air) { +// input = '#forge:gems/' + material; +// } else { +// return; +// } + +// // Implemented by Thermal +// // event.recipes.thermal.press(gear, [item.of(gearInput, 4), 'thermal:press_gear_die']); + +// event.recipes.immersiveengineering.metal_press(output, ingredient.of(input, 4), mold); +// event.shaped(gear, [' B ', 'BAB', ' B '], { +// A: '#forge:nuggets/iron', +// B: input +// }); +// } + +// function rod_unification(event, material, ingot, gem, rod) { +// if (rod == air) { +// return; +// } + +// event.remove({ type: 'minecraft:crafting_shaped', output: rod }); + +// var output = item.of(rod, 2), +// input, +// mold = 'immersiveengineering:mold_rod'; + +// if (ingot != air) { +// input = '#forge:ingots/' + material; +// } else if (gem != air) { +// input = '#forge:gems/' + material; +// } else { +// return; +// } + +// event.recipes.thermal.press(output, [input, mold]).energy(2400); +// event.recipes.immersiveengineering.metal_press(output, input, mold); +// event.shaped(output, [' A ', ' A ', ' '], { +// A: input +// }); +// } + +// function astralsorcery_ore_processing_infuser(event, material, ore, ingot, gem) { +// if (ore == air) { +// return; +// } + +// blacklistedMaterials = ['redstone', 'lapis', 'emerald', 'diamond', 'iron']; +// for (var i = 0; i < blacklistedMaterials.length; i++) { +// if (blacklistedMaterials[i] == material) { +// return; +// } +// } + +// var input = 'forge:ores/' + material, +// output, +// count; +// if (gem != air) { +// output = gem; +// count = 5; +// } else if (ingot != air) { +// output = ingot; +// count = 3; +// } else { +// return; +// } + +// event.custom({ +// type: 'astralsorcery:infuser', +// fluidInput: 'astralsorcery:liquid_starlight', +// input: { +// tag: input +// }, +// output: { +// item: output, +// count: count +// }, +// consumptionChance: 0.1, +// duration: 100, +// consumeMultipleFluids: false, +// acceptChaliceInput: true, +// copyNBTToOutputs: false +// }); +// } + +// function bloodmagic_ore_processing_alchemy(event, material, ore, dust, gem) { +// if (ore == air || gem == air) { +// return; +// } + +// var inputs = ['#forge:ores/' + material, '#bloodmagic:arc/cuttingfluid'], +// output = item.of(gem, 2); + +// event.recipes.bloodmagic.alchemytable(output, inputs).syphon(400).ticks(200).upgradeLevel(1); +// } + +// function bloodmagic_ore_processing_arc(event, material, ore, dust, gem) { +// var data = { +// recipes: [] +// }; + +// if (ore != air && gem != air) { +// data.recipes.push({ +// input: '#forge:ores/' + material, +// output: item.of(gem, 5), +// addedOutput: [], +// tool: '#bloodmagic:arc/cuttingfluid' +// }); +// } + +// if (gem != air && dust != air) { +// data.recipes.push({ +// input: '#forge:gems/' + material, +// output: item.of(dust, 1), +// addedOutput: [], +// tool: '#bloodmagic:arc/explosive' +// }); +// } + +// data.recipes.forEach((recipe) => { +// event.recipes.bloodmagic +// .arc(recipe.output, recipe.input, recipe.tool, recipe.addedOutput) +// .consumeIngredient(false); +// }); +// } + +// function create_ore_processing_with_secondary_outputs(event, material, crushedOre) { +// if (crushedOre == air) { +// return; +// } + +// var primaryOutput = crushedOre, +// stoneOutput = 'minecraft:cobblestone', +// primaryCount = 2, +// secondaryCount = 2, +// secondaryMaterial, +// input = '#forge:ores/' + material, +// processingTime = 300; + +// switch (material) { +// case 'iron': +// secondaryMaterial = 'nickel'; +// processingTime = 400; +// break; +// case 'nickel': +// secondaryMaterial = 'iron'; +// processingTime = 350; +// break; +// case 'gold': +// secondaryMaterial = 'zinc'; +// break; +// case 'copper': +// secondaryMaterial = 'gold'; +// processingTime = 350; +// break; +// case 'aluminum': +// secondaryMaterial = 'iron'; +// break; +// case 'lead': +// secondaryMaterial = 'silver'; +// break; +// case 'silver': +// secondaryMaterial = 'lead'; +// break; +// case 'uranium': +// secondaryMaterial = 'lead'; +// processingTime = 400; +// break; +// case 'osmium': +// secondaryMaterial = 'tin'; +// processingTime = 400; +// break; +// case 'tin': +// secondaryMaterial = 'osmium'; +// processingTime = 350; +// break; +// case 'zinc': +// secondaryMaterial = 'gold'; +// processingTime = 350; +// break; +// case 'iesnium': +// secondaryMaterial = 'iesnium'; +// processingTime = 350; +// break; +// case 'cloggrum': +// secondaryMaterial = 'cloggrum'; +// processingTime = 350; +// break; +// case 'froststeel': +// secondaryMaterial = 'froststeel'; +// processingTime = 350; +// break; +// case 'regalium': +// secondaryMaterial = 'regalium'; +// processingTime = 350; +// break; +// case 'utherium': +// secondaryMaterial = 'utherium'; +// processingTime = 350; +// break; +// default: +// return; +// } + +// var secondaryOutput = getPreferredItemInTag(ingredient.of('#create:crushed_ores/' + secondaryMaterial)).id; +// var primaryChance = 0.25, +// secondaryChance = 0.05; + +// var outputs = [ +// item.of(primaryOutput), +// item.of(primaryOutput, primaryCount).withChance(primaryChance), +// item.of(secondaryOutput, secondaryCount).withChance(secondaryChance) +// ]; + +// event.recipes.create.milling(outputs, input).processingTime(processingTime); + +// primaryChance = 0.6; +// secondaryChance = 0.1; +// outputs = [ +// item.of(primaryOutput), +// item.of(primaryOutput, primaryCount).withChance(primaryChance), +// item.of(secondaryOutput, secondaryCount).withChance(secondaryChance), +// Item.of(stoneOutput).withChance(0.125) +// ]; +// event.recipes.create.crushing(outputs, input).processingTime(processingTime); +// } + +// function create_gem_processing(event, material, ore, gem, dust) { +// if (ore == air) { +// return; +// } + +// var stoneOutput = 'minecraft:cobblestone', +// processingTime = 300, +// output = gem, +// primaryCount, +// secondaryCount, +// input = '#forge:ores/' + material; + +// switch (material) { +// case 'redstone': +// primaryCount = 8; +// secondaryCount = 6; +// secondaryChance = 0.25; +// output = dust; +// break; +// case 'coal': +// primaryCount = 2; +// secondaryCount = 2; +// secondaryChance = 0.5; +// break; +// case 'diamond': +// primaryCount = 2; +// secondaryCount = 1; +// secondaryChance = 0.25; +// processingTime = 500; +// break; +// case 'emerald': +// primaryCount = 2; +// secondaryCount = 1; +// secondaryChance = 0.25; +// processingTime = 500; +// break; +// case 'lapis': +// primaryCount = 8; +// secondaryCount = 4; +// secondaryChance = 0.25; +// break; +// case 'quartz': +// primaryCount = 2; +// secondaryCount = 4; +// secondaryChance = 0.5; +// processingTime = 350; +// stoneOutput = 'minecraft:netherrack'; +// break; +// case 'sulfur': +// primaryCount = 6; +// secondaryCount = 2; +// secondaryChance = 0.25; +// break; +// case 'apatite': +// primaryCount = 8; +// secondaryCount = 4; +// secondaryChance = 0.25; +// break; +// case 'fluorite': +// primaryCount = 6; +// secondaryCount = 3; +// secondaryChance = 0.25; +// break; +// case 'dimensional': +// primaryCount = 6; +// secondaryCount = 3; +// secondaryChance = 0.25; +// break; +// default: +// return; +// } +// var outputs = [ +// item.of(output, primaryCount), +// item.of(output, secondaryCount).withChance(secondaryChance), +// Item.of(stoneOutput).withChance(0.125) +// ]; + +// event.recipes.create.crushing(outputs, input).processingTime(processingTime); +// } + +// function create_ingot_gem_milling(event, material, ingot, dust, gem) { +// if (dust == air) { +// return; +// } + +// var input, +// outputs = [item.of(dust, 1)], +// processingTime = 300; +// if (ingot != air) { +// input = '#forge:ingots/' + material; +// } else if (gem != air) { +// input = '#forge:gems/' + material; +// } else { +// return; +// } + +// event.recipes.create.milling(outputs, input).processingTime(processingTime); +// } + +// function create_press_plates(event, material, gem, plate) { +// if (plate == air || gem == air) { +// return; +// } + +// var output = plate; +// var input = '#forge:gems/' + material; + +// event.recipes.create.pressing(output, input); +// } + +// function emendatus_hammer_crushing(event, material, ore, dust) { +// if (ore == air || dust == air) { +// return; +// } + +// event.remove({ id: 'immersiveengineering:crafting/hammercrushing_' + material }); +// event.replaceInput( +// { id: 'emendatusenigmatica:dust_from_chunk/' + material }, +// 'emendatusenigmatica:' + material + '_chunk', +// '#forge:ores/' + material +// ); +// } + +// function immersiveengineering_gem_crushing(event, material, dust, gem) { +// if (gem == air || dust == air) { +// return; +// } + +// var output = dust, +// input = '#forge:gems/' + material; + +// event.recipes.immersiveengineering.crusher(output, input).energy(2000); +// } + +// function immersiveengineering_ingot_crushing(event, material, dust, ingot) { +// if (ingot == air || dust == air) { +// return; +// } + +// if (material == 'signalum' || material == 'lumium' || material == 'enderium') { +// var output = dust, +// input = '#forge:ingots/' + material; + +// event.recipes.immersiveengineering.crusher(output, input).energy(2000); +// } +// } + +// function immersiveengineering_ore_processing(event, material, ore, gem) { +// if (ore == air || gem == air) { +// return; +// } +// var count, +// input = '#forge:ores/' + material; + +// switch (material) { +// case 'sulfur': +// count = 6; +// break; +// case 'apatite': +// count = 12; +// break; +// case 'dimensional': +// count = 8; +// break; +// case 'mana': +// count = 2; +// break; +// case 'cinnabar': +// count = 2; +// break; +// case 'potassium_nitrate': +// count = 2; +// break; +// case 'bitumen': +// count = 2; +// break; +// default: +// return; +// } +// var output = item.of(gem, count); + +// event.recipes.immersiveengineering.crusher(output, input).energy(2000); +// } + +// function immersiveengineering_press_plates(event, material, ingot, gem, plate) { +// if (plate == air) { +// return; +// } + +// //var hammer = 'immersiveengineering:hammer'; +// //event.shapeless(plate, [hammer, ingot]); +// event.remove({ id: 'immersiveengineering:crafting/plate_' + material + '_hammering' }); + +// blacklistedMaterials = [ +// 'iron', +// 'gold', +// 'copper', +// 'aluminum', +// 'silver', +// 'lead', +// 'nickel', +// 'uranium', +// 'osmium', +// 'tin', +// 'zinc', +// 'bronze', +// 'brass', +// 'constantan', +// 'electrum', +// 'steel', +// 'invar' +// ]; + +// for (var i = 0; i < blacklistedMaterials.length; i++) { +// if (blacklistedMaterials[i] == material) { +// return; +// } +// } + +// var output = plate, +// mold = 'immersiveengineering:mold_plate'; +// if (ingot != air) { +// input = '#forge:ingots/' + material; +// } else if (gem != air) { +// input = '#forge:gems/' + material; +// } else { +// return; +// } + +// event.recipes.immersiveengineering.metal_press(output, input, mold).energy(2400); +// } + +// function occultism_ore_crushing(event, material, ore, dust, gem) { +// if (ore == air) { +// return; +// } + +// blacklistedMaterials = ['silver']; + +// for (var i = 0; i < blacklistedMaterials.length; i++) { +// if (blacklistedMaterials[i] == material) { +// return; +// } +// } + +// var count; +// switch (material) { +// case 'redstone': +// count = 6; +// break; +// case 'coal': +// count = 4; +// break; +// case 'lapis': +// count = 9; +// break; +// case 'quartz': +// count = 3; +// break; +// case 'sulfur': +// count = 6; +// break; +// case 'apatite': +// count = 12; +// break; +// case 'fluorite': +// count = 6; +// break; +// case 'dimensional': +// count = 8; +// break; +// default: +// count = 2; +// } + +// var output, +// input = 'forge:ores/' + material, +// output = dust; +// if (gem != air) { +// output = gem; +// } + +// event.custom({ +// type: 'occultism:crushing', +// ingredient: { +// tag: input +// }, +// result: { +// item: output, +// count: count +// }, +// crushing_time: 100 +// }); +// } + +// function occultism_ingot_gem_crushing(event, material, ingot, dust, gem) { +// if (dust == air) { +// return; +// } + +// blacklistedMaterials = ['silver']; + +// for (var i = 0; i < blacklistedMaterials.length; i++) { +// if (blacklistedMaterials[i] == material) { +// return; +// } +// } + +// var input, +// output = dust; +// if (ingot != air) { +// input = 'forge:ingots/' + material; +// } else if (gem != air) { +// input = 'forge:gems/' + material; +// } else { +// return; +// } + +// event.custom({ +// type: 'occultism:crushing', +// ingredient: { +// tag: input +// }, +// result: { +// item: output, +// count: 1 +// }, +// crushing_time: 100 +// }); +// } + +// function pedestals_ore_crushing(event, material, ore, dust, gem) { +// if (ore == air) { +// return; +// } +// var count; +// switch (material) { +// case 'redstone': +// count = 6; +// break; +// case 'coal': +// count = 4; +// break; +// case 'lapis': +// count = 9; +// break; +// case 'quartz': +// count = 3; +// break; +// case 'sulfur': +// count = 6; +// break; +// case 'apatite': +// count = 12; +// break; +// case 'fluorite': +// count = 6; +// break; +// case 'dimensional': +// count = 8; +// break; +// default: +// count = 2; +// } + +// var output, +// input = 'forge:ores/' + material, +// output = dust; +// if (gem != air) { +// output = gem; +// } + +// event.custom({ +// type: 'pedestals:pedestal_crushing', +// ingredient: { +// tag: input +// }, +// result: { +// item: output, +// count: count +// } +// }); +// event.remove({ +// id: 'pedestals:pedestal_crushing/dust' + material +// }); +// } + +// function pedestals_ingot_gem_crushing(event, material, ingot, dust, gem) { +// if (dust == air) { +// return; +// } + +// var input, +// output = dust; +// if (ingot != air) { +// input = 'forge:ingots/' + material; +// } else if (gem != air) { +// input = 'forge:gems/' + material; +// } else { +// return; +// } + +// event.custom({ +// type: 'pedestals:pedestal_crushing', +// ingredient: { +// tag: input +// }, +// result: { +// item: output, +// count: 1 +// } +// }); +// } + +// function thermal_press_plates(event, material, gem, plate) { +// if (plate == air || gem == air) { +// return; +// } + +// var output = plate; +// var input = '#forge:gems/' + material; + +// event.recipes.thermal.press(item.of(output), input); +// } + +// function thermal_press_wires(event, material, wire) { +// if (wire == air) { +// return; +// } + +// var output = item.of(wire, 2), +// input = '#forge:ingots/' + material, +// mold = 'immersiveengineering:mold_wire'; +// event.recipes.thermal.press(output, [input, mold]).energy(2400); +// } + +// //dye normalization functions +// function botania_dye_pestle_mortar(event, recipe) { +// if (recipe.type == 'petal') { +// return; +// } + +// var baseCount = 2, +// multiplier = 1; +// if (recipe.type == 'large') { +// multiplier = 2; +// } + +// var count = baseCount * multiplier, +// output = Item.of(recipe.primary, count), +// inputs = [recipe.input, 'botania:pestle_and_mortar']; + +// event.shapeless(output, inputs); +// } + +// function create_dye_milling(event, recipe) { +// var baseCount = 2, +// multiplier = 1; +// if (recipe.type == 'large') { +// multiplier = 2; +// } + +// var count = baseCount * multiplier, +// outputs = [ +// Item.of(recipe.primary, count), +// Item.of(recipe.secondary).withCount(count).withChance(0.25), +// Item.of(recipe.tertiary).withCount(multiplier).withChance(0.05) +// ], +// input = recipe.input; + +// event.recipes.create.milling(outputs, input); +// } +// function immersiveengineering_dye_crusher(event, recipe) { +// var baseCount = 2, +// multiplier = 1; +// if (recipe.type == 'large') { +// multiplier = 2; +// } +// var count = baseCount * multiplier, +// output = Item.of(recipe.primary, count), +// extras = [ +// Item.of(recipe.secondary).withCount(count).withChance(0.25), +// Item.of(recipe.tertiary).withCount(multiplier).withChance(0.05) +// ], +// input = recipe.input; + +// event.recipes.immersiveengineering.crusher(output, input, extras); +// } +// function mekanism_dye_enriching(event, recipe) { +// var baseCount = 3, +// multiplier = 1; +// if (recipe.type == 'large') { +// multiplier = 2; +// } + +// var count = baseCount * multiplier, +// output = Item.of(recipe.primary, count), +// input = recipe.input; + +// event.recipes.mekanism.enriching(output, input); +// } +// function pedestals_dye_crushing(event, recipe) { +// var baseCount = 2, +// multiplier = 1; +// if (recipe.type == 'large') { +// multiplier = 2; +// } + +// var count = baseCount * multiplier, +// output = recipe.primary, +// input = recipe.input; + +// event.custom({ +// type: 'pedestals:pedestal_crushing', +// ingredient: { +// item: input +// }, +// result: { +// item: output, +// count: count +// } +// }); +// } +// function thermal_dye_centrifuge(event, recipe) { +// var baseCount = 2, +// multiplier = 1; +// if (recipe.type == 'large') { +// multiplier = 2; +// } + +// var count = baseCount * multiplier, +// outputs = [ +// Item.of(recipe.primary, count), +// Item.of(recipe.secondary).withCount(count).withChance(0.25), +// Item.of(recipe.tertiary).withCount(multiplier).withChance(0.05) +// ], +// input = recipe.input; + +// event.recipes.thermal.centrifuge(outputs, input); +// } diff --git a/kubejs/server_scripts/fellies/kubejs/unification/unify_tags.js b/kubejs/server_scripts/fellies/kubejs/unification/unify_tags.js new file mode 100644 index 0000000..6b37b3e --- /dev/null +++ b/kubejs/server_scripts/fellies/kubejs/unification/unify_tags.js @@ -0,0 +1,16 @@ +events.listen('recipes', function (event) { + materialsToUnify.forEach(function (material) { + typesToUnify.forEach(function (type) { + if (!entryIsBlacklisted(material, type)) { + var tagString = '#forge:' + type + 's/' + material; + var tag = ingredient.of(tagString); + if (tag.stacks.size() > 1) { + var prefItem = getPreferredItemInTag(tag); + // console.log('Tag: ' + tag); + // console.log('Prefered item: ' + prefItem); + event.replaceOutput({}, tagString, prefItem); + } + } + }); + }); +}); \ No newline at end of file diff --git a/kubejs/server_scripts/functions.js b/kubejs/server_scripts/functions.js deleted file mode 100644 index e69de29..0000000 diff --git a/kubejs/server_scripts/player/first_start.js b/kubejs/server_scripts/player/first_start.js deleted file mode 100644 index 6d39196..0000000 --- a/kubejs/server_scripts/player/first_start.js +++ /dev/null @@ -1,6 +0,0 @@ -events.listen('player.logged_in', (event) => { - if (!event.hasGameStage('starting_items')) { - event.player.give(item.of('ftbquests:book')); - event.addGameStage('starting_items'); - } -}); \ No newline at end of file diff --git a/kubejs/server_scripts/recipes/remove.js b/kubejs/server_scripts/recipes/remove.js deleted file mode 100644 index 4131b34..0000000 --- a/kubejs/server_scripts/recipes/remove.js +++ /dev/null @@ -1,11 +0,0 @@ -events.listen('recipes', (event) => { - // Additional Lights - event.remove({output: 'additional_lights:fire_for_standing_torch_s'}); - event.remove({output: 'additional_lights:fire_for_standing_torch_l'}); - event.remove({output: 'additional_lights:fire_for_fire_pit_s'}); - event.remove({output: 'additional_lights:fire_for_fire_pit_l'}); - event.remove({output: 'additional_lights:soul_fire_for_standing_torch_s'}); - event.remove({output: 'additional_lights:soul_fire_for_standing_torch_l'}); - event.remove({output: 'additional_lights:soul_fire_for_fire_pit_s'}); - event.remove({output: 'additional_lights:soul_fire_for_fire_pit_l'}); -}); \ No newline at end of file diff --git a/kubejs/server_scripts/recipes/replace_output.js b/kubejs/server_scripts/recipes/replace_output.js deleted file mode 100644 index e69de29..0000000 diff --git a/kubejs/server_scripts/unification/additions.js b/kubejs/server_scripts/unification/additions.js deleted file mode 100644 index e69de29..0000000 diff --git a/kubejs[e6]/client_scripts/constants.js b/kubejs[e6]/client_scripts/constants.js new file mode 100644 index 0000000..fe9b532 --- /dev/null +++ b/kubejs[e6]/client_scripts/constants.js @@ -0,0 +1,306 @@ +//priority: 1000 + +const refinedStorageItems = [ + 'grid', + 'crafting_grid', + 'pattern_grid', + 'fluid_grid', + 'controller', + 'creative_controller', + 'network_receiver', + 'network_transmitter', + 'relay', + 'detector', + 'security_manager', + 'wireless_transmitter', + 'crafter', + 'crafting_monitor', + 'disk_manipulator', + 'crafter_manager' +]; +// Items added here will get recipes for Pedestals & Cobblegen Randomizer cobblegens. +const generatableCobblestone = [ + 'byg:dacite_cobblestone', + 'byg:ether_stone', + 'byg:red_rock', + 'byg:scoria_cobblestone', + 'byg:soapstone', + 'embellishcraft:basalt_cobblestone', + 'embellishcraft:gneiss_cobblestone', + 'embellishcraft:jade_cobblestone', + 'embellishcraft:larvikite_cobblestone', + 'embellishcraft:marble_cobblestone', + 'embellishcraft:slate_cobblestone', + 'create:andesite_cobblestone', + 'create:diorite_cobblestone', + 'create:granite_cobblestone', + 'quark:cobbedstone', + 'undergarden:depthrock', + 'undergarden:shiverstone', + 'create:dark_scoria_cobblestone', + 'create:scoria_cobblestone', + 'create:gabbro_cobblestone', + 'create:dolomite_cobblestone', + 'create:weathered_limestone_cobblestone', + 'create:limestone_cobblestone' +]; +// Items added here will get recipes for Pedestals & Cobblegen Randomizer stonegens. +const generatableStone = [ + 'minecraft:andesite', + 'minecraft:diorite', + 'minecraft:granite', + 'biomesoplenty:black_sandstone', + 'biomesoplenty:orange_sandstone', + 'biomesoplenty:white_sandstone', + 'byg:black_sandstone', + 'byg:blue_sandstone', + 'byg:dacite', + 'byg:purple_sandstone', + 'byg:pink_sandstone', + 'byg:scoria_stone', + 'byg:white_sandstone', + 'embellishcraft:basalt', + 'embellishcraft:gneiss', + 'embellishcraft:jade', + 'embellishcraft:larvikite', + 'embellishcraft:marble', + 'embellishcraft:slate', + 'minecraft:red_sandstone', + 'minecraft:sandstone', + 'quark:basalt', + 'quark:brimstone', + 'quark:jasper', + 'quark:limestone', + 'quark:marble', + 'quark:permafrost', + 'quark:slate', + 'astralsorcery:marble_raw', + 'create:dark_scoria', + 'create:scoria', + 'create:gabbro', + 'create:dolomite', + 'create:weathered_limestone', + 'create:limestone' +]; +const generatableBasalt = []; + +const colors = [ + 'cyan', + 'purple', + 'blue', + 'brown', + 'green', + 'red', + 'black', + 'white', + 'orange', + 'magenta', + 'light_blue', + 'yellow', + 'lime', + 'pink', + 'gray', + 'light_gray' +]; + +var itemsToHide = [ + 'ars_nouveau:arcane_brick', + 'ars_nouveau:arcane_ore', + 'bloodmagic:coalsand', + 'bloodmagic:saltpeter', + 'bloodmagic:sulfur', + 'create:powdered_obsidian', + 'create:honey_bucket', + 'eidolon:tallow', + 'immersiveengineering:dust_saltpeter', + 'immersiveengineering:dust_wood', + 'mapperbase:bitumen_ore', + 'mapperbase:iron_plate', + 'mapperbase:iron_rod', + 'mapperbase:raw_bitumen', + 'morevanillalib:obsidian_shard', + 'pedestals:dustflour', + 'powah:uraninite_ore', + 'powah:uraninite_ore_dense', + 'powah:uraninite_ore_poor', + 'powah:uraninite_raw', + 'powah:uraninite_raw_dense', + 'powah:uraninite_raw_poor', + 'quark:biotite', + 'quark:biotite_ore', + 'quark:tallow', + 'thermal:coal_coke', + 'thermal:coal_coke_block', + 'thermal:ender_pearl_dust', + 'thermal:sawdust', + 'supplementaries:pedestal', + 'supplementaries:crank', + 'supplementaries:cog_block', + 'supplementaries:redstone_illuminator', + 'supplementaries:turn_table', + 'supplementaries:jar', + 'supplementaries:jar_tinted', + 'supplementaries:firefly_jar', + 'supplementaries:stone_lamp', + 'supplementaries:sack', + 'supplementaries:blackboard' +]; + +var regexHide = [ + /emendatusenigmatica:\w+_andesite_ore/, + /emendatusenigmatica:\w+_gabbro_ore/, + /emendatusenigmatica:\w+_c_limestone_ore/, + /emendatusenigmatica:\w+_scoria_ore/, + /emendatusenigmatica:\w+_weathered_limestone_ore/, + /emendatusenigmatica:\w+_jasper_ore/, + /emendatusenigmatica:\w+_marble_ore/, + /emendatusenigmatica:\w+_slate_ore/, + /emendatusenigmatica:\w+_netherrack_ore/, + /emendatusenigmatica:\w+_blackstone_ore/, + /emendatusenigmatica:\w+_end_stone_ore/, + /emendatusenigmatica:\w+_mossy_stone_ore/, + /emendatusenigmatica:\w+_granite_ore/, + /emendatusenigmatica:\w+_diorite_ore/, + /emendatusenigmatica:\w+_sand_ore/, + /emendatusenigmatica:\w+_gravel_ore/, + /titanium:\w+_gear/, + /thermal:\w+_dust/, + /thermal:\w+_gear/, + /thermal:\w+_ingot/, + /thermal:\w+_nugget/, + /thermal:\w+_ore/, + /thermal:\w+_plate/, + /tmechworks:\w+_ingot/, + /tmechworks:\w+_nugget/, + /tmechworks:\w+_ore/, + /pedestals:dust/, + /mekanism:\w+_ore/, + /minecraft:\w+_ore/, + /immersiveengineering:plate_/, + /immersiveengineering:stick_/, + /create:\w+_sheet/, + /create:\w+_nugget/, + /create:\w+_ingot/, + /create:\w+_ore/, + /immersiveposts:stick_/, + /buildersaddition:\w+_rod/, + /eidolon:\w+_ore/, + /byg:pendorite/, + /byg:ametrine/, + /emendatusenigmatica:\w+certus/, + /emendatusenigmatica:\w+fluix/, + /mapperbase:steel/, + /rftoolsbase:dimensionalshard/ +]; + +const disabledItems = [ + 'aquaculture:wooden_fillet_knife', + 'aquaculture:stone_fillet_knife', + 'aquaculture:iron_fillet_knife', + 'aquaculture:gold_fillet_knife', + 'aquaculture:diamond_fillet_knife', + + 'bloodmagic:sand_netherite', + 'bloodmagic:gravel_netherite_scrap', + 'bloodmagic:fragment_netherite_scrap', + + 'byg:ametrine_block', + 'byg:ametrine_boots', + 'byg:ametrine_chestplate', + 'byg:ametrine_gems', + 'byg:ametrine_helmet', + 'byg:ametrine_horse_armor', + 'byg:ametrine_leggings', + 'byg:ametrine_ore', + 'byg:pendorite_axe', + 'byg:pendorite_battleaxe', + 'byg:pendorite_block', + 'byg:pendorite_hoe', + 'byg:pendorite_horse_armor', + 'byg:pendorite_ore', + 'byg:pendorite_pickaxe', + 'byg:pendorite_scraps', + 'byg:pendorite_shovel', + 'byg:pendorite_sword', + + 'mapperbase:steel_fence', + 'mapperbase:steel_axe', + 'mapperbase:steel_pickaxe', + 'mapperbase:steel_shovel', + 'mapperbase:steel_hoe', + 'mapperbase:steel_sword', + 'mapperbase:steel_helmet', + 'mapperbase:steel_chestplate', + 'mapperbase:steel_leggings', + 'mapperbase:steel_boots', + + 'mythicbotany:raindeletia', + 'mythicbotany:raindeletia_floating', + 'mythicbotany:wither_aconite', + 'mythicbotany:wither_aconite_floating', + + 'quark:pipe', + 'quark:potato_crate', + 'quark:beetroot_crate', + 'quark:carrot_crate', + + 'thermal:beetroot_block', + 'thermal:carrot_block', + 'thermal:potato_block', + 'thermal:sugar_cane_block' +]; +const materialsToUnify = [ + 'iron', + 'gold', + 'copper', + 'silver', + 'zinc', + 'brass', + 'lead', + 'tin', + 'compressed_iron', + 'nickel', + 'aluminum', + 'uranium', + 'bronze', + 'electrum', + 'constantan', + 'steel', + 'osmium', + 'diamond', + 'lapis', + 'emerald', + 'quartz', + 'coal', + 'charcoal', + 'obsidian', + 'ender', + 'fluix', + 'saltpeter', + 'fluorite', + 'invar', + 'signalum', + 'lumium', + 'enderium', + 'sulfur', + 'cinnabar', + 'niter', + 'potassium_nitrate', + 'saltpeter', + 'apatite', + 'bitumen', + 'redstone', + 'glowstone', + 'arcane', + 'mana', + 'certus_quartz', + 'charged_certus_quartz', + 'iesnium', + 'dimensional', + 'cloggrum', + 'froststeel', + 'regalium', + 'utherium', + 'coal_coke', + 'starmetal' +]; diff --git a/kubejs[e6]/client_scripts/global_constants.js b/kubejs[e6]/client_scripts/global_constants.js index f3a6260..0de8648 100644 --- a/kubejs[e6]/client_scripts/global_constants.js +++ b/kubejs[e6]/client_scripts/global_constants.js @@ -1,116 +1 @@ -//priority: 1001 - -const disabledItems = [ - 'aquaculture:wooden_fillet_knife', - 'aquaculture:stone_fillet_knife', - 'aquaculture:iron_fillet_knife', - 'aquaculture:gold_fillet_knife', - 'aquaculture:diamond_fillet_knife', - - 'bloodmagic:sand_netherite', - 'bloodmagic:gravel_netherite_scrap', - 'bloodmagic:fragment_netherite_scrap', - - 'byg:ametrine_block', - 'byg:ametrine_boots', - 'byg:ametrine_chestplate', - 'byg:ametrine_gems', - 'byg:ametrine_helmet', - 'byg:ametrine_horse_armor', - 'byg:ametrine_leggings', - 'byg:ametrine_ore', - 'byg:pendorite_axe', - 'byg:pendorite_battleaxe', - 'byg:pendorite_block', - 'byg:pendorite_hoe', - 'byg:pendorite_horse_armor', - 'byg:pendorite_ore', - 'byg:pendorite_pickaxe', - 'byg:pendorite_scraps', - 'byg:pendorite_shovel', - 'byg:pendorite_sword', - - 'mapperbase:steel_fence', - 'mapperbase:steel_axe', - 'mapperbase:steel_pickaxe', - 'mapperbase:steel_shovel', - 'mapperbase:steel_hoe', - 'mapperbase:steel_sword', - 'mapperbase:steel_helmet', - 'mapperbase:steel_chestplate', - 'mapperbase:steel_leggings', - 'mapperbase:steel_boots', - - 'mythicbotany:raindeletia', - 'mythicbotany:raindeletia_floating', - 'mythicbotany:wither_aconite', - 'mythicbotany:wither_aconite_floating', - - 'quark:pipe', - 'quark:potato_crate', - 'quark:beetroot_crate', - 'quark:carrot_crate', - - 'thermal:beetroot_block', - 'thermal:carrot_block', - 'thermal:potato_block', - 'thermal:sugar_cane_block' -]; -const materialsToUnify = [ - 'iron', - 'gold', - 'copper', - 'silver', - 'zinc', - 'brass', - 'lead', - 'tin', - 'compressed_iron', - 'nickel', - 'aluminum', - 'uranium', - 'bronze', - 'electrum', - 'constantan', - 'steel', - 'osmium', - 'diamond', - 'lapis', - 'emerald', - 'quartz', - 'coal', - 'charcoal', - 'obsidian', - 'ender', - 'fluix', - 'saltpeter', - 'fluorite', - 'invar', - 'signalum', - 'lumium', - 'enderium', - 'sulfur', - 'cinnabar', - 'niter', - 'potassium_nitrate', - 'saltpeter', - 'apatite', - 'bitumen', - 'redstone', - 'glowstone', - 'arcane', - 'mana', - 'certus_quartz', - 'charged_certus_quartz', - 'iesnium', - 'dimensional', - 'cloggrum', - 'froststeel', - 'regalium', - 'utherium', - 'coal_coke', - 'starmetal' -]; - -global.materialsToUnify = materialsToUnify; -global.disabledItems = disabledItems; +//TODO: Remove in 0.4.0 diff --git a/kubejs[e6]/client_scripts/item_modifiers/jei_descriptions.js b/kubejs[e6]/client_scripts/item_modifiers/jei_descriptions.js index 51bf5d0..1f9476f 100644 --- a/kubejs[e6]/client_scripts/item_modifiers/jei_descriptions.js +++ b/kubejs[e6]/client_scripts/item_modifiers/jei_descriptions.js @@ -10,6 +10,12 @@ events.listen('jei.information', (event) => { description: [ 'Obtained by left-clicking a Starmetal Ingot in-world. See the Astral Tome for more information.' ] + }, + { + item: 'buildinggadgets:construction_paste', + description: [ + 'Obtained by breaking a Dense Construction Block with a Pickaxe.' + ] } ] }; @@ -18,10 +24,28 @@ events.listen('jei.information', (event) => { event.add(item.item, item.description); }); - global.disabledItems.forEach((item) => { + disabledItems.forEach((item) => { event.add( item, "This item has been disabled, if you managed to obtain it please report it on Enigmatica 6's issue tracker: https://github.com/NillerMedDild/Enigmatica6/issues" ); }); + + refinedStorageItems.forEach((item) => { + event.add(`refinedstorage:${item}`, 'Can be dyed through crafting or by right clicking it with dye in-world.'); + }); + + generatableCobblestone.forEach((cobblestone) => { + event.add( + cobblestone, + 'Can be generated in a Vanilla Cobblestone Generator. The block below where the Cobblestone generates needs to be a Block of Iron.' + ); + }); + + generatableStone.forEach((stone) => { + event.add( + stone, + 'Can be generated in a Vanilla Stone Generator. The block below where the Stone generates needs to be a Block of Diamond.' + ); + }); }); diff --git a/kubejs[e6]/client_scripts/item_modifiers/jei_hide.js b/kubejs[e6]/client_scripts/item_modifiers/jei_hide.js index 2823060..0de8648 100644 --- a/kubejs[e6]/client_scripts/item_modifiers/jei_hide.js +++ b/kubejs[e6]/client_scripts/item_modifiers/jei_hide.js @@ -1,134 +1 @@ -events.listen('jei.hide.items', (event) => { - global.materialsToUnify.forEach((material) => { - if (material == 'iesnium' || material == 'graphite' || material == 'hop_graphite') { - return; - } - itemsToHide.push( - 'occultism:' + material + '_ingot', - 'occultism:' + material + '_ore', - 'occultism:' + material + '_dust', - 'occultism:' + material + '_nugget', - 'occultism:' + material + '_block', - 'immersiveengineering:ingot_' + material, - 'immersiveengineering:dust_' + material, - 'immersiveengineering:nugget_' + material, - 'mekanism:nugget_' + material, - 'mekanism:dust_' + material, - 'mekanism:ingot_' + material, - 'mekanism:block_' + material - ); - }); - - var itemsToHide = [ - 'ars_nouveau:arcane_brick', - 'ars_nouveau:arcane_ore', - 'bloodmagic:coalsand', - 'bloodmagic:saltpeter', - 'bloodmagic:sulfur', - 'create:powdered_obsidian', - 'create:honey_bucket', - 'eidolon:tallow', - 'immersiveengineering:dust_saltpeter', - 'immersiveengineering:dust_wood', - 'mapperbase:bitumen_ore', - 'mapperbase:iron_plate', - 'mapperbase:iron_rod', - 'mapperbase:raw_bitumen', - 'morevanillalib:obsidian_shard', - 'pedestals:dustflour', - 'powah:uraninite_ore', - 'powah:uraninite_ore_dense', - 'powah:uraninite_ore_poor', - 'powah:uraninite_raw', - 'powah:uraninite_raw_dense', - 'powah:uraninite_raw_poor', - 'quark:biotite', - 'quark:biotite_ore', - 'quark:tallow', - 'thermal:coal_coke', - 'thermal:coal_coke_block', - 'thermal:ender_pearl_dust', - 'thermal:sawdust', - 'supplementaries:pedestal', - 'supplementaries:crank', - 'supplementaries:cog_block', - 'supplementaries:redstone_illuminator', - 'supplementaries:turn_table', - 'supplementaries:jar', - 'supplementaries:jar_tinted', - 'supplementaries:firefly_jar', - 'supplementaries:stone_lamp', - 'supplementaries:sack', - 'supplementaries:blackboard' - ]; - itemsToHide.forEach((disabledItem) => { - if (!item.of(disabledItem).isEmpty()) { - event.hide(disabledItem); - } - }); - - global.disabledItems.forEach((disabledItem) => { - if (!item.of(disabledItem).isEmpty()) { - event.hide(disabledItem); - } - }); - - var regexHide = [ - /emendatusenigmatica:\w+_andesite_ore/, - /emendatusenigmatica:\w+_gabbro_ore/, - /emendatusenigmatica:\w+_c_limestone_ore/, - /emendatusenigmatica:\w+_scoria_ore/, - /emendatusenigmatica:\w+_weathered_limestone_ore/, - /emendatusenigmatica:\w+_jasper_ore/, - /emendatusenigmatica:\w+_marble_ore/, - /emendatusenigmatica:\w+_slate_ore/, - /emendatusenigmatica:\w+_netherrack_ore/, - /emendatusenigmatica:\w+_blackstone_ore/, - /emendatusenigmatica:\w+_end_stone_ore/, - /emendatusenigmatica:\w+_mossy_stone_ore/, - /emendatusenigmatica:\w+_granite_ore/, - /emendatusenigmatica:\w+_diorite_ore/, - /emendatusenigmatica:\w+_sand_ore/, - /emendatusenigmatica:\w+_gravel_ore/, - /titanium:\w+_gear/, - /thermal:\w+_dust/, - /thermal:\w+_gear/, - /thermal:\w+_ingot/, - /thermal:\w+_nugget/, - /thermal:\w+_ore/, - /thermal:\w+_plate/, - /tmechworks:\w+_ingot/, - /tmechworks:\w+_nugget/, - /tmechworks:\w+_ore/, - /pedestals:dust/, - /mekanism:\w+_ore/, - - /minecraft:\w+_ore/, - - /immersiveengineering:plate_/, - /immersiveengineering:stick_/, - /create:\w+_sheet/, - /create:\w+_nugget/, - /create:\w+_ingot/, - /create:\w+_ore/, - /immersiveposts:stick_/, - /buildersaddition:\w+_rod/, - /eidolon:\w+_ingot/, - /eidolon:\w+_nugget/, - /eidolon:\w+_ore/, - /byg:pendorite/, - /byg:ametrine/, - /emendatusenigmatica:\w+certus/, - /emendatusenigmatica:\w+fluix/, - /mapperbase:steel/, - /rftoolsbase:dimensionalshard/ - ]; - regexHide.forEach((regexExpression) => { - event.hide(regexExpression); - }); -}); - -onEvent('jei.hide.fluids', (event) => { - event.hide('cofh_core:honey'); - event.hide('create:honey'); -}); +//TODO: Remove in 0.4.0 diff --git a/kubejs[e6]/client_scripts/item_modifiers/jei_hide_fluids.js b/kubejs[e6]/client_scripts/item_modifiers/jei_hide_fluids.js new file mode 100644 index 0000000..5323fac --- /dev/null +++ b/kubejs[e6]/client_scripts/item_modifiers/jei_hide_fluids.js @@ -0,0 +1,4 @@ +onEvent('jei.hide.fluids', (event) => { + event.hide('cofh_core:honey'); + event.hide('create:honey'); +}); diff --git a/kubejs[e6]/client_scripts/item_modifiers/jei_hide_items.js b/kubejs[e6]/client_scripts/item_modifiers/jei_hide_items.js new file mode 100644 index 0000000..a1303a7 --- /dev/null +++ b/kubejs[e6]/client_scripts/item_modifiers/jei_hide_items.js @@ -0,0 +1,44 @@ +events.listen('jei.hide.items', (event) => { + materialsToUnify.forEach((material) => { + if (material == 'iesnium' || material == 'graphite' || material == 'hop_graphite') { + return; + } + itemsToHide.push( + 'occultism:' + material + '_ingot', + 'occultism:' + material + '_ore', + 'occultism:' + material + '_dust', + 'occultism:' + material + '_nugget', + 'occultism:' + material + '_block', + 'immersiveengineering:ingot_' + material, + 'immersiveengineering:dust_' + material, + 'immersiveengineering:nugget_' + material, + 'mekanism:nugget_' + material, + 'mekanism:dust_' + material, + 'mekanism:ingot_' + material, + 'mekanism:block_' + material, + 'eidolon:ingot_' + material, + 'eidolon:nugget_' + material, + 'eidolon:block_' + material + ); + }); + + itemsToHide.forEach((disabledItem) => { + if (!item.of(disabledItem).isEmpty()) { + event.hide(disabledItem); + } + }); + + disabledItems.forEach((disabledItem) => { + if (!item.of(disabledItem).isEmpty()) { + event.hide(disabledItem); + } + }); + + colors.forEach((color) => { + event.hide('/refinedstorage:' + color + '\\w/'); + }); + + regexHide.forEach((regexExpression) => { + event.hide(regexExpression); + }); +}); diff --git a/kubejs[e6]/client_scripts/item_modifiers/tooltips.js b/kubejs[e6]/client_scripts/item_modifiers/tooltips.js index 4d5b0e2..01bbb3d 100644 --- a/kubejs[e6]/client_scripts/item_modifiers/tooltips.js +++ b/kubejs[e6]/client_scripts/item_modifiers/tooltips.js @@ -1,8 +1,7 @@ -// events.listen('client.item_tooltip', function (event) { -// switch (event.item.id) { -// case 'appliedenergistics2:quantum_entangled_singularity': -// event.add( -// 'To create drop 1 Singularity and 1 Ender Dust (From Applied Energistics) and cause an explosion within range of the items.' -// ); -// } -// }); +onEvent('client.item_tooltip', (event) => { + refinedStorageItems.forEach((item) => { + if (event.item.id == 'refinedstorage:' + item) { + event.add('Can be dyed through crafting or by right clicking it with dye in-world.'); + } + }); +}); diff --git a/kubejs[e6]/data/botanypots/recipes/crops/glitterkelp.json b/kubejs[e6]/data/botanypots/recipes/crops/glitterkelp.json new file mode 100644 index 0000000..34dec16 --- /dev/null +++ b/kubejs[e6]/data/botanypots/recipes/crops/glitterkelp.json @@ -0,0 +1,11 @@ +{ + "type": "botanypots:crop", + "seed": { "item": "undergarden:glowing_kelp" }, + "categories": ["water"], + "growthTicks": 1000, + "display": { "block": "undergarden:glowing_kelp_plant", "renderFluid": false }, + "results": [ + { "chance": 0.75, "output": { "item": "undergarden:glowing_kelp" }, "minRolls": 1, "maxRolls": 1 }, + { "chance": 0.05, "output": { "item": "undergarden:glowing_kelp" }, "minRolls": 1, "maxRolls": 2 } + ] +} diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipes/remove.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipes/remove.js index 834bc33..fe55764 100644 --- a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipes/remove.js +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipes/remove.js @@ -184,7 +184,11 @@ events.listen('recipes', function (event) { input: '#forge:ores/nickel', type: 'thermal:smelter' }); - + event.remove({ + input: 'minecraft:fire_charge', + mod: 'thermal', + type: 'minecraft:crafting_shapeless' + }); event.remove({ type: 'pedestals:pedestal_crushing', output: '#forge:dyes' }); event.remove({ type: 'create:milling', output: '#forge:dyes' }); event.remove({ type: 'create:crushing', output: '#forge:dyes' }); diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipes/replace_input.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipes/replace_input.js index f1b00b9..4cfbe9c 100644 --- a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipes/replace_input.js +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipes/replace_input.js @@ -1,5 +1,6 @@ events.listen('recipes', function (event) { event.replaceInput({}, 'refinedstorage:silicon', '#forge:silicon'); + event.replaceInput({}, 'refinedstorage:crafter', '#refinedstorage:crafter'); event.replaceInput({}, 'thermal:cinnabar', '#forge:gems/cinnabar'); event.replaceInput({}, 'thermal:sulfur', '#forge:gems/sulfur'); event.replaceInput({}, 'thermal:apatite', '#forge:gems/apatite'); diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipes/shaped.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipes/shaped.js index bd7ff50..9891b5e 100644 --- a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipes/shaped.js +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipes/shaped.js @@ -342,26 +342,26 @@ events.listen('recipes', function (event) { shapedRecipe( Item.of('morphtool:tool').nbt({ 'morphtool:data': { - blockcarpentry: { id: 'blockcarpentry:texture_wrench' }, - powah: { id: 'powah:wrench' }, - resourcefulbees: { id: 'resourcefulbees:scraper' }, - astralsorcery: { id: 'astralsorcery:wand' }, - pneumaticcraft: { id: 'pneumaticcraft:pneumatic_wrench' }, - immersiveengineering: { id: 'immersiveengineering:hammer' }, - transport: { id: 'transport:rail_breaker' }, - pedestals: { id: 'pedestals:linkingtool' }, - botania: { id: 'botania:twig_wand', tag: { color1: 0, color2: 0 } }, - ars_nouveau: { id: 'ars_nouveau:dominion_wand' }, - mekanism: { id: 'mekanism:configurator' }, - bloodmagic: { id: 'bloodmagic:ritualtinkerer' }, - thermal: { id: 'thermal:wrench' }, - rftoolsbase: { id: 'rftoolsbase:smartwrench' }, - create: { id: 'create:wrench' }, - chiselsandbits: { id: 'chiselsandbits:wrench_wood' }, - refinedstorage: { id: 'refinedstorage:wrench' }, - quantumstorage: { id: 'quantumstorage:hammer' }, - prettypipes: { id: 'prettypipes:wrench' }, - storagedrawers: { id: 'storagedrawers:drawer_key' } + blockcarpentry: { id: 'blockcarpentry:texture_wrench', Count: 1 }, + powah: { id: 'powah:wrench', Count: 1 }, + resourcefulbees: { id: 'resourcefulbees:scraper', Count: 1 }, + astralsorcery: { id: 'astralsorcery:wand', Count: 1 }, + pneumaticcraft: { id: 'pneumaticcraft:pneumatic_wrench', Count: 1 }, + immersiveengineering: { id: 'immersiveengineering:hammer', Count: 1 }, + transport: { id: 'transport:rail_breaker', Count: 1 }, + pedestals: { id: 'pedestals:linkingtool', Count: 1 }, + botania: { id: 'botania:twig_wand', Count: 1, tag: { color1: 0, color2: 0 } }, + ars_nouveau: { id: 'ars_nouveau:dominion_wand', Count: 1 }, + mekanism: { id: 'mekanism:configurator', Count: 1 }, + bloodmagic: { id: 'bloodmagic:ritualtinkerer', Count: 1 }, + thermal: { id: 'thermal:wrench', Count: 1 }, + rftoolsbase: { id: 'rftoolsbase:smartwrench', Count: 1 }, + create: { id: 'create:wrench', Count: 1 }, + chiselsandbits: { id: 'chiselsandbits:wrench_wood', Count: 1 }, + refinedstorage: { id: 'refinedstorage:wrench', Count: 1 }, + quantumstorage: { id: 'quantumstorage:hammer', Count: 1 }, + prettypipes: { id: 'prettypipes:wrench', Count: 1 }, + storagedrawers: { id: 'storagedrawers:drawer_key', Count: 1 } } }), ['ABA', 'CFD', 'AEA'], @@ -389,7 +389,11 @@ events.listen('recipes', function (event) { ]; recipes.forEach(function (recipe) { - event.shaped(recipe.result, recipe.pattern, recipe.key); + if (recipe.id) { + event.shaped(recipe.result, recipe.pattern, recipe.key).id(recipe.id); + } else { + event.shaped(recipe.result, recipe.pattern, recipe.key); + } }); buildWoodVariants.forEach((wood) => { diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipes/shapeless.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipes/shapeless.js index eece1e1..e68c777 100644 --- a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipes/shapeless.js +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipes/shapeless.js @@ -162,10 +162,19 @@ events.listen('recipes', (event) => { '#forge:wax', '#forge:string' ]), - shapelessRecipe(Item.of('occultism:tallow', 9), ['quark:tallow_block']) + shapelessRecipe(Item.of('occultism:tallow', 9), ['quark:tallow_block']), + shapelessRecipe( + 'minecraft:writable_book', + ['minecraft:book', '#forge:dyes/black', '#forge:feathers'], + 'minecraft:writable_book' + ) ]; recipes.forEach(function (recipe) { - event.shapeless(recipe.result, recipe.ingredients); + if (recipe.id) { + event.shapeless(recipe.result, recipe.ingredients).id(recipe.id); + } else { + event.shapeless(recipe.result, recipe.ingredients); + } }); }); diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/ars_nouveau/enchanting_apparatus.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/ars_nouveau/enchanting_apparatus.js new file mode 100644 index 0000000..afbcd8f --- /dev/null +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/ars_nouveau/enchanting_apparatus.js @@ -0,0 +1 @@ +//TODO: Remove in 0.4.0 \ No newline at end of file diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/create/crushing.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/create/crushing.js index 0dd8d1c..614dd20 100644 --- a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/create/crushing.js +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/create/crushing.js @@ -4,6 +4,10 @@ events.listen('recipes', (event) => { { outputs: [Item.of('emendatusenigmatica:obsidian_dust'), Item.of('minecraft:obsidian').withChance(0.75)], input: 'minecraft:obsidian' + }, + { + outputs: [Item.of('buildinggadgets:construction_paste', 3), Item.of('buildinggadgets:construction_paste').withChance(0.75), Item.of('buildinggadgets:construction_paste').withChance(0.50)], + input: 'buildinggadgets:construction_block_dense' } ] }; diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/create/milling_flowers.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/create/milling_flowers.js new file mode 100644 index 0000000..afbcd8f --- /dev/null +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/create/milling_flowers.js @@ -0,0 +1 @@ +//TODO: Remove in 0.4.0 \ No newline at end of file diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/create/mixing.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/create/mixing.js index 5fb8110..6ee183e 100644 --- a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/create/mixing.js +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/create/mixing.js @@ -20,6 +20,10 @@ events.listen('recipes', (event) => { { inputs: ['#forge:storage_blocks/coal'], output: Item.of('emendatusenigmatica:coke_gem', 9) + }, + { + inputs: ['#forge:ingots/iron', '#forge:ingots/lead'], + output: Item.of('eidolon:pewter_ingot', 2) } ], recipes_superheated: [ diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/create/splashing.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/create/splashing.js new file mode 100644 index 0000000..4a6444c --- /dev/null +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/create/splashing.js @@ -0,0 +1,13 @@ +events.listen('recipes', (event) => { + var data = { + recipes: [ + { + output: 'buildinggadgets:construction_block_dense', + input: 'buildinggadgets:construction_block_powder' + } + ] + }; + data.recipes.forEach((recipe) => { + event.recipes.create.splashing(recipe.output, recipe.input); + }); +}); diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/immersiveengineering/alloy.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/immersiveengineering/alloy.js new file mode 100644 index 0000000..6ae4a64 --- /dev/null +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/immersiveengineering/alloy.js @@ -0,0 +1,22 @@ +events.listen('recipes', (event) => { + var data = { + recipes: [ + { + input1: '#forge:ingots/copper', + input2: '#forge:ingots/zinc', + output: item.of('emendatusenigmatica:brass_ingot', 2) + + }, + { + input1: '#forge:ingots/iron', + input2: '#forge:ingots/lead', + output: Item.of('eidolon:pewter_ingot', 2) + + }, + ] + }; + event.remove({id: 'immersiveengineering:alloysmelter/brass'}); + data.recipes.forEach((recipe) => { + event.recipes.immersiveengineering.alloy(recipe.output, recipe.input1, recipe.input2); + }); +}); diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/immersiveengineering/arc_furnace.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/immersiveengineering/arc_furnace.js new file mode 100644 index 0000000..73a6e4a --- /dev/null +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/immersiveengineering/arc_furnace.js @@ -0,0 +1,22 @@ +events.listen('recipes', (event) => { + var data = { + recipes: [ + { + input1: '#forge:ingots/copper', + secondaries: ['#forge:ingots/zinc'], + outputs: [item.of('emendatusenigmatica:brass_ingot', 2)] + + }, + { + input1: '#forge:ingots/iron', + secondaries: ['#forge:ingots/lead'], + outputs: [Item.of('eidolon:pewter_ingot', 2)] + + } + ] + }; + event.remove({id: 'immersiveengineering:arcfurnace/alloy_brass'}) + data.recipes.forEach((recipe) => { + event.recipes.immersiveengineering.arc_furnace(recipe.outputs, recipe.input1, recipe.secondaries); + }); +}); diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/immersiveengineering/crusher.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/immersiveengineering/crusher.js index 254e686..20a5169 100644 --- a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/immersiveengineering/crusher.js +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/immersiveengineering/crusher.js @@ -85,6 +85,11 @@ events.listen('recipes', (event) => { input: 'biomesoplenty:white_sandstone', output: item.of('biomesoplenty:white_sand', 2), secondary: [item.of('emendatusenigmatica:potassium_nitrate_gem').chance(0.5)] + }, + { + input: 'buildinggadgets:construction_block_dense', + output: item.of('buildinggadgets:construction_paste', 3), + secondary: [item.of('buildinggadgets:construction_paste', 2).chance(0.5)] } ] }; diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/mekanism/crushing.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/mekanism/crushing.js index 40dcf16..1fba3bb 100644 --- a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/mekanism/crushing.js +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/mekanism/crushing.js @@ -28,6 +28,10 @@ events.listen('recipes', function (event) { { input: '#forge:stone', output: 'minecraft:cobblestone' + }, + { + input: 'buildinggadgets:construction_block_dense', + output: Item.of('buildinggadgets:construction_paste', 3) } ] }; diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/mekanism/enriching_byg_flowers.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/mekanism/enriching_byg_flowers.js new file mode 100644 index 0000000..afbcd8f --- /dev/null +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/mekanism/enriching_byg_flowers.js @@ -0,0 +1 @@ +//TODO: Remove in 0.4.0 \ No newline at end of file diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/mekanism/injecting.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/mekanism/injecting.js new file mode 100644 index 0000000..61367bd --- /dev/null +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/mekanism/injecting.js @@ -0,0 +1,21 @@ +events.listen('recipes', function (event) { + var data = { + recipes: [ + { + output: 'buildinggadgets:construction_block_dense', + input: 'buildinggadgets:construction_block_powder', + gas: {gas: 'mekanism:steam', amount: 200} + }, + { + output: 'buildinggadgets:construction_block_dense', + input: 'buildinggadgets:construction_block_powder', + gas: {gas: 'mekanism:water_vapor', amount: 200} + } + ] + }; + + data.recipes.forEach((recipe) => { + event.recipes.mekanism.injecting(recipe.output, recipe.input, recipe.gas) + }); +}); + diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/smithing.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/smithing.js new file mode 100644 index 0000000..212a4cc --- /dev/null +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/minecraft/smithing.js @@ -0,0 +1,15 @@ +// This is commented out because using /reload breaks AIOT recipes when this is present +// events.listen('recipes', (event) => { +// var data = { +// recipes: [ +// { +// input1: 'aiotbotania:terra_aiot', +// input2: 'mythicbotany:alfsteel_armor_upgrade', +// output: 'aiotbotania:alfsteel_aiot' +// } +// ] +// }; +// data.recipes.forEach((recipe) => { +// event.smithing(recipe.output, recipe.input1, recipe.input2); +// }) +// }); diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/pedestals/pedestal_crushing.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/pedestals/pedestal_crushing.js new file mode 100644 index 0000000..afbcd8f --- /dev/null +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/pedestals/pedestal_crushing.js @@ -0,0 +1 @@ +//TODO: Remove in 0.4.0 \ No newline at end of file diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/pedestals/pedestal_crushing_flowers.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/pedestals/pedestal_crushing_flowers.js new file mode 100644 index 0000000..afbcd8f --- /dev/null +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/pedestals/pedestal_crushing_flowers.js @@ -0,0 +1 @@ +//TODO: Remove in 0.4.0 \ No newline at end of file diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/bottler.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/bottler.js new file mode 100644 index 0000000..b8e2cfd --- /dev/null +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/bottler.js @@ -0,0 +1,19 @@ +events.listen('recipes', (event) => { + var data = { + recipes: [ + { + input: 'minecraft:glass_bottle', + fluid: fluid.of('pneumaticcraft:memory_essence', 250), + output: 'minecraft:experience_bottle' + }, + { + input: 'buildinggadgets:construction_block_powder', + fluid: fluid.of('minecraft:water', 1000), + output: 'buildinggadgets:construction_block_dense' + } + ] + }; + data.recipes.forEach((recipe) => { + event.recipes.thermal.bottler(recipe.output, [recipe.fluid, recipe.input]); + }); +}); diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/bottler_experience.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/bottler_experience.js index a267476..0de8648 100644 --- a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/bottler_experience.js +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/bottler_experience.js @@ -1,31 +1 @@ -events.listen('recipes', (event) => { - var data = { - recipes: [ - { - fluid: 'industrialforegoing:essence' - }, - { - fluid: 'pneumaticcraft:memory_essence' - } - ] - }; - data.recipes.forEach((recipe) => { - event.recipes.thermal.bottler({ - type: 'thermal.bottler', - ingredient: [ - { - item: 'minecraft:glass_bottle' - }, - { - fluid: recipe.fluid, - amount: 250 - } - ], - result: [ - { - item: 'minecraft:experience_bottle' - } - ] - }); - }); -}); +//TODO: Remove in 0.4.0 diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/centrifuge_flowers.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/centrifuge_flowers.js new file mode 100644 index 0000000..afbcd8f --- /dev/null +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/centrifuge_flowers.js @@ -0,0 +1 @@ +//TODO: Remove in 0.4.0 \ No newline at end of file diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/induction_smelter.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/induction_smelter.js index 0e2e47b..1febffc 100644 --- a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/induction_smelter.js +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/induction_smelter.js @@ -3,7 +3,6 @@ events.listen('recipes', function (event) { recipes: [ { inputs: ['#forge:ores/nickel'], - experience: 0.2, outputs: [ item.of('emendatusenigmatica:nickel_ingot'), item.of('minecraft:iron_ingot').chance(0.1), @@ -12,7 +11,6 @@ events.listen('recipes', function (event) { }, { inputs: ['#forge:ores/aluminum'], - experience: 0.2, outputs: [ item.of('emendatusenigmatica:aluminum_ingot'), item.of('minecraft:iron_ingot').chance(0.1), @@ -21,7 +19,6 @@ events.listen('recipes', function (event) { }, { inputs: ['#forge:ores/uranium'], - experience: 0.2, outputs: [ item.of('emendatusenigmatica:uranium_ingot'), item.of('emendatusenigmatica:lead_ingot').chance(0.1), @@ -30,7 +27,6 @@ events.listen('recipes', function (event) { }, { inputs: ['#forge:ores/osmium'], - experience: 0.2, outputs: [ item.of('emendatusenigmatica:osmium_ingot'), item.of('emendatusenigmatica:tin_ingot').chance(0.1), @@ -39,7 +35,6 @@ events.listen('recipes', function (event) { }, { inputs: ['#forge:ores/zinc'], - experience: 0.2, outputs: [ item.of('emendatusenigmatica:zinc_ingot'), item.of('minecraft:gold_ingot').chance(0.1), @@ -48,18 +43,20 @@ events.listen('recipes', function (event) { }, { inputs: [item.of('minecraft:netherite_scrap', 4), item.of('minecraft:gold_ingot', 2)], - experience: 0.2, outputs: ['minecraft:netherite_ingot'] }, { - inputs: [item.of('minecraft:iron_ingot', 1), ingredient.of('#forge:dusts/coal_coke', 1)], - experience: 0.2, + inputs: ['#forge:ingots/iron', '#forge:dusts/coal_coke'], outputs: ['emendatusenigmatica:steel_ingot'] + }, + { + inputs: ['#forge:ingots/iron', '#forge:ingots/lead'], + outputs: [Item.of('eidolon:pewter_ingot', 2)] } ] }; data.recipes.forEach((recipe) => { - event.recipes.thermal.smelter(recipe.outputs, recipe.inputs).experience(recipe.experience); + event.recipes.thermal.smelter(recipe.outputs, recipe.inputs); }); }); diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/insolator.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/insolator.js index c0ac951..5af22b6 100644 --- a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/insolator.js +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/insolator.js @@ -381,6 +381,12 @@ events.listen('recipes', (event) => { ], energyModifier: 3.0, waterModifier: 3.0 + }, + { + input: 'undergarden:glowing_kelp', + outputs: [item.of('undergarden:glowing_kelp').chance(2.0)], + energyModifier: 1.0, + waterModifier: 1.0 } ] }; diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/pulverizer.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/pulverizer.js index 0c0908a..3b07ea2 100644 --- a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/pulverizer.js +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/recipetypes/thermal/machine/pulverizer.js @@ -129,6 +129,14 @@ events.listen('recipes', function (event) { item.of('emendatusenigmatica:potassium_nitrate_gem').chance(0.3) ], experience: 0.2 + }, + { + input: 'buildinggadgets:construction_block_dense', + outputs: [ + item.of('buildinggadgets:construction_paste', 3), + item.of('buildinggadgets:construction_paste', 2).chance(0.5) + ], + experience: 0.2 } ] }; diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/tags/blocks/forge/candles.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/tags/blocks/forge/candles.js new file mode 100644 index 0000000..fd5aced --- /dev/null +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/tags/blocks/forge/candles.js @@ -0,0 +1,9 @@ +events.listen('block.tags', (event) => { + colors.forEach((color) => { + event.get('forge:candles').add('quark:' + color + '_candle'); + }); + candles.forEach((candle) => { + event.get('forge:candles').add(candle); + }); + +}); \ No newline at end of file diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/tags/fluids/minecraft/fluids.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/tags/fluids/minecraft/fluids.js index 6f88022..e803aaa 100644 --- a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/tags/fluids/minecraft/fluids.js +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/tags/fluids/minecraft/fluids.js @@ -1,12 +1,12 @@ -events.listen('fluid.tags', function (event) { - event - .get('minecraft:water') - .remove([ - 'create:honey', - 'create:flowing_honey', - 'create:chocolate', - 'create:flowing_chocolate', - 'undergarden:virulent_mix_source', - 'undergarden:virulent_mix_flowing' - ]); -}); +// events.listen('fluid.tags', function (event) { +// event +// .get('minecraft:water') +// .remove([ +// 'create:honey', +// 'create:flowing_honey', +// 'create:chocolate', +// 'create:flowing_chocolate', +// 'undergarden:virulent_mix_source', +// 'undergarden:virulent_mix_flowing' +// ]); +// }); diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/tags/items/dustrialdecor/dustrialdecor.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/tags/items/dustrialdecor/dustrialdecor.js new file mode 100644 index 0000000..2dbc2ba --- /dev/null +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/tags/items/dustrialdecor/dustrialdecor.js @@ -0,0 +1,14 @@ +events.listen('item.tags', function (event) { + var irontags = ['', '_aluminum', '_lead', '_tin', '_copper', '_brass']; + + irontags.forEach(function (tag) { + event.remove('forge:ingots/iron' + tag, 'dustrial_decor:rusty_iron_ingot'); + }); + + event.remove('forge:nuggets/iron', 'dustrial_decor:rusty_iron_nugget'); + event.remove('forge:nuggets/iron_copper', 'dustrial_decor:rusty_iron_nugget'); + + //Script seems to remove the default forge tags too, max says it's a bug with kubejs' recursive removal. Temp fix is to just readd them manually (or leave them without it) + event.get('forge:ingots').add('dustrial_decor:rusty_iron_ingot'); + event.get('forge:nuggets').add('dustrial_decor:rusty_iron_nugget'); +}); diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/tags/items/enigmatica/quests.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/tags/items/enigmatica/quests.js new file mode 100644 index 0000000..87d3676 --- /dev/null +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/tags/items/enigmatica/quests.js @@ -0,0 +1,11 @@ +events.listen('item.tags', (event) => { + event + .get('enigmatica:quests/storage/gold_to_diamond') + .add(['ironchest:diamond_chest', 'ironchest:gold_to_diamond_chest_upgrade']); + event + .get('enigmatica:quests/storage/iron_to_gold') + .add(['ironchest:gold_chest', 'ironchest:iron_to_gold_chest_upgrade']); + event + .get('enigmatica:quests/storage/wood_to_iron') + .add(['ironchest:iron_chest', 'ironchest:wood_to_iron_chest_upgrade']); +}); diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/tags/items/forge/candles.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/tags/items/forge/candles.js new file mode 100644 index 0000000..3a5af00 --- /dev/null +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/tags/items/forge/candles.js @@ -0,0 +1,9 @@ +events.listen('item.tags', (event) => { + colors.forEach((color) => { + event.get('forge:candles').add('quark:' + color + '_candle'); + }); + candles.forEach((candle) => { + event.get('forge:candles').add(candle); + }); + +}); \ No newline at end of file diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/unification/additions.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/unification/additions.js index 2776105..d7edf03 100644 --- a/kubejs[e6]/server_scripts/enigmatica/kubejs/base/unification/additions.js +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/base/unification/additions.js @@ -732,8 +732,8 @@ function thermal_press_wires(event, material, wire) { return; } - var output = wire, - input = item.of('#forge:ingots/' + material, 2), + var output = item.of(wire, 2), + input = '#forge:ingots/' + material, mold = 'immersiveengineering:mold_wire'; event.recipes.thermal.press(output, [input, mold]).energy(2400); } diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/constants.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/constants.js index 3294bef..f66dc70 100644 --- a/kubejs[e6]/server_scripts/enigmatica/kubejs/constants.js +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/constants.js @@ -1,7 +1,7 @@ //priority: 1000 const air = 'minecraft:air'; -// + const beamRecipes = [ { output: 'decorative_blocks:hellbark_beam', input: 'biomesoplenty:hellbark_logs' }, { output: 'decorative_blocks:jungle_beam', input: 'minecraft:jungle_logs' }, @@ -332,6 +332,19 @@ const honeyVarieties = [ 'resourcefulbees:wither_honey' ]; +const candles =[ + 'buildersaddition:large_candle', + 'buildersaddition:large_soul_candle', + 'buildersaddition:candle', + 'buildersaddition:soul_candle', + 'eidolon:candle', + 'eidolon:candlestick', + 'occultism:candle_white', + 'supplementaries:candelabra', + 'supplementaries:candelabra_silver', + 'supplementaries:candle_holder' +]; + const dyeSources = [ { input: 'biomesoplenty:blue_hydrangea', diff --git a/kubejs[e6]/server_scripts/enigmatica/kubejs/functions.js b/kubejs[e6]/server_scripts/enigmatica/kubejs/functions.js index 6cf66b3..97a3ea3 100644 --- a/kubejs[e6]/server_scripts/enigmatica/kubejs/functions.js +++ b/kubejs[e6]/server_scripts/enigmatica/kubejs/functions.js @@ -1,11 +1,11 @@ //priority: 1000 -function shapedRecipe(result, pattern, key) { - return { result: result, pattern: pattern, key: key }; +function shapedRecipe(result, pattern, key, id) { + return { result: result, pattern: pattern, key: key, id: id }; } -function shapelessRecipe(result, ingredients) { - return { result: result, ingredients: ingredients }; +function shapelessRecipe(result, ingredients, id) { + return { result: result, ingredients: ingredients, id: id }; } function unificationBlacklistEntry(material, type) { return { material: material, type: type }; @@ -39,7 +39,6 @@ function compareIndices(a, b, tag) { console.error('[' + a + ', ' + b + '] were both unaccounted for in mod unification' + (tag ? ' for ' + tag : '!')); return 0; } - function wrapArray(array) { return utils.listOf(array).toArray(); } diff --git a/mods/NaturesAura-33.4.jar b/mods/NaturesAura-34.0.jar similarity index 55% rename from mods/NaturesAura-33.4.jar rename to mods/NaturesAura-34.0.jar index 66530e4..3fec5a5 100644 Binary files a/mods/NaturesAura-33.4.jar and b/mods/NaturesAura-34.0.jar differ diff --git a/mods/Quark-r2.4-300.jar b/mods/Quark-r2.4-302.jar similarity index 83% rename from mods/Quark-r2.4-300.jar rename to mods/Quark-r2.4-302.jar index 63bc94f..88d48f2 100644 Binary files a/mods/Quark-r2.4-300.jar and b/mods/Quark-r2.4-302.jar differ diff --git a/mods[common]/TerraForged-1.16.4-0.2.0.jar b/mods/TerraForged-1.16.4-0.2.2.jar similarity index 79% rename from mods[common]/TerraForged-1.16.4-0.2.0.jar rename to mods/TerraForged-1.16.4-0.2.2.jar index 40809a5..ea61915 100644 Binary files a/mods[common]/TerraForged-1.16.4-0.2.0.jar and b/mods/TerraForged-1.16.4-0.2.2.jar differ diff --git a/mods/ars_nouveau-1.16.4-1.11.2.jar b/mods/ars_nouveau-1.16.4-1.11.2.jar deleted file mode 100644 index fc0558e..0000000 Binary files a/mods/ars_nouveau-1.16.4-1.11.2.jar and /dev/null differ diff --git a/mods/curios-forge-1.16.4-4.0.3.5.jar b/mods/curios-forge-1.16.5-4.0.4.0.jar similarity index 62% rename from mods/curios-forge-1.16.4-4.0.3.5.jar rename to mods/curios-forge-1.16.5-4.0.4.0.jar index f3e564f..c48ad98 100644 Binary files a/mods/curios-forge-1.16.4-4.0.3.5.jar and b/mods/curios-forge-1.16.5-4.0.4.0.jar differ diff --git a/mods/forge-1.16.5-geckolib-3.0.6.jar b/mods/geckolib-forge-1.16.5-3.0.8.jar similarity index 87% rename from mods/forge-1.16.5-geckolib-3.0.6.jar rename to mods/geckolib-forge-1.16.5-3.0.8.jar index 952bbd0..ef4929f 100644 Binary files a/mods/forge-1.16.5-geckolib-3.0.6.jar and b/mods/geckolib-forge-1.16.5-3.0.8.jar differ diff --git a/mods/industrial-foregoing-1.16.5-3.2.9-2215ef4.jar b/mods/industrial-foregoing-1.16.5-3.2.9.1-fbef27c.jar similarity index 71% rename from mods/industrial-foregoing-1.16.5-3.2.9-2215ef4.jar rename to mods/industrial-foregoing-1.16.5-3.2.9.1-fbef27c.jar index b3895d1..605397c 100644 Binary files a/mods/industrial-foregoing-1.16.5-3.2.9-2215ef4.jar and b/mods/industrial-foregoing-1.16.5-3.2.9.1-fbef27c.jar differ diff --git a/mods/kubejs-1605.3.5-build.156-forge.jar b/mods/kubejs-1605.3.5-build.157-forge.jar similarity index 74% rename from mods/kubejs-1605.3.5-build.156-forge.jar rename to mods/kubejs-1605.3.5-build.157-forge.jar index 8d4bd4d..b22c819 100644 Binary files a/mods/kubejs-1605.3.5-build.156-forge.jar and b/mods/kubejs-1605.3.5-build.157-forge.jar differ diff --git a/mods/minecolonies-0.13.592-ALPHA-universal.jar b/mods/minecolonies-0.13.596-ALPHA-universal.jar similarity index 95% rename from mods/minecolonies-0.13.592-ALPHA-universal.jar rename to mods/minecolonies-0.13.596-ALPHA-universal.jar index 90e2d92..9354acd 100644 Binary files a/mods/minecolonies-0.13.592-ALPHA-universal.jar and b/mods/minecolonies-0.13.596-ALPHA-universal.jar differ diff --git a/mods/simplylight-1.16.4-1.1.1.jar b/mods/simplylight-1.16.4-1.1.2.jar similarity index 94% rename from mods/simplylight-1.16.4-1.1.1.jar rename to mods/simplylight-1.16.4-1.1.2.jar index 71cd7be..7c9eec9 100644 Binary files a/mods/simplylight-1.16.4-1.1.1.jar and b/mods/simplylight-1.16.4-1.1.2.jar differ diff --git a/mods/supermartijn642configlib-1.0.3-mc1.16.jar b/mods/supermartijn642configlib-1.0.4-mc1.16.jar similarity index 83% rename from mods/supermartijn642configlib-1.0.3-mc1.16.jar rename to mods/supermartijn642configlib-1.0.4-mc1.16.jar index 6c1025f..5b023ef 100644 Binary files a/mods/supermartijn642configlib-1.0.3-mc1.16.jar and b/mods/supermartijn642configlib-1.0.4-mc1.16.jar differ diff --git a/mods[common]/titanium-1.16.5-3.2.6.jar b/mods/titanium-1.16.5-3.2.6.1.jar similarity index 85% rename from mods[common]/titanium-1.16.5-3.2.6.jar rename to mods/titanium-1.16.5-3.2.6.1.jar index 0ae212b..b5017e6 100644 Binary files a/mods[common]/titanium-1.16.5-3.2.6.jar and b/mods/titanium-1.16.5-3.2.6.1.jar differ diff --git a/mods[common]/NaturesAura-33.4.jar b/mods[common]/NaturesAura-34.0.jar similarity index 55% rename from mods[common]/NaturesAura-33.4.jar rename to mods[common]/NaturesAura-34.0.jar index 66530e4..3fec5a5 100644 Binary files a/mods[common]/NaturesAura-33.4.jar and b/mods[common]/NaturesAura-34.0.jar differ diff --git a/mods[common]/Quark-r2.4-300.jar b/mods[common]/Quark-r2.4-302.jar similarity index 83% rename from mods[common]/Quark-r2.4-300.jar rename to mods[common]/Quark-r2.4-302.jar index 63bc94f..88d48f2 100644 Binary files a/mods[common]/Quark-r2.4-300.jar and b/mods[common]/Quark-r2.4-302.jar differ diff --git a/mods/TerraForged-1.16.4-0.2.0.jar b/mods[common]/TerraForged-1.16.4-0.2.2.jar similarity index 79% rename from mods/TerraForged-1.16.4-0.2.0.jar rename to mods[common]/TerraForged-1.16.4-0.2.2.jar index 40809a5..ea61915 100644 Binary files a/mods/TerraForged-1.16.4-0.2.0.jar and b/mods[common]/TerraForged-1.16.4-0.2.2.jar differ diff --git a/mods[common]/ars_nouveau-1.16.4-1.11.2.jar b/mods[common]/ars_nouveau-1.16.4-1.11.2.jar deleted file mode 100644 index fc0558e..0000000 Binary files a/mods[common]/ars_nouveau-1.16.4-1.11.2.jar and /dev/null differ diff --git a/mods[common]/curios-forge-1.16.4-4.0.3.5.jar b/mods[common]/curios-forge-1.16.5-4.0.4.0.jar similarity index 62% rename from mods[common]/curios-forge-1.16.4-4.0.3.5.jar rename to mods[common]/curios-forge-1.16.5-4.0.4.0.jar index f3e564f..c48ad98 100644 Binary files a/mods[common]/curios-forge-1.16.4-4.0.3.5.jar and b/mods[common]/curios-forge-1.16.5-4.0.4.0.jar differ diff --git a/mods[common]/forge-1.16.5-geckolib-3.0.6.jar b/mods[common]/forge-1.16.5-geckolib-3.0.7.jar similarity index 91% rename from mods[common]/forge-1.16.5-geckolib-3.0.6.jar rename to mods[common]/forge-1.16.5-geckolib-3.0.7.jar index 952bbd0..e8ee029 100644 Binary files a/mods[common]/forge-1.16.5-geckolib-3.0.6.jar and b/mods[common]/forge-1.16.5-geckolib-3.0.7.jar differ diff --git a/mods[common]/geckolib-forge-1.16.5-3.0.8.jar b/mods[common]/geckolib-forge-1.16.5-3.0.8.jar new file mode 100644 index 0000000..ef4929f Binary files /dev/null and b/mods[common]/geckolib-forge-1.16.5-3.0.8.jar differ diff --git a/mods[common]/industrial-foregoing-1.16.5-3.2.9-2215ef4.jar b/mods[common]/industrial-foregoing-1.16.5-3.2.9.1-fbef27c.jar similarity index 71% rename from mods[common]/industrial-foregoing-1.16.5-3.2.9-2215ef4.jar rename to mods[common]/industrial-foregoing-1.16.5-3.2.9.1-fbef27c.jar index b3895d1..605397c 100644 Binary files a/mods[common]/industrial-foregoing-1.16.5-3.2.9-2215ef4.jar and b/mods[common]/industrial-foregoing-1.16.5-3.2.9.1-fbef27c.jar differ diff --git a/mods[common]/kubejs-1605.3.5-build.156-forge.jar b/mods[common]/kubejs-1605.3.5-build.157-forge.jar similarity index 74% rename from mods[common]/kubejs-1605.3.5-build.156-forge.jar rename to mods[common]/kubejs-1605.3.5-build.157-forge.jar index 8d4bd4d..b22c819 100644 Binary files a/mods[common]/kubejs-1605.3.5-build.156-forge.jar and b/mods[common]/kubejs-1605.3.5-build.157-forge.jar differ diff --git a/mods[common]/minecolonies-0.13.592-ALPHA-universal.jar b/mods[common]/minecolonies-0.13.596-ALPHA-universal.jar similarity index 95% rename from mods[common]/minecolonies-0.13.592-ALPHA-universal.jar rename to mods[common]/minecolonies-0.13.596-ALPHA-universal.jar index 90e2d92..9354acd 100644 Binary files a/mods[common]/minecolonies-0.13.592-ALPHA-universal.jar and b/mods[common]/minecolonies-0.13.596-ALPHA-universal.jar differ diff --git a/mods[common]/simplylight-1.16.4-1.1.1.jar b/mods[common]/simplylight-1.16.4-1.1.2.jar similarity index 94% rename from mods[common]/simplylight-1.16.4-1.1.1.jar rename to mods[common]/simplylight-1.16.4-1.1.2.jar index 71cd7be..7c9eec9 100644 Binary files a/mods[common]/simplylight-1.16.4-1.1.1.jar and b/mods[common]/simplylight-1.16.4-1.1.2.jar differ diff --git a/mods[common]/supermartijn642configlib-1.0.3-mc1.16.jar b/mods[common]/supermartijn642configlib-1.0.4-mc1.16.jar similarity index 83% rename from mods[common]/supermartijn642configlib-1.0.3-mc1.16.jar rename to mods[common]/supermartijn642configlib-1.0.4-mc1.16.jar index 6c1025f..5b023ef 100644 Binary files a/mods[common]/supermartijn642configlib-1.0.3-mc1.16.jar and b/mods[common]/supermartijn642configlib-1.0.4-mc1.16.jar differ diff --git a/mods/titanium-1.16.5-3.2.6.jar b/mods[common]/titanium-1.16.5-3.2.6.1.jar similarity index 85% rename from mods/titanium-1.16.5-3.2.6.jar rename to mods[common]/titanium-1.16.5-3.2.6.1.jar index 0ae212b..b5017e6 100644 Binary files a/mods/titanium-1.16.5-3.2.6.jar and b/mods[common]/titanium-1.16.5-3.2.6.1.jar differ