From 6a1dae80f7038add089e71581ae505c47f40d694 Mon Sep 17 00:00:00 2001 From: Citali Date: Wed, 10 Feb 2021 00:24:20 +0100 Subject: [PATCH] Changes: - changed astral sorcery config to generate aquamarine - changed kubejs recipes for silicone, quartz and aquamarine --- config/astralsorcery-common.toml | 2 +- .../core/components/frames/frames.json | 64 ++++++++++-- .../core/components/frames/frames.txt | 48 ++++----- .../core/components/modifiers/modifiers.json | 58 ++++++++--- .../core/components/modifiers/modifiers.txt | 60 +++++------ .../core/components/panels/panels.json | 16 ++- .../core/components/panels/panels.txt | 12 +-- .../tech/void_miner/void_miner.json | 99 ++++++++++++++++++- .../tech/void_miner/void_miner.txt | 96 +++++++++--------- config/jei/bookmarks.ini | 55 +++-------- config/worldedit/worldedit.properties | 6 +- .../kubejs/recipes/minecraft/blasting.js | 6 ++ .../kubejs/recipes/minecraft/shapeless.js | 6 ++ .../kubejs/recipes/minecraft/smelting.js | 6 ++ .../fellies/kubejs/recipes/remove.js | 3 + .../fellies/kubejs/recipes/replace.js | 18 ++++ 16 files changed, 379 insertions(+), 176 deletions(-) diff --git a/config/astralsorcery-common.toml b/config/astralsorcery-common.toml index db53c11..0800cfe 100644 --- a/config/astralsorcery-common.toml +++ b/config/astralsorcery-common.toml @@ -53,7 +53,7 @@ #Set this to true to let this feature generate in any world. (Does NOT work for structures!) everyWorld = false #Set this to false to disable this worldgen feature. - enabled = false + enabled = true [worldgen.desert_shrine] #Sets the categories to generate this feature in. Available categories: none,taiga,extreme_hills,jungle,mesa,plains,savanna,icy,the_end,beach,forest,ocean,desert,river,swamp,mushroom,nether 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 8764698..1a1634c 100644 --- a/config/environmental/core/components/modifiers/modifiers.json +++ b/config/environmental/core/components/modifiers/modifiers.json @@ -1,24 +1,60 @@ { - "ma:null": {}, - "ma:amplification": {}, - "ma:bandwidth": {}, - "ma:frequency": {}, - "ma:radiant": {}, - "ma:thermal": {}, - "ma:piezo": {}, - "ma:electrostatic": {}, - "ma:dimensional": { + "ma:null": { "ma:default_base_color": { "in:r:[0~255]": 255, "in:g:[0~255]": 255, "in:b:[0~255]": 255 } }, - "ma:interdimensional": { + "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 + } + }, + "ma:dimensional": {}, + "ma:interdimensional": {} } \ 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 267d356..78db879 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] ┃┃┃┗╸ ┃┃┗╸ ┃┗╸ @@ -156,17 +156,17 @@ ┃┃┃┏╸in:r ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [0~255] +┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] ┃┃┃┗╸ ┃┃┃┏╸in:g ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [0~255] +┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] ┃┃┃┗╸ ┃┃┃┏╸in:b ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [0~255] +┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] ┃┃┃┗╸ ┃┃┗╸ ┃┗╸ @@ -175,17 +175,17 @@ ┃┃┃┏╸in:r ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [0~255] +┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] ┃┃┃┗╸ ┃┃┃┏╸in:g ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [0~255] +┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] ┃┃┃┗╸ ┃┃┃┏╸in:b ┃┃┃┣> Variable Type: java.lang.Integer ┃┃┃┣> Default: 255 -┃┃┃┣> label.valkyrielib.requirements: [0~255] +┃┃┃┣> label.valkyrielib.requirements: [-2147483648~2147483647] ┃┃┃┗╸ ┃┃┗╸ ┃┗╸ 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/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 index c9504cf..12e5630 100644 --- a/config/jei/bookmarks.ini +++ b/config/jei/bookmarks.ini @@ -1,43 +1,14 @@ -T:{id:"minecraft:potion",Count:1b,tag:{Potion:"mana-and-artifice:minor_mana_potion"}} -T:{id:"losttrinkets:piggy",Count:1b} -T:{id:"javd:portal_block",Count:1b} -T:{id:"jamd:mine_portal_block",Count:1b} -T:{id:"itemcollectors:basic_collector",Count:1b} -T:{id:"ironchest:iron_to_gold_chest_upgrade",Count:1b} -T:{id:"integratednbt:nbt_extractor",Count:1b} -T:{id:"industrialforegoing:sludge_bucket",Count:1b} -T:{id:"immersiverailroading:item_rolling_stock",Count:1b,tag:{defID:"rolling_stock/locomotives/a1_peppercorn.json",gauge:1.435d}} -T:{id:"immersivepetroleum:oil_bucket",Count:1b} -T:{id:"immersiveengineering:creosote_bucket",Count:1b} -T:{id:"gravestone:gravestone",Count:1b} -T:{id:"rsgauges:industrial_small_lever",Count:1b} -T:{id:"framedcompactdrawers:framed_compact_drawer",Count:1b} -T:{id:"fluxnetworks:flux_block",Count:1b} -T:{id:"minecraft:crafting_table",Count:1b} -T:{id:"minecraft:furnace",Count:1b} -T:{id:"farmingforblockheads:market",Count:1b} -T:{id:"extrastorage:advanced_exporter",Count:1b} -T:{id:"extradisks:advanced_machine_casing",Count:1b} -T:{id:"extlights:glowstone_bulb",Count:1b} -T:{id:"extcaves:moss_humid_ceiling",Count:1b} -T:{id:"envirocore:litherite_crystal",Count:1b} -T:{id:"engineerstools:redia_tool",Count:1b,tag:{Damage:0}} -T:{id:"patchouli:guide_book",Count:1b,tag:{"patchouli:book":"engineersdecor:engineersdecor_manual"}} -T:{id:"enderstorage:ender_chest",Count:1b} -T:{id:"emendatusenigmatica:charcoal_dust",Count:1b} -T:{id:"elevatorid:elevator_white",Count:1b} -T:{id:"darkutils:blank_plate",Count:1b} -T:{id:"minecraft:potion",Count:1b,tag:{Potion:"cyclic:haste"}} -T:{id:"curios:ring",Count:1b} -T:{id:"create:schematicannon",Count:1b} -T:{id:"craftingstation:crafting_station",Count:1b} -T:{id:"cookingforblockheads:cooking_table",Count:1b} -T:{id:"comforts:sleeping_bag_white",Count:1b} -T:{id:"charginggadgets:charging_station",Count:1b,tag:{}} -T:{id:"computercraft:computer_normal",Count:1b} -T:{id:"buildinggadgets:gadget_building",Count:1b,tag:{state:{serializer:"buildinggadgets:dummy_serializer",state:{Name:"minecraft:air"},data:{}}}} -T:{id:"botanypots:botany_pot",Count:1b} -T:{id:"patchouli:guide_book",Count:1b,tag:{"patchouli:book":"bloodmagic:guide"}} -T:{id:"biomesoplenty:white_sand",Count:1b} -T:{id:"minecraft:enchanted_book",Count:1b,tag:{StoredEnchantments:[{lvl:1s,id:"astralsorcery:night_vision"}]}} +T:{id:"appliedenergistics2:quartz_vibrant_glass",Count:1b} +T:{id:"appliedenergistics2:quartz_glass",Count:1b} +T:{id:"appliedenergistics2:charged_quartz_ore",Count:1b} T:{id:"appliedenergistics2:quartz_ore",Count:1b} +T:{id:"emendatusenigmatica:charged_certus_quartz_gem",Count:1b} +T:{id:"emendatusenigmatica:certus_quartz_gem",Count:1b} +T:{id:"emendatusenigmatica:charged_certus_quartz_ore",Count:1b} +T:{id:"emendatusenigmatica:certus_quartz_ore",Count:1b} +T:{id:"refinedstorage:silicon",Count:1b} +T:{id:"emendatusenigmatica:silicon_gem",Count:1b} +T:{id:"appliedenergistics2:silicon",Count:1b} +T:{id:"astralsorcery:aquamarine",Count:1b} +T:{id:"minecraft:iron_ingot",Count:1b} +T:{id:"dustrial_decor:rusty_iron_ingot",Count:1b} diff --git a/config/worldedit/worldedit.properties b/config/worldedit/worldedit.properties index 4c6e052..6b43049 100644 --- a/config/worldedit/worldedit.properties +++ b/config/worldedit/worldedit.properties @@ -1,5 +1,5 @@ #Don't put comments; they get removed -#Sun Feb 07 01:23:53 CET 2021 +#Tue Feb 09 23:48:59 CET 2021 default-locale=default super-pickaxe-many-drop-items=true max-calculation-timeout=300 @@ -34,11 +34,11 @@ default-vertical-height=256 max-changed-blocks=-1 default-max-changed-blocks=-1 max-polyhedron-points=20 -allow-symbolic-links=false extended-y-limit=false +allow-symbolic-links=false calculation-timeout=100 -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 +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 log-commands=false log-file= max-super-pickaxe-size=5 diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/blasting.js b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/blasting.js index add3e36..b09c2bb 100644 --- a/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/blasting.js +++ b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/blasting.js @@ -1,4 +1,10 @@ // priority: 99 events.listen('recipes', e => { + // Astral Sorcery + e.blasting('#forge:gems/aquamarine', '#forge:ores/dimensional') + + // AE2 + e.blasting('#forge:gems/certus_quartz', '#forge:ores/certus_quartz') + e.blasting('#forge:gems/charged_certus_quartz', '#forge:ores/charged_certus_quartz') }); \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/shapeless.js b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/shapeless.js index 83df8a5..b705424 100644 --- a/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/shapeless.js +++ b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/shapeless.js @@ -9,12 +9,18 @@ events.listen('recipes', e => { e.shapeless('additional_lights:soul_fire_for_fire_pit_s', ['#fellies:minicoal', '#fellies:minicoal','#fellies:minicoal', '#forge:soul_sand']); e.shapeless('additional_lights:soul_fire_for_fire_pit_l', ['#fellies:minicoal', '#fellies:minicoal','#fellies:minicoal','#fellies:minicoal', '#forge:soul_sand']); + // AE2 + e.shapeless('emendatusenigmatica:silicon_gem', ['appliedenergistics2:silicon']); + // Minecraft e.shapeless('minecraft:sticky_piston', ['minecraft:piston', '#forge:slimeballs']); e.shapeless('minecraft:flint', ['#forge:gravel', '#forge:gravel', '#forge:gravel']); e.shapeless('minecraft:chest', ['#forge:chests/wooden']); e.shapeless('minecraft:wheat_seeds', ['minecraft:wheat']); + // Refined Storage + e.shapeless('emendatusenigmatica:silicon_gem', ['refinedstorage:silicon']); + // RF Tools e.shapeless('rftoolsbase:dimensionalshard', ['emendatusenigmatica:dimensional_gem']); }); \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/smelting.js b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/smelting.js index add3e36..5ae4311 100644 --- a/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/smelting.js +++ b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/smelting.js @@ -1,4 +1,10 @@ // priority: 99 events.listen('recipes', e => { + // Astral Sorcery + e.smelting('#forge:gems/aquamarine', '#forge:ores/dimensional') + + // AE2 + e.smelting('#forge:gems/certus_quartz', '#forge:ores/certus_quartz') + e.smelting('#forge:gems/charged_certus_quartz', '#forge:ores/charged_certus_quartz') }); \ 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 index f9ccf98..d36b211 100644 --- a/kubejs/server_scripts/fellies/kubejs/recipes/remove.js +++ b/kubejs/server_scripts/fellies/kubejs/recipes/remove.js @@ -79,4 +79,7 @@ events.listen('recipes', e => { idsToRemove.forEach(remove => { e.remove({id: remove}) }) + + // Dustrial Decor + e.remove({input: 'dustrial_decor:rusty_iron_ingot'}) }) \ 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 index ab70235..d2cef31 100644 --- a/kubejs/server_scripts/fellies/kubejs/recipes/replace.js +++ b/kubejs/server_scripts/fellies/kubejs/recipes/replace.js @@ -1,9 +1,27 @@ // priority: 98 events.listen('recipes', e => { + // ---- Inputs --- // + // AE2 + e.replaceInput({}, 'appliedenergistics2:certus_quartz_crystal', 'emendatusenigmatica:certus_quartz_gem') + e.replaceInput({}, 'appliedenergistics2:charged_certus_quartz_crystal', 'emendatusenigmatica:charged_certus_quartz_gem') + e.replaceInput({}, 'appliedenergistics2:silicon', 'emendatusenigmatica:silicon_gem') + // Create e.replaceInput({id: 'create:pressing/lapis_block'}, 'minecraft:lapis_block', '#forge:gems/lapis'); // Mana and Artifice e.replaceInput({}, 'mana-and-artifice:vinteum_ore', '#forge:ores/arcane'); + + // Refined Storage + e.replaceInput({}, 'refinedstorage:silicon', 'emendatusenigmatica:silicon_gem') + + // ---- Outputs --- // + // AE2 + e.replaceOutput({}, 'appliedenergistics2:certus_quartz_crystal', 'emendatusenigmatica:certus_quartz_gem') + e.replaceOutput({}, 'appliedenergistics2:charged_certus_quartz_crystal', 'emendatusenigmatica:charged_certus_quartz_gem') + e.replaceOutput({}, 'appliedenergistics2:silicon', 'emendatusenigmatica:silicon_gem') + + // Refined Storage + e.replaceInput({}, 'refinedstorage:silicon', 'emendatusenigmatica:silicon_gem') }); \ No newline at end of file