diff --git a/.gitignore b/.gitignore index 3ae2dae..a6e2e18 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,7 @@ src/config/worldstripper-common.toml # Client configs # These are ones we feel the user should be customizing, not us. -src/config/jei/bookmarks.ini \ No newline at end of file +src/config/jei/bookmarks.ini + +# Mod Junk +src/config/byg/README.txt \ No newline at end of file diff --git a/src/config/byg/byg-world.toml b/src/config/byg/byg-world.toml index 071d3f7..8e5bad9 100644 --- a/src/config/byg/byg-world.toml +++ b/src/config/byg/byg-world.toml @@ -7,7 +7,7 @@ #Is the list of biomes a blacklist or whitelist? #When this list is a blacklist, the values in the list will not be in world generation. #When this list is a whitelist, Adding a biome several times gives it more weight in generation and it must contain at least 1 value. - #When set to true, datapack biomes will work automatically! + #When set to true, datapack biomes will work automatically! When set to false, you will need to manually add datapack entries. #Default: true isBlacklistEnd = true # @@ -18,7 +18,6 @@ # #This works as a whitelist or blacklist depending on the "isBlacklistEnd" value. #NO SPACES AFTER COMMAS! - #DOES NOT ACCEPT DATAPACK VALUES! #Default: "byg:viscal_isles,byg:shattered_viscal_isles,minecraft:small_end_islands,minecraft:the_end,minecraft:end_barrens" BlacklistEnd = "byg:viscal_isles,byg:shattered_viscal_isles,minecraft:small_end_islands,minecraft:the_end,minecraft:end_barrens" # @@ -32,7 +31,6 @@ #Add biomes by their registry String ID's in a commented list. #Adding a biome several times gives it more weight in generation. #NO SPACES AFTER COMMAS! - #DOES NOT ACCEPT DATAPACK VALUES! #Default: "byg:viscal_isles,byg:shattered_viscal_isles,minecraft:small_end_islands" VoidBiomes = "byg:viscal_isles,byg:shattered_viscal_isles,minecraft:small_end_islands" # @@ -154,7 +152,7 @@ #Is the list of biomes a blacklist or whitelist? #When this list is a blacklist, the values in the list will not be in world generation. #When this list is a whitelist, Adding a biome several times gives it more weight in generation and it must contain at least 1 value. - #When set to true, datapack biomes will work automatically! + #When set to true, datapack biomes will work automatically! When set to false, you will need to manually add datapack entries. #Default: true isBlacklistNether = true # @@ -168,7 +166,6 @@ # #This works as a whitelist or blacklist depending on the "isBlacklistNether" value. #NO SPACES AFTER COMMAS! - #DOES NOT ACCEPT DATAPACK VALUES! #Default: "" BlacklistNether = "" diff --git a/src/config/candidate-client.toml b/src/config/candidate-client.toml new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/config/candidate-client.toml @@ -0,0 +1 @@ + diff --git a/src/config/candidate-common.toml b/src/config/candidate-common.toml new file mode 100644 index 0000000..99955d1 --- /dev/null +++ b/src/config/candidate-common.toml @@ -0,0 +1,15 @@ + +#Spawn Settings +["Spawn Settings"] + #Candidate Group Minimum Size + #Range: > 1 + candidate_min_spawn_size = 1 + #Candidate Spawn Group Maximum Size + #Range: > 1 + candidate_max_spawn_size = 1 + #Candidate Spawn Chance Probability + #Range: > 1 + candidate_chance = 1 + #Candidate Spawn Dimension Blacklist + candidate_dimensions = [] + diff --git a/src/config/diregoo-common.toml b/src/config/diregoo-common.toml index 1ab158b..6845d22 100644 --- a/src/config/diregoo-common.toml +++ b/src/config/diregoo-common.toml @@ -137,7 +137,7 @@ #Range: 1 ~ 10000 gen_normal_underground_chance = 25 #Can normal goo generate above ground (in the air) - can_gen_normal_aboveground = true + can_gen_normal_aboveground = false #The minimum Y level that normal goo can spawn underground #Range: 0 ~ 255 gen_normal_underground_ymin = 0 diff --git a/src/config/healingcf-common.toml b/src/config/healingcf-common.toml index ff38a7b..c7085c5 100644 --- a/src/config/healingcf-common.toml +++ b/src/config/healingcf-common.toml @@ -2,7 +2,7 @@ [General] #The radius around the campfire in blocks where players receive the regeneration effect. #Range: 1 ~ 64 - healingRadius = 16 + healingRadius = 8 #The level of regeneration which the campfire applies, by default 1. #Range: 1 ~ 50 regenerationLevel = 1 diff --git a/src/config/hornets-common.toml b/src/config/hornets-common.toml index 4f91ab5..aa1efc5 100644 --- a/src/config/hornets-common.toml +++ b/src/config/hornets-common.toml @@ -15,7 +15,7 @@ hornet_max_spawn_size = 1 #Hornet Spawn Chance Probability #Range: > 1 - hornet_chance = 50 + hornet_chance = 3 #Hornet Spawn Group Minimum Size #Range: > 1 hornet_min_spawn_size = 1 diff --git a/src/config/ichunutil/themes/aztec.json b/src/config/ichunutil/themes/aztec.json deleted file mode 100644 index 1519b0d..0000000 --- a/src/config/ichunutil/themes/aztec.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "name": "Aztec", - "author": "LordFokas", - - "workspaceBackground": [8, 8, 8], - "windowBorder": [96, 96, 96], - "windowBackground": [48, 48, 48], - - "tabBorder": [0, 0, 0], - "tabSideInactive": [50, 50, 50], - - "elementInputBackgroundInactive": [32, 32, 32], - "elementInputBackgroundHover": [24, 24, 24], - "elementInputBorder": [96, 96, 96], - "elementInputUpDownHover": [64, 64, 64], - "elementInputUpDownClick": [48, 48, 48], - - "elementButtonBackgroundInactive": [32, 32, 32], - "elementButtonBackgroundHover": [24, 24, 24], - "elementButtonBorder": [96, 96, 96], - "elementButtonClick": [48, 48, 48], - "elementButtonToggle": [32, 32, 32], - "elementButtonToggleHover": [24, 24, 24], - - "elementProjectTabActive": [80, 80, 80], - "elementProjectTabHover": [64, 64, 64], - "elementProjectTabFont": [240, 240, 240], - "elementProjectTabFontChanges": [120, 120, 240], - - "elementTreeBorder": [192, 192, 192], - "elementTreeScrollBar": [32, 32, 32], - "elementTreeScrollBarBorder": [192, 192, 192], - "elementTreeItemBorder": [32, 32, 32], - "elementTreeItemBg": [32, 32, 32], - "elementTreeItemBgSelect": [12, 12, 12], - "elementTreeItemBgHover": [24, 24, 24], - - "fontChat": [240, 240, 240], - "font": [240, 240, 240], - "fontDim": [192, 192, 192], - - "workspaceBlock": "minecraft:gray_wool" -} \ No newline at end of file diff --git a/src/config/ichunutil/themes/blue&black.json b/src/config/ichunutil/themes/blue&black.json deleted file mode 100644 index 948f460..0000000 --- a/src/config/ichunutil/themes/blue&black.json +++ /dev/null @@ -1,186 +0,0 @@ -{ - "name": "Blue & Black", - "author": "SizzlinBacen", - //Done - "workspaceBackground": [ - 204, - 204, - 204 - ], - //Done - "windowBorder": [ - 0, - 128, - 225 - ], - //Done - "windowBackground": [ - 34, - 34, - 34 - ], - //Done - "tabBorder": [ - 0, - 128, - 225 - ], - - //Done - "tabSideInactive": [ - 0, - 128, - 225 - ], - //Done - "elementInputBackgroundInactive": [ - 60, - 60, - 60 - ], - //Done - "elementInputBackgroundHover": [ - 70, - 70, - 70 - ], - //Done - "elementInputBorder": [ - 0, - 128, - 225 - ], - //Done - "elementInputUpDownHover": [ - 68, - 156, - 223 - ], - //Done - "elementInputUpDownClick": [ - 0, - 0, - 225 - ], - //Done - "elementButtonBackgroundInactive": [ - 60, - 60, - 60 - ], - //Done - "elementButtonBackgroundHover": [ - 70, - 70, - 70 - ], - //Done - "elementButtonBorder": [ - 0, - 150, - 225 - ], - //Done - "elementButtonClick": [ - 100, - 100, - 100 - ], - //Done - "elementButtonToggle": [ - 30, - 30, - 30 - ], - //Done - "elementButtonToggleHover": [ - 170, - 170, - 170 - ], - //Done - "elementProjectTabActive": [ - 60, - 60, - 60 - ], - //Done - "elementProjectTabHover": [ - 100, - 100, - 100 - ], - //Done - "elementProjectTabFont": [ - 140, - 140, - 140 - ], - //Done - "elementProjectTabFontChanges": [ - 255, - 255, - 255 - ], - //Done - "elementTreeBorder": [ - 0, - 128, - 225 - ], - //Done - "elementTreeScrollBar": [ - 34, - 34, - 34 - ], - //Done - "elementTreeScrollBarBorder": [ - 0, - 128, - 225 - ], - //Done - "elementTreeItemBorder": [ - 0, - 128, - 225 - ], - //Done - "elementTreeItemBg": [ - 60, - 60, - 60 - ], - //Done - "elementTreeItemBgSelect": [ - 100, - 100, - 100 - ], - //Done - "elementTreeItemBgHover": [ - 120, - 120, - 120 - ], - //Done - "fontChat": [ - 220, - 220, - 220 - ], - //Done - "font": [ - 255, - 255, - 255 - ], - //Done - "fontDim": [ - 150, - 150, - 150 - ], - "workspaceBlock": "minecraft:light_blue_wool" -} \ No newline at end of file diff --git a/src/config/ichunutil/themes/blue&orange.json b/src/config/ichunutil/themes/blue&orange.json deleted file mode 100644 index c1f4a0c..0000000 --- a/src/config/ichunutil/themes/blue&orange.json +++ /dev/null @@ -1,187 +0,0 @@ -{ - "name": "Blue & Orange", - "author": "ASolvie", - //Done - "workspaceBackground": [ - 255, - 204, - 94 - ], - //Done - "windowBorder": [ - 0, - 128, - 225 - ], - //Done - "windowBackground": [ - 255, - 136, - 34 - ], - //Done - "tabBorder": [ - 0, - 128, - 225 - ], - - //Done - "tabSideInactive": [ - 0, - 128, - 225 - ], - //Done - "elementInputBackgroundInactive": [ - 255, - 100, - 60 - ], - //Done - "elementInputBackgroundHover": [ - 255, - 174, - 70 - ], - //Done - "elementInputBorder": [ - 0, - 128, - 225 - ], - //Done - "elementInputUpDownHover": [ - 68, - 156, - 223 - ], - //Done - "elementInputUpDownClick": [ - 0, - 0, - 225 - ], - //Done - "elementButtonBackgroundInactive": [ - 255, - 100, - 60 - ], - //Done - "elementButtonBackgroundHover": [ - 255, - 174, - 70 - ], - //Done - "elementButtonBorder": [ - 0, - 150, - 225 - ], - //Done - "elementButtonClick": [ - 255, - 100, - 0 - ], - //Done - "elementButtonToggle": [ - 255, - 144, - 30 - ], - //Done - "elementButtonToggleHover": [ - 255, - 200, - 82 - ], - //Done - "elementProjectTabActive": [ - 255, - 100, - 60 - ], - //Done - "elementProjectTabHover": [ - 100, - 100, - 100 - ], - //Done - "elementProjectTabFont": [ - 140, - 140, - 140 - ], - //Done - "elementProjectTabFontChanges": [ - 255, - 255, - 255 - ], - //Done - "elementTreeBorder": [ - 0, - 128, - 225 - ], - //Done - "elementTreeScrollBar": [ - 34, - 34, - 34 - ], - //Done - "elementTreeScrollBarBorder": [ - 0, - 128, - 225 - ], - //Done - "elementTreeItemBorder": [ - 0, - 128, - 225 - ], - //Done - "elementTreeItemBg": [ - 60, - 60, - 60 - ], - //Done - "elementTreeItemBgSelect": [ - 255, - 162, - 98 - ], - //Done - "elementTreeItemBgHover": [ - 255, - 120, - 120 - ], - //Done - "fontChat": [ - 255, - 190, - 120 - ], - //Done - "font": [ - 255, - 255, - 255 - ], - //Done - "fontDim": [ - 255, - 224, - 0 - ], - //Done - "workspaceBlock": "minecraft:light_blue_wool" -} \ No newline at end of file diff --git a/src/config/ichunutil/themes/default.json b/src/config/ichunutil/themes/default.json deleted file mode 100644 index eab702c..0000000 --- a/src/config/ichunutil/themes/default.json +++ /dev/null @@ -1,155 +0,0 @@ -{ - "name": "Default", - "author": "iChun", - "workspaceBackground": [ - 204, - 204, - 204 - ], - "windowBorder": [ - 150, - 150, - 150 - ], - "windowBackground": [ - 34, - 34, - 34 - ], - "tabBorder": [ - 255, - 255, - 255 - ], - "tabSideInactive": [ - 100, - 100, - 100 - ], - "elementInputBackgroundInactive": [ - 60, - 60, - 60 - ], - "elementInputBackgroundHover": [ - 70, - 70, - 70 - ], - "elementInputBorder": [ - 140, - 140, - 140 - ], - "elementInputUpDownHover": [ - 170, - 170, - 170 - ], - "elementInputUpDownClick": [ - 100, - 100, - 100 - ], - "elementButtonBackgroundInactive": [ - 60, - 60, - 60 - ], - "elementButtonBackgroundHover": [ - 70, - 70, - 70 - ], - "elementButtonBorder": [ - 140, - 140, - 140 - ], - "elementButtonClick": [ - 100, - 100, - 100 - ], - "elementButtonToggle": [ - 120, - 120, - 120 - ], - "elementButtonToggleHover": [ - 170, - 170, - 170 - ], - "elementProjectTabActive": [ - 60, - 60, - 60 - ], - "elementProjectTabHover": [ - 100, - 100, - 100 - ], - "elementProjectTabFont": [ - 140, - 140, - 140 - ], - "elementProjectTabFontChanges": [ - 255, - 255, - 255 - ], - "elementTreeBorder": [ - 100, - 100, - 100 - ], - "elementTreeScrollBar": [ - 34, - 34, - 34 - ], - "elementTreeScrollBarBorder": [ - 60, - 60, - 60 - ], - "elementTreeItemBorder": [ - 40, - 40, - 40 - ], - "elementTreeItemBg": [ - 60, - 60, - 60 - ], - "elementTreeItemBgSelect": [ - 100, - 100, - 100 - ], - "elementTreeItemBgHover": [ - 120, - 120, - 120 - ], - "fontChat": [ - 220, - 220, - 220 - ], - "font": [ - 255, - 255, - 255 - ], - "fontDim": [ - 150, - 150, - 150 - ], - "workspaceBlock": "minecraft:spruce_planks" -} \ No newline at end of file diff --git a/src/config/ichunutil/themes/grassgreen.json b/src/config/ichunutil/themes/grassgreen.json deleted file mode 100644 index 9601787..0000000 --- a/src/config/ichunutil/themes/grassgreen.json +++ /dev/null @@ -1,185 +0,0 @@ -{ - "name": "GrassGreen", - "author": "SizzlinBacen", - //Done - "workspaceBackground": [ - 183, - 255, - 183 - ], - //Done - "windowBorder": [ - 6, - 179, - 0 - ], - //Done - "windowBackground": [ - 74, - 230, - 74 - ], - //Done - "tabBorder": [ - 74, - 230, - 74 - ], - //Done - "tabSideInactive": [ - 70, - 148, - 70 - ], - //Done - "elementInputBackgroundInactive": [ - 45, - 209, - 45 - ], - //Done - "elementInputBackgroundHover": [ - 110, - 225, - 110 - ], - //Done - "elementInputBorder": [ - 6, - 179, - 0 - ], - //Done - "elementInputUpDownHover": [ - 7, - 223, - 0 - ], - //Done - "elementInputUpDownClick": [ - 46, - 188, - 46 - ], - //Done - "elementButtonBackgroundInactive": [ - 74, - 230, - 74 - ], - //Done - "elementButtonBackgroundHover": [ - 6, - 195, - 0 - ], - //Done - "elementButtonBorder": [ - 6, - 179, - 0 - ], - //Done - "elementButtonClick": [ - 60, - 152, - 60 - ], - //Done - "elementButtonToggle": [ - 48, - 111, - 48 - ], - //Done - "elementButtonToggleHover": [ - 170, - 170, - 170 - ], - //Done - "elementProjectTabActive": [ - 74, - 230, - 74 - ], - //Done - "elementProjectTabHover": [ - 46, - 188, - 46 - ], - //Done - "elementProjectTabFont": [ - 255, - 255, - 255 - ], - //Done - "elementProjectTabFontChanges": [ - 255, - 255, - 255 - ], - //Done - "elementTreeBorder": [ - 6, - 179, - 0 - ], - //Done - "elementTreeScrollBar": [ - 74, - 230, - 74 - ], - //Done - "elementTreeScrollBarBorder": [ - 6, - 179, - 0 - ], - //Done - "elementTreeItemBorder": [ - 6, - 179, - 0 - ], - //Done - "elementTreeItemBg": [ - 74, - 230, - 74 - ], - //Done - "elementTreeItemBgSelect": [ - 60, - 152, - 60 - ], - //Done - "elementTreeItemBgHover": [ - 46, - 188, - 46 - ], - //Done - "fontChat": [ - 0, - 100, - 0 - ], - //Done - "font": [ - 255, - 255, - 255 - ], - //Done - "fontDim": [ - 225, - 225, - 225 - ], - "workspaceBlock": "minecraft:grass_block" -} \ No newline at end of file diff --git a/src/config/ichunutil/themes/green&black.json b/src/config/ichunutil/themes/green&black.json deleted file mode 100644 index 8a9f059..0000000 --- a/src/config/ichunutil/themes/green&black.json +++ /dev/null @@ -1,186 +0,0 @@ -{ - "name": "Green & Black", - "author": "SizzlinBacen", - //Done - "workspaceBackground": [ - 204, - 204, - 204 - ], - //Done - "windowBorder": [ - 0, - 175, - 0 - ], - //Done - "windowBackground": [ - 34, - 34, - 34 - ], - //Done - "tabBorder": [ - 0, - 175, - 0 - ], - - //Done - "tabSideInactive": [ - 0, - 175, - 0 - ], - //Done - "elementInputBackgroundInactive": [ - 60, - 60, - 60 - ], - //Done - "elementInputBackgroundHover": [ - 70, - 70, - 70 - ], - //Done - "elementInputBorder": [ - 0, - 175, - 0 - ], - //Done - "elementInputUpDownHover": [ - 0, - 150, - 0 - ], - //Done - "elementInputUpDownClick": [ - 0, - 225, - 0 - ], - //Done - "elementButtonBackgroundInactive": [ - 60, - 60, - 60 - ], - //Done - "elementButtonBackgroundHover": [ - 70, - 70, - 70 - ], - //Done - "elementButtonBorder": [ - 0, - 152, - 0 - ], - //Done - "elementButtonClick": [ - 100, - 100, - 100 - ], - //Done - "elementButtonToggle": [ - 30, - 30, - 30 - ], - //Done - "elementButtonToggleHover": [ - 170, - 170, - 170 - ], - //Done - "elementProjectTabActive": [ - 60, - 60, - 60 - ], - //Done - "elementProjectTabHover": [ - 100, - 100, - 100 - ], - //Done - "elementProjectTabFont": [ - 140, - 140, - 140 - ], - //Done - "elementProjectTabFontChanges": [ - 255, - 255, - 255 - ], - //Done - "elementTreeBorder": [ - 0, - 204, - 0 - ], - //Done - "elementTreeScrollBar": [ - 34, - 34, - 34 - ], - //Done - "elementTreeScrollBarBorder": [ - 0, - 175, - 0 - ], - //Done - "elementTreeItemBorder": [ - 0, - 175, - 0 - ], - //Done - "elementTreeItemBg": [ - 60, - 60, - 60 - ], - //Done - "elementTreeItemBgSelect": [ - 100, - 100, - 100 - ], - //Done - "elementTreeItemBgHover": [ - 120, - 120, - 120 - ], - //Done - "fontChat": [ - 220, - 220, - 220 - ], - //Done - "font": [ - 255, - 255, - 255 - ], - //Done - "fontDim": [ - 150, - 150, - 150 - ], - "workspaceBlock": "minecraft:lime_wool" -} \ No newline at end of file diff --git a/src/config/ichunutil/themes/lazygray.json b/src/config/ichunutil/themes/lazygray.json deleted file mode 100644 index 3c257c6..0000000 --- a/src/config/ichunutil/themes/lazygray.json +++ /dev/null @@ -1,155 +0,0 @@ -{ - "name": "Lazy Gray", - "author": "iLexiconn", - "workspaceBackground": [ - 255, - 255, - 255 - ], - "windowBorder": [ - 41, - 41, - 41 - ], - "windowBackground": [ - 61, - 61, - 61 - ], - "tabBorder": [ - 255, - 255, - 255 - ], - "tabSideInactive": [ - 100, - 100, - 100 - ], - "elementInputBackgroundInactive": [ - 60, - 60, - 60 - ], - "elementInputBackgroundHover": [ - 70, - 70, - 70 - ], - "elementInputBorder": [ - 140, - 140, - 140 - ], - "elementInputUpDownHover": [ - 170, - 170, - 170 - ], - "elementInputUpDownClick": [ - 100, - 100, - 100 - ], - "elementButtonBackgroundInactive": [ - 60, - 60, - 60 - ], - "elementButtonBackgroundHover": [ - 70, - 70, - 70 - ], - "elementButtonBorder": [ - 140, - 140, - 140 - ], - "elementButtonClick": [ - 100, - 100, - 100 - ], - "elementButtonToggle": [ - 120, - 120, - 120 - ], - "elementButtonToggleHover": [ - 170, - 170, - 170 - ], - "elementProjectTabActive": [ - 60, - 60, - 60 - ], - "elementProjectTabHover": [ - 100, - 100, - 100 - ], - "elementProjectTabFont": [ - 140, - 140, - 140 - ], - "elementProjectTabFontChanges": [ - 255, - 255, - 255 - ], - "elementTreeBorder": [ - 100, - 100, - 100 - ], - "elementTreeScrollBar": [ - 34, - 34, - 34 - ], - "elementTreeScrollBarBorder": [ - 60, - 60, - 60 - ], - "elementTreeItemBorder": [ - 40, - 40, - 40 - ], - "elementTreeItemBg": [ - 60, - 60, - 60 - ], - "elementTreeItemBgSelect": [ - 100, - 100, - 100 - ], - "elementTreeItemBgHover": [ - 100, - 100, - 100 - ], - "fontChat": [ - 220, - 220, - 220 - ], - "font": [ - 255, - 255, - 255 - ], - "fontDim": [ - 150, - 150, - 150 - ], - "workspaceBlock": "minecraft:gray_wool" -} diff --git a/src/config/ichunutil/themes/monogeneric.json b/src/config/ichunutil/themes/monogeneric.json deleted file mode 100644 index 2a91ff4..0000000 --- a/src/config/ichunutil/themes/monogeneric.json +++ /dev/null @@ -1,185 +0,0 @@ -{ - "name": "MonoGeneric", - "author": "Arcaratus", - //Done - "workspaceBackground": [ - 200, - 200, - 200 - ], - //Done - "windowBorder": [ - 0, - 0, - 0 - ], - //Done - "windowBackground": [ - 50, - 50, - 50 - ], - //Done - "tabBorder": [ - 10, - 10, - 10 - ], - //Done - "tabSideInactive": [ - 70, - 70, - 70 - ], - //Done - "elementInputBackgroundInactive": [ - 75, - 75, - 75 - ], - //Done - "elementInputBackgroundHover": [ - 100, - 100, - 100 - ], - //Done - "elementInputBorder": [ - 0, - 0, - 0 - ], - //Done - "elementInputUpDownHover": [ - 100, - 100, - 100 - ], - //Done - "elementInputUpDownClick": [ - 140, - 140, - 140 - ], - //Done - "elementButtonBackgroundInactive": [ - 80, - 80, - 80 - ], - //Done - "elementButtonBackgroundHover": [ - 130, - 130, - 130 - ], - //Done - "elementButtonBorder": [ - 180, - 180, - 180 - ], - //Done - "elementButtonClick": [ - 160, - 160, - 160 - ], - //Done - "elementButtonToggle": [ - 190, - 190, - 190 - ], - //Done - "elementButtonToggleHover": [ - 170, - 170, - 170 - ], - //Done - "elementProjectTabActive": [ - 190, - 190, - 190 - ], - //Done - "elementProjectTabHover": [ - 150, - 150, - 150 - ], - //Done - "elementProjectTabFont": [ - 255, - 255, - 255 - ], - //Done - "elementProjectTabFontChanges": [ - 255, - 255, - 255 - ], - //Done - "elementTreeBorder": [ - 20, - 20, - 20 - ], - //Done - "elementTreeScrollBar": [ - 60, - 60, - 60 - ], - //Done - "elementTreeScrollBarBorder": [ - 35, - 35, - 35 - ], - //Done - "elementTreeItemBorder": [ - 45, - 45, - 45 - ], - //Done - "elementTreeItemBg": [ - 90, - 90, - 90 - ], - //Done - "elementTreeItemBgSelect": [ - 120, - 120, - 120 - ], - //Done - "elementTreeItemBgHover": [ - 105, - 105, - 105 - ], - //Done - "fontChat": [ - 255, - 255, - 255 - ], - //Done - "font": [ - 255, - 255, - 255 - ], - //Done - "fontDim": [ - 235, - 235, - 235 - ], - "workspaceBlock": "minecraft:smooth_stone_slab" -} \ No newline at end of file diff --git a/src/config/ichunutil/themes/nightblack.json b/src/config/ichunutil/themes/nightblack.json deleted file mode 100644 index 161dbdc..0000000 --- a/src/config/ichunutil/themes/nightblack.json +++ /dev/null @@ -1,155 +0,0 @@ -{ - "name": "Night Black", - "author": "pfgichun", - "workspaceBackground": [ - 0, - 0, - 0 - ], - "windowBorder": [ - 0, - 0, - 0 - ], - "windowBackground": [ - 0, - 0, - 0 - ], - "tabBorder": [ - 0, - 0, - 0 - ], - "tabSideInactive": [ - 50, - 50, - 50 - ], - "elementInputBackgroundInactive": [ - 0, - 0, - 0 - ], - "elementInputBackgroundHover": [ - 10, - 10, - 10 - ], - "elementInputBorder": [ - 50, - 50, - 50 - ], - "elementInputUpDownHover": [ - 40, - 40, - 40 - ], - "elementInputUpDownClick": [ - 30, - 30, - 30 - ], - "elementButtonBackgroundInactive": [ - 50, - 50, - 50 - ], - "elementButtonBackgroundHover": [ - 40, - 40, - 40 - ], - "elementButtonBorder": [ - 50, - 50, - 50 - ], - "elementButtonClick": [ - 30, - 30, - 30 - ], - "elementButtonToggle": [ - 50, - 50, - 50 - ], - "elementButtonToggleHover": [ - 40, - 40, - 40 - ], - "elementProjectTabActive": [ - 50, - 50, - 50 - ], - "elementProjectTabHover": [ - 40, - 40, - 40 - ], - "elementProjectTabFont": [ - 60, - 60, - 60 - ], - "elementProjectTabFontChanges": [ - 255, - 255, - 255 - ], - "elementTreeBorder": [ - 50, - 50, - 50 - ], - "elementTreeScrollBar": [ - 50, - 50, - 50 - ], - "elementTreeScrollBarBorder": [ - 50, - 50, - 50 - ], - "elementTreeItemBorder": [ - 50, - 50, - 50 - ], - "elementTreeItemBg": [ - 50, - 50, - 50 - ], - "elementTreeItemBgSelect": [ - 30, - 30, - 30 - ], - "elementTreeItemBgHover": [ - 40, - 40, - 40 - ], - "fontChat": [ - 255, - 255, - 255 - ], - "font": [ - 255, - 255, - 255 - ], - "fontDim": [ - 150, - 150, - 150 - ], - "workspaceBlock": "minecraft:black_wool" -} \ No newline at end of file diff --git a/src/config/ichunutil/themes/red&black.json b/src/config/ichunutil/themes/red&black.json deleted file mode 100644 index 7440e20..0000000 --- a/src/config/ichunutil/themes/red&black.json +++ /dev/null @@ -1,187 +0,0 @@ -{ - "name": "Red & Black", - "author": "SizzlinBacen", - //Done - "workspaceBackground": [ - 204, - 204, - 204 - ], - //Done - "windowBorder": [ - 255, - 100, - 100 - ], - //Done - "windowBackground": [ - 34, - 34, - 34 - ], - //Done - "tabBorder": [ - 255, - 100, - 100 - ], - - //Done - "tabSideInactive": [ - 255, - 100, - 100 - ], - //Done - "elementInputBackgroundInactive": [ - 60, - 60, - 60 - ], - //Done - "elementInputBackgroundHover": [ - 70, - 70, - 70 - ], - //Done - "elementInputBorder": [ - 255, - 100, - 100 - ], - //Done - "elementInputUpDownHover": [ - 255, - 150, - 150 - ], - //Done - "elementInputUpDownClick": [ - 255, - 50, - 50 - ], - //Done - "elementButtonBackgroundInactive": [ - 60, - 60, - 60 - ], - //Done - "elementButtonBackgroundHover": [ - 70, - 70, - 70 - ], - //Done - "elementButtonBorder": [ - 225, - 100, - 100 - ], - //Done - "elementButtonClick": [ - 100, - 100, - 100 - ], - //Done - "elementButtonToggle": [ - 30, - 30, - 30 - ], - //Done - "elementButtonToggleHover": [ - 170, - 170, - 170 - ], - //Done - "elementProjectTabActive": [ - 60, - 60, - 60 - ], - //Done - "elementProjectTabHover": [ - 100, - 100, - 100 - ], - //Done - "elementProjectTabFont": [ - 140, - 140, - 140 - ], - //Done - "elementProjectTabFontChanges": [ - 255, - 255, - 255 - ], - //Done - "elementTreeBorder": [ - 255, - 100, - 100 - ], - //Done - "elementTreeScrollBar": [ - 34, - 34, - 34 - ], - //Done - "elementTreeScrollBarBorder": [ - 255, - 100, - 100 - ], - //Done - "elementTreeItemBorder": [ - 255, - 100, - 100 - ], - //Done - "elementTreeItemBg": [ - 60, - 60, - 60 - ], - //Done - "elementTreeItemBgSelect": [ - 100, - 100, - 100 - ], - //Done - "elementTreeItemBgHover": [ - 120, - 120, - 120 - ], - //Done - "fontChat": [ - 220, - 220, - 220 - ], - //Done - "font": [ - 255, - 255, - 255 - ], - //Done - "fontDim": [ - 150, - 150, - 150 - ], - //Done - "workspaceBlock": "minecraft:red_wool" -} \ No newline at end of file diff --git a/src/config/ichunutil/themes/skyblue.json b/src/config/ichunutil/themes/skyblue.json deleted file mode 100644 index ee3f117..0000000 --- a/src/config/ichunutil/themes/skyblue.json +++ /dev/null @@ -1,188 +0,0 @@ -{ - "name": "SkyBlue", - "author": "SizzlinBacen", - //Done - "workspaceBackground": [ - 138, - 205, - 255 - ], - //Done - "windowBorder": [ - 36, - 131, - 255 - ], - //Done - "windowBackground": [ - 88, - 155, - 243 - ], - //Done - "tabBorder": [ - 159, - 230, - 255 - ], - //Done - "tabSideInactive": [ - 159, - 230, - 255 - ], - //Done - "elementInputBackgroundInactive": [ - 166, - 217, - 255 - ], - //Done - "elementInputBackgroundHover": [ - 201, - 232, - 255 - ], - //Done - "elementInputBorder": [ - 0, - 128, - 255 - ], - //Done - "elementInputUpDownHover": [ - 20, - 148, - 225 - ], - //Done - "elementInputUpDownClick": [ - 50, - 178, - 225 - ], - //Done - "elementButtonBackgroundInactive": [ - 166, - 217, - 255 - ], - //Done - "elementButtonBackgroundHover": [ - 186, - 237, - 255 - ], - //Done - "elementButtonBorder": [ - 0, - 128, - 225 - ], - //Done - "elementButtonClick": [ - 20, - 148, - 225 - ], - //Done - "elementButtonToggle": [ - 166, - 217, - 255 - ], - //Done - "elementButtonToggleHover": [ - 0, - 128, - 255 - ], - //Done - "elementProjectTabActive": [ - 92, - 185, - 255 - ], - //Done - "elementProjectTabHover": [ - 62, - 165, - 235 - ], - - //Done - "elementProjectTabFont": [ - 200, - 200, - 200 - ], - //Done - "elementProjectTabFontChanges": [ - 255, - 255, - 255 - ], - //Done - "elementTreeBorder": [ - 36, - 131, - 255 - ], - //Done - "elementTreeScrollBar": [ - 166, - 217, - 255 - ], - //Done - "elementTreeScrollBarBorder": [ - 36, - 131, - 255 - ], - //Done - "elementTreeItemBorder": [ - 36, - 131, - 255 - ], - //Done - "elementTreeItemBg": [ - 166, - 217, - 255 - ], - //Done - "elementTreeItemBgSelect": [ - 146, - 187, - 255 - ], - //Done - "elementTreeItemBgHover": [ - 201, - 232, - 255 - ], - - //Done - "fontChat": [ - 51, - 51, - 225 - ], - - //Done - "font": [ - 255, - 255, - 255 - ], - //Done - "fontDim": [ - 255, - 255, - 255 - ], - "workspaceBlock": "minecraft:ice" -} \ No newline at end of file diff --git a/src/config/ichunutil/themes/whitelight.json b/src/config/ichunutil/themes/whitelight.json deleted file mode 100644 index 7132b17..0000000 --- a/src/config/ichunutil/themes/whitelight.json +++ /dev/null @@ -1,155 +0,0 @@ -{ - "name": "White Light", - "author": "pfgichun", - "workspaceBackground": [ - 255, - 255, - 255 - ], - "windowBorder": [ - 255, - 255, - 255 - ], - "windowBackground": [ - 255, - 255, - 255 - ], - "tabBorder": [ - 255, - 255, - 255 - ], - "tabSideInactive": [ - 205, - 205, - 205 - ], - "elementInputBackgroundInactive": [ - 255, - 255, - 255 - ], - "elementInputBackgroundHover": [ - 245, - 245, - 245 - ], - "elementInputBorder": [ - 205, - 205, - 205 - ], - "elementInputUpDownHover": [ - 215, - 215, - 215 - ], - "elementInputUpDownClick": [ - 225, - 225, - 225 - ], - "elementButtonBackgroundInactive": [ - 205, - 205, - 205 - ], - "elementButtonBackgroundHover": [ - 215, - 215, - 215 - ], - "elementButtonBorder": [ - 205, - 205, - 205 - ], - "elementButtonClick": [ - 225, - 225, - 225 - ], - "elementButtonToggle": [ - 205, - 205, - 205 - ], - "elementButtonToggleHover": [ - 215, - 215, - 215 - ], - "elementProjectTabActive": [ - 205, - 205, - 205 - ], - "elementProjectTabHover": [ - 215, - 215, - 215 - ], - "elementProjectTabFont": [ - 195, - 195, - 195 - ], - "elementProjectTabFontChanges": [ - 255, - 255, - 255 - ], - "elementTreeBorder": [ - 205, - 205, - 205 - ], - "elementTreeScrollBar": [ - 205, - 205, - 205 - ], - "elementTreeScrollBarBorder": [ - 205, - 205, - 205 - ], - "elementTreeItemBorder": [ - 205, - 205, - 205 - ], - "elementTreeItemBg": [ - 205, - 205, - 205 - ], - "elementTreeItemBgSelect": [ - 225, - 225, - 225 - ], - "elementTreeItemBgHover": [ - 215, - 215, - 215 - ], - "fontChat": [ - 0, - 0, - 0 - ], - "font": [ - 0, - 0, - 0 - ], - "fontDim": [ - 105, - 105, - 105 - ], - "workspaceBlock": "minecraft:white_wool" -} \ No newline at end of file diff --git a/src/config/itemphysic-client.json b/src/config/itemphysic-client.json new file mode 100644 index 0000000..f95921b --- /dev/null +++ b/src/config/itemphysic-client.json @@ -0,0 +1,9 @@ +{ + "rendering": { + "oldRotation": false, + "vanillaRendering": false, + "rotateSpeed": 1.0, + "showPickupTooltip": true, + "disableThrowHUD": false + } +} \ No newline at end of file diff --git a/src/config/itemphysic.json b/src/config/itemphysic.json new file mode 100644 index 0000000..3369731 --- /dev/null +++ b/src/config/itemphysic.json @@ -0,0 +1,186 @@ +{ + "general": { + "despawnItem": 6000, + "customThrow": true, + "fallSounds": true, + "enableIgniting": true, + "swimmingItems": { + "entries": [ + "{material:\"minecraft:oak_planks\",id:\"material\"}", + "{material:\"minecraft:white_bed\",id:\"material\"}", + "{material:\"minecraft:sponge\",id:\"material\"}", + "{material:\"minecraft:packed_ice\",id:\"material\"}", + "{material:\"minecraft:ice\",id:\"material\"}", + "{material:\"minecraft:oak_leaves\",id:\"material\"}", + "{material:\"minecraft:oak_sapling\",id:\"material\"}", + "{material:\"minecraft:white_carpet\",id:\"material\"}", + "{material:\"minecraft:snow\",id:\"material\"}", + "{material:\"minecraft:cactus\",id:\"material\"}", + "{material:\"minecraft:cake\",id:\"material\"}", + "{material:\"minecraft:grass\",id:\"material\"}", + "{material:\"minecraft:cobweb\",id:\"material\"}", + "{block:\"minecraft:snow\",id:\"block\"}", + "{item:\"minecraft:apple\",id:\"item\"}", + "{item:\"minecraft:bow\",id:\"item\"}", + "{item:\"minecraft:bowl\",id:\"item\"}", + "{item:\"minecraft:arrow\",id:\"item\"}", + "{item:\"minecraft:apple\",id:\"item\"}", + "{block:\"minecraft:tripwire\",id:\"block\"}", + "{item:\"minecraft:feather\",id:\"item\"}", + "{item:\"minecraft:wheat\",id:\"item\"}", + "{item:\"minecraft:bread\",id:\"item\"}", + "{item:\"minecraft:painting\",id:\"item\"}", + "{item:\"minecraft:acacia_boat\",id:\"item\"}", + "{block:\"minecraft:acacia_door\",id:\"block\"}", + "{item:\"minecraft:dark_oak_boat\",id:\"item\"}", + "{block:\"minecraft:dark_oak_door\",id:\"block\"}", + "{item:\"minecraft:birch_boat\",id:\"item\"}", + "{block:\"minecraft:birch_door\",id:\"block\"}", + "{item:\"minecraft:jungle_boat\",id:\"item\"}", + "{block:\"minecraft:jungle_door\",id:\"block\"}", + "{item:\"minecraft:oak_boat\",id:\"item\"}", + "{block:\"minecraft:oak_door\",id:\"block\"}", + "{item:\"minecraft:spruce_boat\",id:\"item\"}", + "{block:\"minecraft:spruce_door\",id:\"block\"}", + "{item:\"minecraft:saddle\",id:\"item\"}", + "{item:\"minecraft:bone\",id:\"item\"}", + "{item:\"minecraft:sugar\",id:\"item\"}", + "{item:\"minecraft:egg\",id:\"item\"}", + "{item:\"minecraft:fishing_rod\",id:\"item\"}", + "{block:\"minecraft:cake\",id:\"block\"}", + "{block:\"minecraft:melon\",id:\"block\"}", + "{item:\"minecraft:shears\",id:\"item\"}", + "{block:\"minecraft:carrots\",id:\"block\"}", + "{block:\"minecraft:potatoes\",id:\"block\"}", + "{item:\"minecraft:poisonous_potato\",id:\"item\"}", + "{item:\"minecraft:baked_potato\",id:\"item\"}", + "{item:\"minecraft:pumpkin_pie\",id:\"item\"}", + "{item:\"minecraft:elytra\",id:\"item\"}", + "{item:\"minecraft:mutton\",id:\"item\"}", + "{item:\"minecraft:cooked_mutton\",id:\"item\"}", + "{item:\"minecraft:rabbit\",id:\"item\"}", + "{item:\"minecraft:cooked_rabbit\",id:\"item\"}", + "{item:\"minecraft:rabbit_stew\",id:\"item\"}", + "{item:\"minecraft:beetroot\",id:\"item\"}", + "{block:\"minecraft:beetroots\",id:\"block\"}", + "{item:\"minecraft:beetroot_soup\",id:\"item\"}", + "{item:\"minecraft:shield\",id:\"item\"}", + "{block:\"minecraft:wheat\",id:\"block\"}", + "{block:\"minecraft:pumpkin_stem\",id:\"block\"}", + "{block:\"minecraft:melon_stem\",id:\"block\"}", + "{item:\"minecraft:snowball\",id:\"item\"}" + ], + "isWhitelist": true + }, + "burningItems": { + "entries": [ + "{material:\"minecraft:oak_planks\",id:\"material\"}", + "{material:\"minecraft:white_bed\",id:\"material\"}", + "{material:\"minecraft:sponge\",id:\"material\"}", + "{material:\"minecraft:packed_ice\",id:\"material\"}", + "{material:\"minecraft:ice\",id:\"material\"}", + "{material:\"minecraft:oak_leaves\",id:\"material\"}", + "{material:\"minecraft:oak_sapling\",id:\"material\"}", + "{material:\"minecraft:white_carpet\",id:\"material\"}", + "{material:\"minecraft:snow\",id:\"material\"}", + "{material:\"minecraft:cactus\",id:\"material\"}", + "{material:\"minecraft:cake\",id:\"material\"}", + "{material:\"minecraft:grass\",id:\"material\"}", + "{material:\"minecraft:cobweb\",id:\"material\"}", + "{material:\"minecraft:dirt\",id:\"material\"}", + "{block:\"minecraft:snow\",id:\"block\"}", + "{item:\"minecraft:apple\",id:\"item\"}", + "{item:\"minecraft:bow\",id:\"item\"}", + "{item:\"minecraft:bowl\",id:\"item\"}", + "{item:\"minecraft:arrow\",id:\"item\"}", + "{item:\"minecraft:apple\",id:\"item\"}", + "{block:\"minecraft:tripwire\",id:\"block\"}", + "{item:\"minecraft:feather\",id:\"item\"}", + "{item:\"minecraft:wheat\",id:\"item\"}", + "{item:\"minecraft:bread\",id:\"item\"}", + "{item:\"minecraft:leather\",id:\"item\"}", + "{item:\"minecraft:leather_boots\",id:\"item\"}", + "{item:\"minecraft:leather_chestplate\",id:\"item\"}", + "{item:\"minecraft:leather_helmet\",id:\"item\"}", + "{item:\"minecraft:leather_leggings\",id:\"item\"}", + "{item:\"minecraft:lead\",id:\"item\"}", + "{item:\"minecraft:painting\",id:\"item\"}", + "{item:\"minecraft:acacia_boat\",id:\"item\"}", + "{block:\"minecraft:acacia_door\",id:\"block\"}", + "{item:\"minecraft:dark_oak_boat\",id:\"item\"}", + "{block:\"minecraft:dark_oak_door\",id:\"block\"}", + "{item:\"minecraft:birch_boat\",id:\"item\"}", + "{block:\"minecraft:birch_door\",id:\"block\"}", + "{item:\"minecraft:jungle_boat\",id:\"item\"}", + "{block:\"minecraft:jungle_door\",id:\"block\"}", + "{item:\"minecraft:oak_boat\",id:\"item\"}", + "{block:\"minecraft:oak_door\",id:\"block\"}", + "{item:\"minecraft:spruce_boat\",id:\"item\"}", + "{block:\"minecraft:spruce_door\",id:\"block\"}", + "{item:\"minecraft:saddle\",id:\"item\"}", + "{item:\"minecraft:bone\",id:\"item\"}", + "{item:\"minecraft:sugar\",id:\"item\"}", + "{item:\"minecraft:paper\",id:\"item\"}", + "{item:\"minecraft:book\",id:\"item\"}", + "{item:\"minecraft:egg\",id:\"item\"}", + "{item:\"minecraft:fishing_rod\",id:\"item\"}", + "{block:\"minecraft:cake\",id:\"block\"}", + "{block:\"minecraft:melon\",id:\"block\"}", + "{item:\"minecraft:shears\",id:\"item\"}", + "{item:\"minecraft:writable_book\",id:\"item\"}", + "{item:\"minecraft:written_book\",id:\"item\"}", + "{block:\"minecraft:carrots\",id:\"block\"}", + "{block:\"minecraft:potatoes\",id:\"block\"}", + "{item:\"minecraft:poisonous_potato\",id:\"item\"}", + "{item:\"minecraft:baked_potato\",id:\"item\"}", + "{item:\"minecraft:map\",id:\"item\"}", + "{item:\"minecraft:pumpkin_pie\",id:\"item\"}", + "{item:\"minecraft:name_tag\",id:\"item\"}", + "{item:\"minecraft:enchanted_book\",id:\"item\"}", + "{item:\"minecraft:elytra\",id:\"item\"}", + "{item:\"minecraft:mutton\",id:\"item\"}", + "{item:\"minecraft:cooked_mutton\",id:\"item\"}", + "{item:\"minecraft:rabbit\",id:\"item\"}", + "{item:\"minecraft:cooked_rabbit\",id:\"item\"}", + "{item:\"minecraft:rabbit_stew\",id:\"item\"}", + "{item:\"minecraft:beetroot\",id:\"item\"}", + "{block:\"minecraft:beetroots\",id:\"block\"}", + "{item:\"minecraft:beetroot_soup\",id:\"item\"}", + "{item:\"minecraft:shield\",id:\"item\"}", + "{block:\"minecraft:wheat\",id:\"block\"}", + "{block:\"minecraft:pumpkin_stem\",id:\"block\"}", + "{block:\"minecraft:melon_stem\",id:\"block\"}", + "{id:\"fuel\"}", + "{item:\"minecraft:spider_eye\",id:\"item\"}", + "{item:\"minecraft:rotten_flesh\",id:\"item\"}", + "{item:\"minecraft:snowball\",id:\"item\"}" + ], + "isWhitelist": true + }, + "undestroyableItems": { + "entries": [ + "{item:\"minecraft:nether_star\",id:\"item\"}", + "{block:\"minecraft:bedrock\",id:\"block\"}", + "{block:\"minecraft:obsidian\",id:\"block\"}", + "{material:\"minecraft:barrier\",id:\"material\"}" + ], + "isWhitelist": true + }, + "ignitingItems": { + "entries": [ + "{material:\"minecraft:lava\",id:\"material\"}", + "{block:\"minecraft:torch\",id:\"block\"}", + "{item:\"minecraft:lava_bucket\",id:\"item\"}", + "{item:\"minecraft:blaze_powder\",id:\"item\"}" + ], + "isWhitelist": true + } + }, + "pickup": { + "customPickup": false, + "pickupWhenSneaking": true, + "maximumPickupRange": 5.0, + "pickupMinedImmediately": false, + "respectRangeWhenMined": false + } +} \ No newline at end of file diff --git a/src/config/jei/ingredient-list-mod-sort-order.ini b/src/config/jei/ingredient-list-mod-sort-order.ini index 44d34be..af22f76 100644 --- a/src/config/jei/ingredient-list-mod-sort-order.ini +++ b/src/config/jei/ingredient-list-mod-sort-order.ini @@ -18,11 +18,9 @@ CoFH Core Eyes in the Darkness Jumbo Furnace Pane In The Glass -Tetra The Undergarden Thermal Series Wall-Jump! -Hornets Spice of Life: Carrot Edition The Veggie Way Goopers @@ -31,3 +29,10 @@ Artifacts Comforts Curios API Edible Bugs +Better Shields +Rough Tweaks +Simple Absorption +Candidate +Hornets +Metal Barrels +Silent Gear diff --git a/src/config/jei/recipe-category-sort-order.ini b/src/config/jei/recipe-category-sort-order.ini index 436803e..62def1d 100644 --- a/src/config/jei/recipe-category-sort-order.ini +++ b/src/config/jei/recipe-category-sort-order.ini @@ -37,3 +37,6 @@ thermal:smelter thermal:smelter_catalyst thermal:stirling_fuel ediblebugs:frying +silentgear:category/gear_crafting +silentgear:grading +silentgear:salvaging diff --git a/src/config/mining_helmet-client.toml b/src/config/mining_helmet-client.toml index 55936dc..7a3e4ef 100644 --- a/src/config/mining_helmet-client.toml +++ b/src/config/mining_helmet-client.toml @@ -4,3 +4,13 @@ #The Mining Helmet will cover the face of whatever mob is wearing it. helmetCoversFace = true + [client.dynamic_lighting] + #The rate at which the Mining Helmet refreshes it's light (measured in ticks). Lower values are smoother but result in worse fps. + #Range: > 1 + lightRefreshRate = 2 + #Should dynamic lighting still occur if an entity is behind a wall. Turning this on may impact performance, but allows light to be seen around corners. + seeThroughWalls = false + #How far away you should be able to see light from a mining helmet from other mobs (measured in blocks). 0 for infinite distance. Use this to prevent far away mobs from causing light updates. + #Range: > 0 + maxVisibleDistance = 128 + diff --git a/src/config/repurposed_structures-common.toml b/src/config/repurposed_structures-common.toml index 8c6dd75..d24bb91 100644 --- a/src/config/repurposed_structures-common.toml +++ b/src/config/repurposed_structures-common.toml @@ -35,7 +35,7 @@ giantBouldersPerChunk = 0.5 # # Adds tiny boulders to modded Taiga biomes. - addTinyBouldersModdedBiomes = false + addTinyBouldersModdedBiomes = true # # Adds a large tree somewhat uncommonly to Swamp biome and replaces # all vanilla trees in Swamp Hills biome with the larger tree. diff --git a/src/config/repurposed_structures-mineshafts.toml b/src/config/repurposed_structures-mineshafts.toml index 66cb6f9..a2d0011 100644 --- a/src/config/repurposed_structures-mineshafts.toml +++ b/src/config/repurposed_structures-mineshafts.toml @@ -5,7 +5,7 @@ lootChestsMS = true # # Add the custom Mineshafts to modded biomes of the same categories/type. - addMineshaftsToModdedBiomes = true + addMineshaftsToModdedBiomes = false # # Add the ID/resource location of the biome you don't want # RS's mineshafts to spawn in. Separate each ID with a comma , @@ -19,49 +19,49 @@ # Note: The mineshaft will spawn between min and max y height set in config. # Setting this to below min height config will make mineshaft spawn only at min height. #Range: 5 ~ 255 - endMineshaftMaxHeight = 37 + endMineshaftMaxHeight = 110 # # Minimum Y height that this mineshaft can spawn at. Default is 45. # Note: The mineshaft will spawn between min and max y height set in config. # Setting this to below min height config will make mineshaft spawn only at min height. #Range: 5 ~ 255 - desertMineshaftMaxHeight = 45 + desertMineshaftMaxHeight = 110 # # Minimum Y height that this mineshaft can spawn at. Default is 45. # Note: The mineshaft will spawn between min and max y height set in config. # Setting this to below min height config will make mineshaft spawn only at min height. #Range: 5 ~ 255 - taigaMineshaftMaxHeight = 45 + taigaMineshaftMaxHeight = 110 # # Minimum Y height that this mineshaft can spawn at. Default is 45. # Note: The mineshaft will spawn between min and max y height set in config. # Setting this to below min height config will make mineshaft spawn only at min height. #Range: 5 ~ 255 - swampAndDarkForestMineshaftMaxHeight = 45 + swampAndDarkForestMineshaftMaxHeight = 110 # # Minimum Y height that this mineshaft can spawn at. Default is 45. # Note: The mineshaft will spawn between min and max y height set in config. # Setting this to below min height config will make mineshaft spawn only at min height. #Range: 5 ~ 255 - stoneMineshaftMaxHeight = 45 + stoneMineshaftMaxHeight = 110 # # Minimum Y height that this mineshaft can spawn at. Default is 45. # Note: The mineshaft will spawn between min and max y height set in config. # Setting this to below min height config will make mineshaft spawn only at min height. #Range: 5 ~ 255 - icyMineshaftMaxHeight = 45 + icyMineshaftMaxHeight = 110 # # Minimum Y height that this mineshaft can spawn at. Default is 25. # Note: The mineshaft will spawn between min and max y height set in config. # Setting this to below min height config will make mineshaft spawn only at min height. #Range: 5 ~ 255 - oceanMineshaftMaxHeight = 25 + oceanMineshaftMaxHeight = 110 # # Minimum Y height that this mineshaft can spawn at. Default is 45. # Note: The mineshaft will spawn between min and max y height set in config. # Setting this to below min height config will make mineshaft spawn only at min height. #Range: 5 ~ 255 - birchMineshaftMaxHeight = 45 + birchMineshaftMaxHeight = 110 # # Minimum Y height that this mineshaft can spawn at. Default is 13. # Note: The mineshaft will spawn between min and max y height set in config. @@ -73,13 +73,13 @@ # Note: The mineshaft will spawn between min and max y height set in config. # Setting this to below min height config will make mineshaft spawn only at min height. #Range: 5 ~ 255 - jungleMineshaftMaxHeight = 45 + jungleMineshaftMaxHeight = 110 # # Minimum Y height that this mineshaft can spawn at. Default is 45. # Note: The mineshaft will spawn between min and max y height set in config. # Setting this to below min height config will make mineshaft spawn only at min height. #Range: 5 ~ 255 - savannaMineshaftMaxHeight = 45 + savannaMineshaftMaxHeight = 110 [Mineshaft.Misc] # @@ -98,25 +98,25 @@ # Note: The mineshaft will spawn between min and max y height set in config. # #Range: 5 ~ 255 - oceanMineshaftMinHeight = 8 + oceanMineshaftMinHeight = 200 # # Minimum Y height that this mineshaft can spawn at. Default is 8. # Note: The mineshaft will spawn between min and max y height set in config. # #Range: 5 ~ 255 - savannaMineshaftMinHeight = 8 + savannaMineshaftMinHeight = 200 # # Minimum Y height that this mineshaft can spawn at. Default is 8. # Note: The mineshaft will spawn between min and max y height set in config. # #Range: 5 ~ 255 - icyMineshaftMinHeight = 8 + icyMineshaftMinHeight = 200 # # Minimum Y height that this mineshaft can spawn at. Default is 8. # Note: The mineshaft will spawn between min and max y height set in config. # #Range: 5 ~ 255 - jungleMineshaftMinHeight = 8 + jungleMineshaftMinHeight = 200 # # Minimum Y height that this mineshaft can spawn at. Default is 30. # Note: The mineshaft will spawn between min and max y height set in config. @@ -128,31 +128,31 @@ # Note: The mineshaft will spawn between min and max y height set in config. # Setting this to below min height config will make mineshaft spawn only at min height. #Range: 5 ~ 255 - birchMineshaftMinHeight = 8 + birchMineshaftMinHeight = 200 # # Minimum Y height that this mineshaft can spawn at. Default is 8. # Note: The mineshaft will spawn between min and max y height set in config. # #Range: 5 ~ 255 - stoneMineshaftMinHeight = 8 + stoneMineshaftMinHeight = 200 # # Minimum Y height that this mineshaft can spawn at. Default is 8. # Note: The mineshaft will spawn between min and max y height set in config. # #Range: 5 ~ 255 - desertMineshaftMinHeight = 8 + desertMineshaftMinHeight = 200 # # Minimum Y height that this mineshaft can spawn at. Default is 8. # Note: The mineshaft will spawn between min and max y height set in config. # #Range: 5 ~ 255 - taigaMineshaftMinHeight = 8 + taigaMineshaftMinHeight = 200 # # Minimum Y height that this mineshaft can spawn at. Default is 8. # Note: The mineshaft will spawn between min and max y height set in config. # #Range: 5 ~ 255 - swampAndDarkForestMineshaftMinHeight = 8 + swampAndDarkForestMineshaftMinHeight = 200 [Mineshaft.Spawnrate] # @@ -161,67 +161,67 @@ # Replace Mineshafts in Swamps and Dark Forests with a swampy/dark oak themed Mineshaft. # Note: Vanilla Mineshafts will start spawning when this is set to 0 and game is restarted. #Range: 0 ~ 1000 - swampAndDarkForestMineshaftSpawnrate = 40 + swampAndDarkForestMineshaftSpawnrate = 0 # # Controls how often Mineshafts will spawn. 1000 is max spawnrate. # # Replace Mineshafts in Jungle biomes with a Jungle themed Mineshaft. # Note: Vanilla Mineshafts will start spawning when this is set to 0 and game is restarted. #Range: 0 ~ 1000 - jungleMineshaftSpawnrate = 40 + jungleMineshaftSpawnrate = 0 # # Controls how often Mineshafts will spawn. 1000 is max spawnrate. # # Replace Mineshafts in Taiga biomes with a Taiga themed Mineshaft. Note: Vanilla Mineshafts will start spawning when this is set to 0 and game is restarted. #Range: 0 ~ 1000 - taigaMineshaftSpawnrate = 40 + taigaMineshaftSpawnrate = 0 # # Controls how often Mineshafts will spawn. 1000 is max spawnrate. # # Replace Mineshafts in Birch biomes with a Birch themed Mineshaft. # Note: Vanilla Mineshafts will start spawning when this is set to 0 and game is restarted. #Range: 0 ~ 1000 - birchMineshaftSpawnrate = 40 + birchMineshaftSpawnrate = 0 # # Controls how often Mineshafts will spawn. # # Add Nether themed Mineshafts to Nether biomes.0 for no Mineshafts and 1000 for max spawnrate. #Range: 0 ~ 1000 - netherMineshaftSpawnrate = 40 + netherMineshaftSpawnrate = 0 # # Controls how often Mineshafts will spawn. 1000 is max spawnrate. # # Replace Mineshafts in Desert biomes with a Desert themed Mineshaft. # Note: Vanilla Mineshafts will start spawning when this is set to 0 and game is restarted. #Range: 0 ~ 1000 - desertMineshaftSpawnrate = 40 + desertMineshaftSpawnrate = 0 # # Controls how often Mineshafts will spawn. 1000 is max spawnrate. # # Replace Mineshafts in Ocean biomes with an Ocean themed Mineshaft. # Note: Vanilla Mineshafts will start spawning when this is set to 0 and game is restarted. #Range: 0 ~ 1000 - oceanMineshaftSpawnrate = 40 + oceanMineshaftSpawnrate = 0 # # Controls how often Mineshafts will spawn. 1000 is max spawnrate. # # Replace Mineshafts in Savanna biomes with a Savanna themed Mineshaft. # Note: Vanilla Mineshafts will start spawning when this is set to 0 and game is restarted. #Range: 0 ~ 1000 - savannaMineshaftSpawnrate = 40 + savannaMineshaftSpawnrate = 0 # # Controls how often Mineshafts will spawn. # # Add End themed Mineshafts to End biomes outside the Enderdragon island.0 for no Mineshafts and 1000 for max spawnrate. #Range: 0 ~ 1000 - endMineshaftSpawnrate = 40 + endMineshaftSpawnrate = 0 # # Controls how often Mineshafts will spawn. 1000 is max spawnrate. # # Replace Mineshafts in Mountain (Extreme Hills) biomes with a Stone themed Mineshaft. # Note: Vanilla Mineshafts will start spawning when this is set to 0 and game is restarted. #Range: 0 ~ 1000 - stoneMineshaftSpawnrate = 40 + stoneMineshaftSpawnrate = 0 # # Controls how often Mineshafts will spawn. 1000 is max spawnrate. # @@ -229,5 +229,5 @@ # Note: Snowy Taiga Biomes will get Ice Mineshaft instead of Taiga theme. # Note: Vanilla Mineshafts will start spawning when this is set to 0 and game is restarted. #Range: 0 ~ 1000 - icyMineshaftSpawnrate = 40 + icyMineshaftSpawnrate = 0 diff --git a/src/config/silentgear-client.toml b/src/config/silentgear-client.toml new file mode 100644 index 0000000..5cb6961 --- /dev/null +++ b/src/config/silentgear-client.toml @@ -0,0 +1,17 @@ + +[gear] + #Allow gear items to have the 'enchanted glow' effect. Set to 'false' to disable the effect. + #The way vanilla handles the effect is bugged, and it is recommended to disable this until custom models are possible again. + allowEnchantedEffect = false + #Use 'lite' gear models. These should be easier on some systems, but do not allow unique textures for different materials. + #Currently, this option has no effect, as the normal model system is not working yet (lite models are used) + useLiteModels = false + +[item] + + [item.gear] + + [item.gear.materials] + #Disable item tooltips related to the new material system. Will be removed when fully implemented. + disableNewTooltips = false + diff --git a/src/config/silentgear-common.toml b/src/config/silentgear-common.toml new file mode 100644 index 0000000..84dd784 --- /dev/null +++ b/src/config/silentgear-common.toml @@ -0,0 +1,132 @@ + +[item] + + #Blueprint and template settings + [item.blueprint] + #Allowed blueprint types. Valid values are: BOTH, BLUEPRINT, and TEMPLATE + #Allowed Values: BOTH, BLUEPRINT, TEMPLATE + typesAllowed = "BOTH" + #When joining a new world, should players be given a blueprint package? + #The blueprint package gives some blueprints when used (right-click). + #To change what is given, override the starter_blueprints loot table. + spawnWithStarterBlueprints = true + + #Repair kit configs. + [item.repairKits] + + #Efficiency is the percentage of the repair value used. Higher values mean less materials used. + #Setting to zero would make the repair kit unusable. + [item.repairKits.efficiency] + #Range: 0.0 ~ 10.0 + crimson = 0.44999998807907104 + #Range: 0.0 ~ 10.0 + sturdy = 0.4000000059604645 + #Range: 0.0 ~ 10.0 + very_crude = 0.30000001192092896 + #Range: 0.0 ~ 10.0 + crude = 0.3499999940395355 + #Range: 0.0 ~ 10.0 + azure = 0.5 + + #Capacity is the number of materials that can be stored (all types combined) + #Setting to zero would make the repair kit unusable. + [item.repairKits.capacity] + #Range: > 0 + crimson = 48 + #Range: > 0 + sturdy = 32 + #Range: > 0 + very_crude = 8 + #Range: > 0 + crude = 16 + #Range: > 0 + azure = 64 + +#Settings for nerfed items. +#You can give items reduced durability to encourage use of Silent Gear tools. +#Changes require a restart! +[nerfedItems] + #Multiplies harvest speed by this value. + #Range: 0.0 ~ 1.0 + harvestSpeedMultiplier = 0.5 + #Multiplies max durability by this value. If the result would be zero, a value of 1 is assigned. + #Range: 0.0 ~ 1.0 + durabilityMultiplier = 0.05 + #These items will have reduced durability + items = ["diamond_axe", "iron_axe", "golden_axe", "stone_axe", "wooden_axe", "diamond_hoe", "iron_hoe", "golden_hoe", "stone_hoe", "wooden_hoe", "diamond_pickaxe", "iron_pickaxe", "golden_pickaxe", "stone_pickaxe", "wooden_pickaxe", "diamond_shovel", "iron_shovel", "golden_shovel", "stone_shovel", "wooden_shovel", "diamond_sword", "iron_sword", "golden_sword", "stone_sword", "wooden_sword"] + #Enable this feature. If false, the other settings in this category are ignored. + enabled = false + +#Settings for sinew drops +[sinew] + #These entities can drop sinew when killed. + dropsFrom = ["minecraft:cow", "minecraft:pig", "minecraft:sheep"] + #Drop rate of sinew (chance out of 1) + #Range: 0.0 ~ 1.0 + dropRate = 0.2 + +#Settings for gear (tools, weapons, and armor) +[gear] + #If true, gear breaks permanently, like vanilla tools and armor + breaksPermanently = false + + [gear.repairs] + #DEPRECATED! Use repair kit configs instead. + #Range: 0.0 ~ 1.0 + quickEffectiveness = 0.35 + #Effectiveness of gear repairs done in an anvil. Set to 0 to disable anvil repairs. + #Range: 0.0 ~ 1.0 + anvilEffectiveness = 0.5 + + #Settings for AOE tools (hammer, excavator) + #Match modes determine what blocks are considered similar enough to be mined together. + #LOOSE: Break anything (you probably do not want this) + #MODERATE: Break anything with the same harvest level + #STRICT: Break only the exact same block + [gear.aoeTool] + + [gear.aoeTool.matchMode] + #Match mode for most blocks + #Allowed Values: LOOSE, MODERATE, STRICT + standard = "MODERATE" + #Match mode for ore blocks (anything in the forge:ores block tag) + #Allowed Values: LOOSE, MODERATE, STRICT + ores = "STRICT" + + [gear.prospector_hammer] + #The range in blocks the prospector hammer will search for blocks of interest + #Range: 0 ~ 64 + range = 16 + + [gear.upgrades] + #If true, upgrade parts may only be applied in an anvil. + applyInAnvilOnly = false + +#Settings for the salvager +[salvager] + + [salvager.partLossRate] + #Minimum rate of part loss when salvaging items. 0 = no loss, 1 = complete loss. + #Rate depends on remaining durability. + #Range: 0.0 ~ 1.0 + min = 0.0 + #Maximum rate of part loss when salvaging items. 0 = no loss, 1 = complete loss. + #Rate depends on remaining durability. + #Range: 0.0 ~ 1.0 + max = 0.5 + +[compat] + + [compat.mineAndSlash] + #Enable compatibility with the Mine and Slash mod, if installed + enabled = true + +[debug] + + [debug.logging] + #Log stat calculations in the debug.log every time gear stats are recalculated + stats = true + #Log additional information related to loading and synchronizing gear parts and traits. + #This might help track down more obscure issues. + extraPartAndTraitInfo = false + diff --git a/src/config/simpletomb.toml b/src/config/simpletomb.toml index 9ed9728..18613bc 100644 --- a/src/config/simpletomb.toml +++ b/src/config/simpletomb.toml @@ -1,14 +1,22 @@ +##################################################################################### #Simple Tomb config +##################################################################################### [simpletomb] + ##################################################################################### [simpletomb.tomb] + #If true, write to the game log (server log) every time a tomb is placed + log = true + #If true, send a player chat message every time a tomb is placed + chat = true #The radius in which extra bonus items should be hunted for and collected when a grave is spawned; set to zero (0) to disable #Range: 0 ~ 16 extra_items = 2 #Whether to handle player death at all (false will disable almost the entire mod) enabled = true + ##################################################################################### [simpletomb.teleport] #When survival player is within this (straight line calculated) distance from the tomb, they can teleport to the tomb. Set as zero (0) to disable survival TP feature. Set as negative one (-1) to allow survival teleportation always and ignore the distance (within dimension) #Range: -1 ~ 128 @@ -16,8 +24,9 @@ #If creative mode players can teleport to the tomb with the key, ignoring distance creative = true + ##################################################################################### [simpletomb.key] - #Whether to give a Grave Key item to the player on death. Grave can be opened without they key, but the key will help the player locate the grave + #Whether to give a Grave Key item to the player on death. Tomb can be opened without they key, but the key will help the player locate the grave given = true #If a key is being dropped, will the player's display name be added to the tomb key item name named = true diff --git a/src/config/starterkit/starterkit.txt b/src/config/starterkit/starterkit.txt new file mode 100644 index 0000000..3b8c566 --- /dev/null +++ b/src/config/starterkit/starterkit.txt @@ -0,0 +1,41 @@ +"offhand" : "", +"head" : "", +"chest" : "", +"legs" : "", +"feet" : "", +0 : "minecraft:campfire", +1 : "", +2 : "", +3 : "", +4 : "", +5 : "", +6 : "", +7 : "", +8 : "", +9 : "", +10 : "", +11 : "", +12 : "", +13 : "", +14 : "", +15 : "", +16 : "", +17 : "", +18 : "", +19 : "", +20 : "", +21 : "", +22 : "", +23 : "", +24 : "", +25 : "", +26 : "", +27 : "", +28 : "", +29 : "", +30 : "", +31 : "", +32 : "", +33 : "", +34 : "", +35 : "", diff --git a/src/config/topography/Topography.js b/src/config/topography/Topography.js index 0cd7192..e740e28 100644 --- a/src/config/topography/Topography.js +++ b/src/config/topography/Topography.js @@ -1,5 +1,5 @@ function registerPresets() { - Config.registerPreset("overworld", "Overworld", "", "Example Description") + Config.registerPreset("overworld", "Enter 2020", "background2", "Time to go!") .registerDimension("overworld", "overworld") //Adds EventHandler for the BiomeLoadingEvent. This runs for every biome. .registerEventHandler("BiomeLoadingEvent", Java.extend(Consumer, { @@ -8,6 +8,12 @@ function registerPresets() { //Clears the ore which has already been registered OreHelper.clearOre(event); + //event, structure resource location + FeatureHelper.removeStructure(event, "mineshaft"); + + FeatureHelper.removeFeature(event, "void_start_platform"); + + //// //// //Vanilla Ore @@ -15,38 +21,38 @@ function registerPresets() { //// //Coal Ore OreHelper.addOre(event, function() { - //block, clusterSize, minHeight, maxHeight, square - return OreHelper.buildOreForOverworldStone(BlockHelper.getState("minecraft:coal_ore"), 20, 14, 64, 192, true); + //block, ruleTest, clusterSize, clusterCount, minHeight, maxHeight, square, chance + return OreHelper.buildVerticalOre(BlockHelper.getState("minecraft:coal_ore"), OreHelper.BASE_STONE_OVERWORLD, 20, 14, 64, 192, true, 2); }); //Iron Ore OreHelper.addOre(event, function() { - //block, clusterSize, minHeight, maxHeight, square - return OreHelper.buildOreForOverworldStone(BlockHelper.getState("minecraft:iron_ore"), 20, 12, 64, 192, true); + //block, ruleTest, clusterSize, clusterCount, minHeight, maxHeight, square, chance + return OreHelper.buildVerticalOre(BlockHelper.getState("minecraft:iron_ore"), OreHelper.BASE_STONE_OVERWORLD, 20, 12, 64, 192, true, 2); }); //Gold Ore OreHelper.addOre(event, function() { - //block, clusterSize, minHeight, maxHeight, square - return OreHelper.buildOreForOverworldStone(BlockHelper.getState("minecraft:gold_ore"), 15, 5, 64, 120, true); + //block, ruleTest, clusterSize, clusterCount, minHeight, maxHeight, square, chance + return OreHelper.buildVerticalOre(BlockHelper.getState("minecraft:gold_ore"), OreHelper.BASE_STONE_OVERWORLD, 15, 5, 64, 120, true, 4); }); //Lapis Ore OreHelper.addOre(event, function() { - //block, clusterSize, minHeight, maxHeight, square - return OreHelper.buildOreForOverworldStone(BlockHelper.getState("minecraft:lapis_ore"), 20, 5, 64, 192, true); + //block, ruleTest, clusterSize, clusterCount, minHeight, maxHeight, square, chance + return OreHelper.buildVerticalOre(BlockHelper.getState("minecraft:lapis_ore"), OreHelper.BASE_STONE_OVERWORLD, 20, 5, 64, 192, true, 4); }); //Diamond Ore OreHelper.addOre(event, function() { - //block, clusterSize, minHeight, maxHeight, square - return OreHelper.buildOreForOverworldStone(BlockHelper.getState("minecraft:diamond_ore"), 14, 2, 32, 100, true); + //block, ruleTest, clusterSize, clusterCount, minHeight, maxHeight, square, chance + return OreHelper.buildVerticalOre(BlockHelper.getState("minecraft:diamond_ore"), OreHelper.BASE_STONE_OVERWORLD, 14, 2, 32, 100, true, 4); }); //Toilet Paper / Emerald Ore OreHelper.addOre(event, function() { - //block, clusterSize, minHeight, maxHeight, square - return OreHelper.buildOreForOverworldStone(BlockHelper.getState("minecraft:redstone_ore"), 14, 2, 32, 100, true); + //block, ruleTest, clusterSize, clusterCount, minHeight, maxHeight, square, chance + return OreHelper.buildVerticalOre(BlockHelper.getState("minecraft:redstone_ore"), OreHelper.BASE_STONE_OVERWORLD, 14, 2, 32, 100, true, 4); }); //Redstone Ore OreHelper.addOre(event, function() { - //block, clusterSize, minHeight, maxHeight, square - return OreHelper.buildOreForOverworldStone(BlockHelper.getState("minecraft:emerald_ore"), 12, 2, 32, 160, true); + //block, ruleTest, clusterSize, clusterCount, minHeight, maxHeight, square, chance + return OreHelper.buildVerticalOre(BlockHelper.getState("minecraft:emerald_ore"), OreHelper.BASE_STONE_OVERWORLD, 12, 2, 32, 160, true, 4); }); //// //// @@ -55,53 +61,65 @@ function registerPresets() { //// //thermal:apatite_ore Ore OreHelper.addOre(event, function() { - //block, clusterSize, minHeight, maxHeight, square - return OreHelper.buildOreForOverworldStone(BlockHelper.getState("thermal:apatite_ore"), 22, 8, 32, 192, true); + //block, ruleTest, clusterSize, clusterCount, minHeight, maxHeight, square, chance + return OreHelper.buildVerticalOre(BlockHelper.getState("thermal:apatite_ore"), OreHelper.BASE_STONE_OVERWORLD, 22, 8, 32, 192, true, 4); }); //thermal:cinnabar_ore Ore OreHelper.addOre(event, function() { - //block, clusterSize, minHeight, maxHeight, square - return OreHelper.buildOreForOverworldStone(BlockHelper.getState("thermal:cinnabar_ore"), 18, 8, 32, 192, true); + //block, ruleTest, clusterSize, clusterCount, minHeight, maxHeight, square, chance + return OreHelper.buildVerticalOre(BlockHelper.getState("thermal:cinnabar_ore"), OreHelper.BASE_STONE_OVERWORLD, 18, 8, 32, 192, true, 4); }); //thermal:niter_ore Ore OreHelper.addOre(event, function() { - //block, clusterSize, minHeight, maxHeight, square - return OreHelper.buildOreForOverworldStone(BlockHelper.getState("thermal:niter_ore"), 15, 6, 20, 100, true); + //block, ruleTest, clusterSize, clusterCount, minHeight, maxHeight, square, chance + return OreHelper.buildVerticalOre(BlockHelper.getState("thermal:niter_ore"), OreHelper.BASE_STONE_OVERWORLD, 15, 6, 20, 100, true, 4); }); //thermal:sulfur_ore Ore OreHelper.addOre(event, function() { - //block, clusterSize, minHeight, maxHeight, square - return OreHelper.buildOreForOverworldStone(BlockHelper.getState("thermal:sulfur_ore"), 15, 6, 20, 100, true); + //block, ruleTest, clusterSize, clusterCount, minHeight, maxHeight, square, chance + return OreHelper.buildVerticalOre(BlockHelper.getState("thermal:sulfur_ore"), OreHelper.BASE_STONE_OVERWORLD, 15, 6, 20, 100, true, 4); }); //thermal:copper_ore Ore OreHelper.addOre(event, function() { - //block, clusterSize, minHeight, maxHeight, square - return OreHelper.buildOreForOverworldStone(BlockHelper.getState("thermal:copper_ore"), 22, 10, 100, 192, true); + //block, ruleTest, clusterSize, clusterCount, minHeight, maxHeight, square, chance + return OreHelper.buildVerticalOre(BlockHelper.getState("thermal:copper_ore"), OreHelper.BASE_STONE_OVERWORLD, 22, 10, 100, 192, true, 2); }); //thermal:tin_ore Ore OreHelper.addOre(event, function() { - //block, clusterSize, minHeight, maxHeight, square - return OreHelper.buildOreForOverworldStone(BlockHelper.getState("thermal:tin_ore"), 16, 9, 70, 120, true); + //block, ruleTest, clusterSize, clusterCount, minHeight, maxHeight, square, chance + return OreHelper.buildVerticalOre(BlockHelper.getState("thermal:tin_ore"), OreHelper.BASE_STONE_OVERWORLD, 16, 9, 70, 120, true, 2); }); //thermal:lead_ore Ore OreHelper.addOre(event, function() { - //block, clusterSize, minHeight, maxHeight, square - return OreHelper.buildOreForOverworldStone(BlockHelper.getState("thermal:lead_ore"), 14, 8, 30, 90, true); + //block, ruleTest, clusterSize, clusterCount, minHeight, maxHeight, square, chance + return OreHelper.buildVerticalOre(BlockHelper.getState("thermal:lead_ore"), OreHelper.BASE_STONE_OVERWORLD, 14, 8, 30, 90, true, 3); }); //thermal:silver_ore Ore OreHelper.addOre(event, function() { - //block, clusterSize, minHeight, maxHeight, square - return OreHelper.buildOreForOverworldStone(BlockHelper.getState("thermal:silver_ore"), 14, 5, 50, 90, true); + //block, ruleTest, clusterSize, clusterCount, minHeight, maxHeight, square, chance + return OreHelper.buildVerticalOre(BlockHelper.getState("thermal:silver_ore"), OreHelper.BASE_STONE_OVERWORLD, 14, 5, 50, 90, true, 4); }); //thermal:nickel_ore Ore OreHelper.addOre(event, function() { - //block, clusterSize, minHeight, maxHeight, square - return OreHelper.buildOreForOverworldStone(BlockHelper.getState("thermal:nickel_ore"), 20, 10, 64, 192, true); + //block, ruleTest, clusterSize, clusterCount, minHeight, maxHeight, square, chance + return OreHelper.buildVerticalOre(BlockHelper.getState("thermal:nickel_ore"), OreHelper.BASE_STONE_OVERWORLD, 20, 10, 64, 192, true, 3); + }); + + + //Dire's Goo + OreHelper.addOre(event, function() { + //block, ruleTest, clusterSize, clusterCount, minHeight, maxHeight, square, chance + return OreHelper.buildVerticalOre(BlockHelper.getState("diregoo:gooblockterrain"), OreHelper.BASE_STONE_OVERWORLD, 1, 1, 10, 192, true, 15); }); + + + } }).class); } - +function setConfigOptions() { + Config.setGuiBackground("background3"); +} diff --git a/src/config/topography/background.png b/src/config/topography/background.png new file mode 100644 index 0000000..6b3889f Binary files /dev/null and b/src/config/topography/background.png differ diff --git a/src/config/topography/background2.png b/src/config/topography/background2.png new file mode 100644 index 0000000..0a843fd Binary files /dev/null and b/src/config/topography/background2.png differ diff --git a/src/config/topography/background3.png b/src/config/topography/background3.png new file mode 100644 index 0000000..16c3e78 Binary files /dev/null and b/src/config/topography/background3.png differ diff --git a/src/config/xaeroworldmap.txt b/src/config/xaeroworldmap.txt index 64f474f..0a25846 100644 --- a/src/config/xaeroworldmap.txt +++ b/src/config/xaeroworldmap.txt @@ -18,4 +18,4 @@ renderArrow:true displayZoom:true ignoreHeightmaps:false waypointScale:1.0 -globalVersion:73 +globalVersion:81 diff --git a/src/defaultconfigs/eyesinthedarkness-server.toml b/src/defaultconfigs/eyesinthedarkness-server.toml new file mode 100644 index 0000000..e655f0c --- /dev/null +++ b/src/defaultconfigs/eyesinthedarkness-server.toml @@ -0,0 +1,18 @@ + +[general] + #While set to true, the eyes entity will ignore the artificial light level and will jumpscare even if it's lit. Daylight will still disable it's AI. + eyesCanAttackWhileLit = true + #Set to false to disable the jumpscare system. + jumpscare = false + #Set to a number > 0 to cause the jumpscare to apply poison the player. A value of 5 will take around half of the health. + #Range: 0 ~ 6 + jumpscareHurtLevel = 0 + +[eye_aggression] + #While set to true, the eyes entities will have higher aggression values on lower light levels. + lightLevel = false + #While set to true, the eyes entities will spawn with higher aggresion levels in higher local difficulties. + localDifficulty = true + #While set to true, the eyes entities will progressively get more bold, and move faster, the longer they live. + enableEscalation = false + diff --git a/src/defaultconfigs/simple_absorption-server.toml b/src/defaultconfigs/simple_absorption-server.toml new file mode 100644 index 0000000..a85c561 --- /dev/null +++ b/src/defaultconfigs/simple_absorption-server.toml @@ -0,0 +1,12 @@ +#Base absorption amount to give to players in half hearts, replenishes like regular health. If 0, players will start with no absorption. +#Range: 0 ~ 20 +base_absorption = 0 +#If true, hearts from the potion effect will be included in absorption calculations +include_potion = false +#Amount of half hearts of absorption granted per piece of gold armor worn. +#Range: 0 ~ 4 +gold_absorption = 1 +#Maximum level for the enchantment per piece. Each level gives half a heart. If 0, enchantment will be disabled. +#Range: 0 ~ 6 +max_enchantment_level = 4 + diff --git a/src/defaultconfigs/thermal-server.toml b/src/defaultconfigs/thermal-server.toml new file mode 100644 index 0000000..ad8663e --- /dev/null +++ b/src/defaultconfigs/thermal-server.toml @@ -0,0 +1,49 @@ + +["Global Options"] + #If TRUE, Thermal Blocks will retain Energy when dropped. + "Blocks Retain Energy" = true + #If TRUE, Thermal Blocks will retain Inventory Contents when dropped. + "Blocks Retain Inventory" = false + #If TRUE, Thermal Blocks will retain Tank Contents when dropped. + "Blocks Retain Tank Contents" = false + #If TRUE, Thermal Blocks will retain Augments when dropped. + "Blocks Retain Augments" = true + #If TRUE, Thermal Blocks will retain Redstone Control configuration when dropped. + "Blocks Retain Redstone Control" = true + #If TRUE, Thermal Blocks will retain Side configuration when dropped. + "Blocks Retain Side Configuration" = true + #If TRUE, Thermal Blocks will retain Transfer Control configuration when dropped. + "Blocks Retain Transfer Control" = true + +[Features] + #If TRUE, various 'Vanilla+' Blocks and Recipes are enabled. + "Vanilla+" = true + #IF TRUE, Rockwool Blocks and Recipes are enabled. + Rockwool = true + #IF TRUE, the Basalz Mob is enabled. + Basalz = true + #IF TRUE, the Blitz Mob is enabled. + Blitz = true + #IF TRUE, the Blizz Mob is enabled. + Blizz = true + +["World Generation"] + #Set to FALSE to prevent 'Thermal Series' Apatite from generating. + Apatite = false + #Set to FALSE to prevent 'Thermal Series' Cinnabar from generating. + Cinnabar = false + #Set to FALSE to prevent 'Thermal Series' Niter from generating. + Niter = false + #Set to FALSE to prevent 'Thermal Series' Sulfur from generating. + Sulfur = false + #Set to FALSE to prevent 'Thermal Series' Copper from generating. + Copper = false + #Set to FALSE to prevent 'Thermal Series' Tin from generating. + Tin = false + #Set to FALSE to prevent 'Thermal Series' Lead from generating. + Lead = false + #Set to FALSE to prevent 'Thermal Series' Silver from generating. + Silver = false + #Set to FALSE to prevent 'Thermal Series' Nickel from generating. + Nickel = false + diff --git a/src/global_data_packs/escapefrom2020/data/yourmom/sanity/item_sanity.json b/src/global_data_packs/escapefrom2020/data/yourmom/sanity/item_sanity.json deleted file mode 100644 index c487cbe..0000000 --- a/src/global_data_packs/escapefrom2020/data/yourmom/sanity/item_sanity.json +++ /dev/null @@ -1,227 +0,0 @@ -{ - "replace": true, - "entries": { - "minecraft:poisonous_potato": -5, - "minecraft:pufferfish": -5, - "minecraft:raw_beef": -1, - "minecraft:raw_chicken": -1, - "minecraft:raw_cod": -1, - "minecraft:raw_mutton": -1, - "minecraft:raw_porkchop": -1, - "minecraft:raw_rabbit": -1, - "minecraft:raw_salmon": -1, - "minecraft:rotten_flesh": -2, - "minecraft:spider_eye": -3, - "minecraft:apple": 1, - "minecraft:baked_potato": 2, - "minecraft:bread": 2, - "minecraft:carrot": 1, - "minecraft:chorus_fruit": -1, - "minecraft:cooked_beef": 5, - "minecraft:cooked_chicken": 3, - "minecraft:cooked_cod": 2, - "minecraft:cooked_mutton": 3, - "minecraft:cooked_porkchop": 4, - "minecraft:cooked_rabbit": 3, - "minecraft:cooked_salmon": 3, - "minecraft:cookie": 7, - "minecraft:melon_slice": 1, - "minecraft:potato": 1, - "minecraft:potion": 5, - "minecraft:pumpkin_pie": 4, - "minecraft:sweet_berries": 1, - "byg:baobab_fruit": 2, - "byg:black_puff": 2, - "byg:blueberries": 1, - "byg:cooked_joshua_fruit": 3, - "byg:crimson_berries": 1, - "byg:death_cap": 1, - "byg:green_apple": 1, - "byg:green_mushroom": 1, - "byg:holly_berries": 1, - "byg:joshua_fruit": 1, - "byg:nightshade_berries": 1, - "byg:soul_shroom": 1, - "byg:weeping_milkcap": 1, - "byg:wood_blewit": 1, - "fruittrees:cherry": 1, - "fruittrees:citron": 1, - "fruittrees:empowered_citron": 2, - "fruittrees:grapefruit": 2, - "fruittrees:lemon": 1, - "fruittrees:lime": 1, - "fruittrees:mandarin": 1, - "fruittrees:orange": 1, - "fruittrees:pomelo": 3, - "fruittrees:redlove": 2, - "pickletweaks:diamond_apple": 5, - "pickletweaks:emerald_apple": 7, - "simplefarming:apple_pie": 5, - "simplefarming:apricot": 1, - "simplefarming:apricot_pie": 5, - "simplefarming:baked_sweet_potato": 3, - "simplefarming:baked_yam": 3, - "simplefarming:banana": 1, - "simplefarming:banana_bread": 3, - "simplefarming:barley_bread": 3, - "simplefarming:beef_and_broccoli": 6, - "simplefarming:beef_curry": 7, - "simplefarming:blackberries": 1, - "simplefarming:blackberry_pie": 5, - "simplefarming:blt": 5, - "simplefarming:blueberries": 1, - "simplefarming:blueberry_pie": 5, - "simplefarming:borscht": 6, - "simplefarming:broccoli": 2, - "simplefarming:broccoli_cheese_soup": 4, - "simplefarming:cactus_fruit": 1, - "simplefarming:caesar_salad": 10, - "simplefarming:candy": 2, - "simplefarming:candy_cane": 2, - "simplefarming:cantaloupe": 1, - "simplefarming:carrot_soup": 4, - "simplefarming:cassava": 1, - "simplefarming:cassava_cake": 4, - "simplefarming:cheese_slice": 1, - "simplefarming:cheeseburger": 7, - "simplefarming:cherries": 1, - "simplefarming:cherry_pie": 5, - "simplefarming:chicken_curry": 8, - "simplefarming:chicken_noodle_soup": 4, - "simplefarming:chicken_parmesan": 8, - "simplefarming:chicory_gratin": 7, - "simplefarming:chicory_root": 1, - "simplefarming:chili": 8, - "simplefarming:chocolate": 2, - "simplefarming:cooked_bacon": 10, - "simplefarming:cooked_chicken_wings": 10, - "simplefarming:cooked_egg": 2, - "simplefarming:cooked_horse_meat": -2, - "simplefarming:cooked_sausage": 2, - "simplefarming:corn": 1, - "simplefarming:corn_salad": 2, - "simplefarming:cornbread": 3, - "simplefarming:cucumber": 1, - "simplefarming:cucumber_soup": 2, - "simplefarming:cumin_seeds": 1, - "simplefarming:egg_sandwich": 3, - "simplefarming:eggplant": 1, - "simplefarming:eggplant_parmesan": 4, - "simplefarming:fish_and_chips": 7, - "simplefarming:fish_fillet": 5, - "simplefarming:fish_sandwich": 4, - "simplefarming:fried_calamari": 6, - "simplefarming:fried_rice": 4, - "simplefarming:fruit_salad": 3, - "simplefarming:ginger": 1, - "simplefarming:golden_habanero": 1, - "simplefarming:grapes": 1, - "simplefarming:habanero": 1, - "simplefarming:hamburger": 4, - "simplefarming:honeydew": 1, - "simplefarming:hotdog": 3, - "simplefarming:ice_cream_sundae": 10, - "simplefarming:italian_beef": 7, - "simplefarming:jaffa_cake": 3, - "simplefarming:lasagna": 8, - "simplefarming:lettuce": 1, - "simplefarming:mac_and_cheese": 9, - "simplefarming:mango": 1, - "simplefarming:marshmallow": 1, - "simplefarming:marshmallow_root": 1, - "simplefarming:mushroom_barley": 1, - "simplefarming:mutton_curry": 8, - "simplefarming:oat_bread": 4, - "simplefarming:oatmeal": 2, - "simplefarming:olive_tomato_salad": 4, - "simplefarming:olives": 8, - "simplefarming:onion": 1, - "simplefarming:onion_soup": 3, - "simplefarming:orange": 1, - "simplefarming:pad_thai": 10, - "simplefarming:pancakes": 6, - "simplefarming:pasta": 7, - "simplefarming:pbj": 3, - "simplefarming:pea_pod": 1, - "simplefarming:pea_soup": 4, - "simplefarming:peanut": 2, - "simplefarming:peanut_butter_cookie": 3, - "simplefarming:peanut_butter_pie": 5, - "simplefarming:pear": 1, - "simplefarming:pear_pie": 4, - "simplefarming:pepper": 1, - "simplefarming:pickle": 1, - "simplefarming:pickled_beetroot": 2, - "simplefarming:pizza": 15, - "simplefarming:plum": 1, - "simplefarming:plum_pie": 4, - "simplefarming:popcorn": 1, - "simplefarming:pork_curry": 8, - "simplefarming:potato_knish": 4, - "simplefarming:pulled_pork_sandwich": 9, - "simplefarming:pumpkin_soup": 7, - "simplefarming:quinoa_salad": 4, - "simplefarming:quinoa_seeds": 1, - "simplefarming:radish": 1, - "simplefarming:radish_soup": 3, - "simplefarming:raisins": 1, - "simplefarming:raspberries": 1, - "simplefarming:raspberry_pie": 4, - "simplefarming:raw_bacon": -4, - "simplefarming:raw_calamari": -4, - "simplefarming:raw_chicken_wings": -4, - "simplefarming:raw_horse_meat": -8, - "simplefarming:raw_sausage": -4, - "simplefarming:rice_bowl": 3, - "simplefarming:rice_bread": 4, - "simplefarming:rye_bread": 3, - "simplefarming:salad": 3, - "simplefarming:sandwich": 2, - "simplefarming:sausage_barley_soup": 5, - "simplefarming:sorghum": 1, - "simplefarming:sorghum_bread": 3, - "simplefarming:sorghum_porridge": 3, - "simplefarming:soybean": 1, - "simplefarming:spaghetti": 9, - "simplefarming:spinach": 1, - "simplefarming:spinach_mushroom_quiche": 7, - "simplefarming:spinach_quinoa_quiche": 7, - "simplefarming:squash": 1, - "simplefarming:squash_casserole": 4, - "simplefarming:squash_soup": 4, - "simplefarming:squid_ink_pasta": 2, - "simplefarming:strawberries": 1, - "simplefarming:strawberry_pie": 4, - "simplefarming:stuffed_corn_zucchini": 4, - "simplefarming:sunflower_seeds": 2, - "simplefarming:sushi": 15, - "simplefarming:sweet_potato": 1, - "simplefarming:sweet_potato_quinoa_cakes": 4, - "simplefarming:tofu": 1, - "simplefarming:tofu_scramble": 2, - "simplefarming:tomato": 1, - "simplefarming:tomato_soup": 2, - "simplefarming:trail_mix": 2, - "simplefarming:turnip": 1, - "simplefarming:turnip_beetroot_gratin": 6, - "simplefarming:vegetable_curry": 8, - "simplefarming:vegetable_medley": 4, - "simplefarming:veggie_burger": 9, - "simplefarming:yam": 1, - "simplefarming:zucchini": 1, - "simplefarming:zucchini_bread": 4, - "undergarden:blisterberry": 1, - "undergarden:bloody_stew": 2, - "undergarden:cooked_gwibling": 2, - "undergarden:droopvine_item": 1, - "undergarden:dweller_steak": 5, - "undergarden:gloomgourd_pie": 5, - "undergarden:goo_ball": 5, - "undergarden:indigo_stew": 5, - "undergarden:inky_stew": -5, - "undergarden:raw_dweller_meat": -5, - "undergarden:raw_gwibling": -5, - "undergarden:underbeans": 1, - "undergarden:veiled_stew": 3 - } -} \ No newline at end of file diff --git a/src/global_resource_packs/ef2020resources/assets/minecraft/lang/en_us.json b/src/global_resource_packs/ef2020resources/assets/minecraft/lang/en_us.json new file mode 100644 index 0000000..1e58b30 --- /dev/null +++ b/src/global_resource_packs/ef2020resources/assets/minecraft/lang/en_us.json @@ -0,0 +1,3 @@ +{ +"death.attack.outOfWorld": "%1$s succumbed to 2020" +} \ No newline at end of file diff --git a/src/global_resource_packs/ef2020resources/assets/minecraft/textures/gui/options_background.png b/src/global_resource_packs/ef2020resources/assets/minecraft/textures/gui/options_background.png index e6b064d..ac80fc2 100644 Binary files a/src/global_resource_packs/ef2020resources/assets/minecraft/textures/gui/options_background.png and b/src/global_resource_packs/ef2020resources/assets/minecraft/textures/gui/options_background.png differ diff --git a/src/global_resource_packs/ef2020resources/assets/minecraft/textures/gui/widgets.png b/src/global_resource_packs/ef2020resources/assets/minecraft/textures/gui/widgets.png new file mode 100644 index 0000000..de41074 Binary files /dev/null and b/src/global_resource_packs/ef2020resources/assets/minecraft/textures/gui/widgets.png differ