From c28be70410571edd536d358cc7c1e1bd2ba66cbb Mon Sep 17 00:00:00 2001 From: Starforcraft Date: Sat, 11 Sep 2021 10:29:36 +0200 Subject: [PATCH 01/33] Fix Botanical Machinery reminder --- config/botanicalmachinery/client.json5 | 24 +++++++++++ config/botanicalmachinery/server.json5 | 58 ++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 config/botanicalmachinery/client.json5 create mode 100644 config/botanicalmachinery/server.json5 diff --git a/config/botanicalmachinery/client.json5 b/config/botanicalmachinery/client.json5 new file mode 100644 index 00000000..94b6bce0 --- /dev/null +++ b/config/botanicalmachinery/client.json5 @@ -0,0 +1,24 @@ +{ + // Should mana in GUIs be displayed with numbers? + "numericalMana": true, + + // If you turn this off, the special rendering is disabled for all machines and ignores the other config options + "AdvancedRendering": { + + "alfheimMarket": true, + + "all": true, + + "industrialAgglomerationFactory": true, + + "mechanicalApothecary": true, + + "mechanicalBrewery": true, + + "mechanicalDaisy": true, + + "mechanicalManaPool": true, + + "mechanicalRunicAltar": true + } +} diff --git a/config/botanicalmachinery/server.json5 b/config/botanicalmachinery/server.json5 new file mode 100644 index 00000000..18000716 --- /dev/null +++ b/config/botanicalmachinery/server.json5 @@ -0,0 +1,58 @@ +{ + // This is only as a reminder that the config changed. Turn to true if you accept that I'm the new config + "reminder": false, + + // The amount of mana used in alfheim market to trade items [Default: 500] + "AlfheimMarket": { + + // Minimum: 1 + "recipeCost": 500 + }, + + // The default amount of mana capacity in each machine. + "MaxManaCapacity": { + + // Minimum: 1 + "alfheimMarket": 100000, + + // Minimum: 500000 + "industrialAgglomerationFactory": 1000000, + + // Minimum: 1 + "manaBattery": 10000000, + + // Minimum: 1 + "mechanicalBrewery": 100000, + + // Minimum: 1 + "mechanicalManaPool": 100000, + + // Minimum: 1 + "mechanicalRunicAltar": 250000 + }, + + // The default duration multiplied with this will be the used working duration. + "WorkingDurationMultiplier": { + + // Range: 1 - 25 + "alfheimMarket": 1, + + // Range: 1 - 5000 + "industrialAgglomerationFactory": 1, + + // Minimum: 1 + "mechanicalApothecary": 1, + + // Range: 1 - 50 + "mechanicalBrewery": 1, + + // Minimum: 1 + "mechanicalDaisy": 3, + + // Minimum: 1 + "mechanicalManaPool": 1, + + // Range: 1 - 100 + "mechanicalRunicAltar": 1 + } +} From 9667893719bfa6f110828ac18d5f84fb830f63f4 Mon Sep 17 00:00:00 2001 From: Starforcraft Date: Sat, 11 Sep 2021 10:42:09 +0200 Subject: [PATCH 02/33] blah blah --- config/botanicalmachinery-client.toml | 14 -------------- config/botanicalmachinery/client.json5 | 24 ------------------------ 2 files changed, 38 deletions(-) delete mode 100644 config/botanicalmachinery-client.toml delete mode 100644 config/botanicalmachinery/client.json5 diff --git a/config/botanicalmachinery-client.toml b/config/botanicalmachinery-client.toml deleted file mode 100644 index 6a44d674..00000000 --- a/config/botanicalmachinery-client.toml +++ /dev/null @@ -1,14 +0,0 @@ -#Should mana in GUIs be displayed with numbers? -numericalMana = true - -[advanced-rendering] - #If you turn this off, the special rendering is disabled for all machines and ignores the other config options - all = true - alfheim-market = true - industrial-agglomeration-factory = true - mechanical-apothecary = true - mechanical-brewery = true - mechanical-daisy = true - mechanical-mana-pool = true - mechanical-runic-altar = true - diff --git a/config/botanicalmachinery/client.json5 b/config/botanicalmachinery/client.json5 deleted file mode 100644 index 94b6bce0..00000000 --- a/config/botanicalmachinery/client.json5 +++ /dev/null @@ -1,24 +0,0 @@ -{ - // Should mana in GUIs be displayed with numbers? - "numericalMana": true, - - // If you turn this off, the special rendering is disabled for all machines and ignores the other config options - "AdvancedRendering": { - - "alfheimMarket": true, - - "all": true, - - "industrialAgglomerationFactory": true, - - "mechanicalApothecary": true, - - "mechanicalBrewery": true, - - "mechanicalDaisy": true, - - "mechanicalManaPool": true, - - "mechanicalRunicAltar": true - } -} From c97afc6eb76d3702602c88634f4c75e5cddca2fb Mon Sep 17 00:00:00 2001 From: Starforcraft Date: Sat, 11 Sep 2021 10:45:13 +0200 Subject: [PATCH 03/33] Blame Lexxie --- config/botanicalmachinery/server.json5 | 56 +------------------------- 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/config/botanicalmachinery/server.json5 b/config/botanicalmachinery/server.json5 index 18000716..396c4a52 100644 --- a/config/botanicalmachinery/server.json5 +++ b/config/botanicalmachinery/server.json5 @@ -1,58 +1,4 @@ { // This is only as a reminder that the config changed. Turn to true if you accept that I'm the new config - "reminder": false, - - // The amount of mana used in alfheim market to trade items [Default: 500] - "AlfheimMarket": { - - // Minimum: 1 - "recipeCost": 500 - }, - - // The default amount of mana capacity in each machine. - "MaxManaCapacity": { - - // Minimum: 1 - "alfheimMarket": 100000, - - // Minimum: 500000 - "industrialAgglomerationFactory": 1000000, - - // Minimum: 1 - "manaBattery": 10000000, - - // Minimum: 1 - "mechanicalBrewery": 100000, - - // Minimum: 1 - "mechanicalManaPool": 100000, - - // Minimum: 1 - "mechanicalRunicAltar": 250000 - }, - - // The default duration multiplied with this will be the used working duration. - "WorkingDurationMultiplier": { - - // Range: 1 - 25 - "alfheimMarket": 1, - - // Range: 1 - 5000 - "industrialAgglomerationFactory": 1, - - // Minimum: 1 - "mechanicalApothecary": 1, - - // Range: 1 - 50 - "mechanicalBrewery": 1, - - // Minimum: 1 - "mechanicalDaisy": 3, - - // Minimum: 1 - "mechanicalManaPool": 1, - - // Range: 1 - 100 - "mechanicalRunicAltar": 1 - } + "reminder": false } From e7d8c321e4883462012bc7ddc82ac3b5b1fa38a9 Mon Sep 17 00:00:00 2001 From: Lexxie <30494658+ladylexxie@users.noreply.github.com> Date: Sat, 11 Sep 2021 09:45:19 +0100 Subject: [PATCH 04/33] Create server.json5 --- config/botanicalmachinery/server.json5 | 1 - 1 file changed, 1 deletion(-) diff --git a/config/botanicalmachinery/server.json5 b/config/botanicalmachinery/server.json5 index 396c4a52..652d9bd9 100644 --- a/config/botanicalmachinery/server.json5 +++ b/config/botanicalmachinery/server.json5 @@ -1,4 +1,3 @@ { - // This is only as a reminder that the config changed. Turn to true if you accept that I'm the new config "reminder": false } From 62d9f3dfe0644abbfe468d252665b38882e7ac76 Mon Sep 17 00:00:00 2001 From: Lady Lexxie Date: Sat, 11 Sep 2021 10:59:04 +0100 Subject: [PATCH 05/33] fixes --- config/MouseTweaks.cfg | 8 ++++++++ config/allthetweaks-common.toml | 2 +- .../bees/natural/bees_gem/Aquamarine.json | 2 +- .../bees/natural/bees_misc/Salt_Baee.json | 2 +- .../resourcefulbees/biome_dictionary/lake.json | 15 +++++++++++++++ config/resourcefulbees/common.toml | 2 ++ config/terraforged/presets/All The Mods 6.json | 18 +++++++++++++++--- .../mod_specific/botany_pots/botany_pots.js | 2 ++ 8 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 config/MouseTweaks.cfg create mode 100644 config/resourcefulbees/biome_dictionary/lake.json create mode 100644 config/resourcefulbees/common.toml diff --git a/config/MouseTweaks.cfg b/config/MouseTweaks.cfg new file mode 100644 index 00000000..5dc1c5bf --- /dev/null +++ b/config/MouseTweaks.cfg @@ -0,0 +1,8 @@ +RMBTweak=0 +LMBTweakWithItem=1 +LMBTweakWithoutItem=1 +WheelTweak=1 +WheelSearchOrder=1 +WheelScrollDirection=0 +ScrollItemScaling=0 +Debug=0 diff --git a/config/allthetweaks-common.toml b/config/allthetweaks-common.toml index ccbd9bed..ca6efb3d 100644 --- a/config/allthetweaks-common.toml +++ b/config/allthetweaks-common.toml @@ -21,5 +21,5 @@ [packversionminrev] #Pack Minor Version Revision : X #Range: 0 ~ 32768 - minorrev = 0 + minorrev = 1 diff --git a/config/resourcefulbees/bees/natural/bees_gem/Aquamarine.json b/config/resourcefulbees/bees/natural/bees_gem/Aquamarine.json index 4e9755eb..a7efd56b 100644 --- a/config/resourcefulbees/bees/natural/bees_gem/Aquamarine.json +++ b/config/resourcefulbees/bees/natural/bees_gem/Aquamarine.json @@ -65,7 +65,7 @@ }, "SpawnData": { "canSpawnInWorld": true, - "biomeWhitelist": "tag:beach", + "biomeWhitelist": "tag:beach, tag:lake", "biomeBlacklist": "", "spawnWeight": 5, "minYLevel": 0, diff --git a/config/resourcefulbees/bees/natural/bees_misc/Salt_Baee.json b/config/resourcefulbees/bees/natural/bees_misc/Salt_Baee.json index e76be5fc..1f70f297 100644 --- a/config/resourcefulbees/bees/natural/bees_misc/Salt_Baee.json +++ b/config/resourcefulbees/bees/natural/bees_misc/Salt_Baee.json @@ -65,7 +65,7 @@ }, "SpawnData": { "canSpawnInWorld": true, - "biomeWhitelist": "tag:salt_baee", + "biomeWhitelist": "tag:salt_baee, tag:lake", "biomeBlacklist": "", "spawnWeight": 5, "minYLevel": 0, diff --git a/config/resourcefulbees/biome_dictionary/lake.json b/config/resourcefulbees/biome_dictionary/lake.json new file mode 100644 index 00000000..80ae8940 --- /dev/null +++ b/config/resourcefulbees/biome_dictionary/lake.json @@ -0,0 +1,15 @@ +{ + "biomes": [ + "biomesoplenty:coniferous_lakes" + "minecraft:desert_lakes" + "byg:fresh_water_lake" + "byg:frozen_lake" + "terraforged:frozen_lake" + "byg:great_lake_isles" + "byg:great_lakes" + "byg:grove_lakes" + "terraforged:lake" + "byg:polluted_lake" + "twilightforest:twilight_lake" + ] +} \ No newline at end of file diff --git a/config/resourcefulbees/common.toml b/config/resourcefulbees/common.toml new file mode 100644 index 00000000..c3e6d954 --- /dev/null +++ b/config/resourcefulbees/common.toml @@ -0,0 +1,2 @@ +["General Options"] + generateDefaults = false diff --git a/config/terraforged/presets/All The Mods 6.json b/config/terraforged/presets/All The Mods 6.json index 86314693..6cd28758 100644 --- a/config/terraforged/presets/All The Mods 6.json +++ b/config/terraforged/presets/All The Mods 6.json @@ -22,9 +22,9 @@ "variance": 0 }, "dimensions": { - "nether": "default", - "end": "default", - "includeExtraDimensions": false + "nether": "byg:world", + "end": "byg:world", + "includeExtraDimensions": true } }, "structures": { @@ -91,6 +91,12 @@ "salt": 593751808, "disabled": false }, + "betterstrongholds:stronghold": { + "spacing": 85, + "separation": 50, + "salt": 596441280, + "disabled": false + }, "dungeoncrawl:dungeon": { "spacing": 24, "separation": 12, @@ -733,6 +739,12 @@ "salt": 1925189632, "disabled": false }, + "supplementaries:way_sign": { + "spacing": 19, + "separation": 10, + "salt": 431041536, + "disabled": false + }, "tconstruct:clay_island": { "spacing": 100, "separation": 5, diff --git a/kubejs/server_scripts/mod_specific/botany_pots/botany_pots.js b/kubejs/server_scripts/mod_specific/botany_pots/botany_pots.js index 808caaea..cf437bb2 100644 --- a/kubejs/server_scripts/mod_specific/botany_pots/botany_pots.js +++ b/kubejs/server_scripts/mod_specific/botany_pots/botany_pots.js @@ -1,4 +1,6 @@ onEvent('recipes', e => { + e.remove({ id: 'botanypots:crafting/hopper_botany_pot' }) + e.remove({ id: /botanypots:crafting\/compact_hopper.*botany_pot/ }) const pots = [ 'botanypots:botany_pot', 'botanypots:white_botany_pot', From 546b6a2279bee90dc8ea81108128b8a09d955cd1 Mon Sep 17 00:00:00 2001 From: Lady Lexxie Date: Sat, 11 Sep 2021 11:14:56 +0100 Subject: [PATCH 06/33] fixes 2 --- config/repurposed_structures-forge/dungeons.toml | 2 ++ kubejs/server_scripts/mod_specific/botany_pots/botany_pots.js | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 config/repurposed_structures-forge/dungeons.toml diff --git a/config/repurposed_structures-forge/dungeons.toml b/config/repurposed_structures-forge/dungeons.toml new file mode 100644 index 00000000..9d17cb14 --- /dev/null +++ b/config/repurposed_structures-forge/dungeons.toml @@ -0,0 +1,2 @@ +[AttemptsPerChunk] + endDungeonAttemptsPerChunk = 0 \ No newline at end of file diff --git a/kubejs/server_scripts/mod_specific/botany_pots/botany_pots.js b/kubejs/server_scripts/mod_specific/botany_pots/botany_pots.js index cf437bb2..5709dac7 100644 --- a/kubejs/server_scripts/mod_specific/botany_pots/botany_pots.js +++ b/kubejs/server_scripts/mod_specific/botany_pots/botany_pots.js @@ -1,6 +1,7 @@ onEvent('recipes', e => { - e.remove({ id: 'botanypots:crafting/hopper_botany_pot' }) + e.remove({ id: /botanypots:crafting\/hopper.*_botany_pot/ }) e.remove({ id: /botanypots:crafting\/compact_hopper.*botany_pot/ }) + const pots = [ 'botanypots:botany_pot', 'botanypots:white_botany_pot', From e132bdd05655dfc5d7532c4c209bd0fa527756bd Mon Sep 17 00:00:00 2001 From: Lady Lexxie Date: Sat, 11 Sep 2021 12:27:19 +0100 Subject: [PATCH 07/33] Update lake.json --- .../biome_dictionary/lake.json | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/config/resourcefulbees/biome_dictionary/lake.json b/config/resourcefulbees/biome_dictionary/lake.json index 80ae8940..1560e32d 100644 --- a/config/resourcefulbees/biome_dictionary/lake.json +++ b/config/resourcefulbees/biome_dictionary/lake.json @@ -1,15 +1,14 @@ { "biomes": [ - "biomesoplenty:coniferous_lakes" - "minecraft:desert_lakes" - "byg:fresh_water_lake" - "byg:frozen_lake" - "terraforged:frozen_lake" - "byg:great_lake_isles" - "byg:great_lakes" - "byg:grove_lakes" - "terraforged:lake" + "biomesoplenty:coniferous_lakes", + "minecraft:desert_lakes", + "byg:fresh_water_lake", + "byg:frozen_lake", + "terraforged:frozen_lake", + "byg:great_lake_isles", + "byg:great_lakes", + "byg:grove_lakes", + "terraforged:lake", "byg:polluted_lake" - "twilightforest:twilight_lake" ] } \ No newline at end of file From 02e70eea6296194649bbbb00d0ddff6764329f4b Mon Sep 17 00:00:00 2001 From: Lady Lexxie Date: Sat, 11 Sep 2021 15:24:32 +0100 Subject: [PATCH 08/33] Update thermal.js --- .../server_scripts/mod_specific/thermal/thermal.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/mod_specific/thermal/thermal.js b/kubejs/server_scripts/mod_specific/thermal/thermal.js index 58a68738..4c45045e 100644 --- a/kubejs/server_scripts/mod_specific/thermal/thermal.js +++ b/kubejs/server_scripts/mod_specific/thermal/thermal.js @@ -8,14 +8,23 @@ onEvent('recipes', e => { D: 'atmadditions:atm_star', E: `thermal:lightning_charge` }) - e.shaped('thermal:onion_block', ['OOO', 'OOO', 'OOO'], { O: '#forge:crops/onion' }) + e.shapeless('thermal:onion_block', '9x #forge:crops/onion') e.recipes.mekanism.crushing('6x thermal:sulfur', 'thermal:sulfur_ore') e.recipes.mekanism.crushing('thermal:diamond_dust', 'minecraft:diamond') e.recipes.mekanism.crushing('thermal:sulfur', 'thermal:sulfur') removeRecipeByID([ - /^thermal:storage\/.*_block/, + 'thermal:storage/tin_block', + 'thermal:storage/copper_block', + 'thermal:storage/lead_block', + 'thermal:storage/platinum_block', + 'thermal:storage/uranium_block', + 'thermal:storage/silver_block', + 'thermal:storage/aluminum_block', + 'thermal:storage/nickel_block', + 'thermal:storage/osmium_block', + 'thermal:storage/zinc_block', 'thermal:machine/press/packing2x2/press_honeycomb_packing', 'thermal:machine/press/unpacking/press_honeycomb_unpacking', 'thermal:machine/centrifuge/centrifuge_oil_sand', From 11cdd59ba100bcf6cf64160da7ccb5e45fe71c83 Mon Sep 17 00:00:00 2001 From: Lady Lexxie Date: Sat, 11 Sep 2021 16:07:00 +0100 Subject: [PATCH 09/33] Create pneumaticcraft-common.toml --- config/pneumaticcraft-common.toml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 config/pneumaticcraft-common.toml diff --git a/config/pneumaticcraft-common.toml b/config/pneumaticcraft-common.toml new file mode 100644 index 00000000..e8eb46ed --- /dev/null +++ b/config/pneumaticcraft-common.toml @@ -0,0 +1,3 @@ +[General] + oil_world_gen_blacklist = ["minecraft:soul_sand_valley", "minecraft:crimson_forest", "minecraft:warped_forest", "minecraft:nether_wastes", "minecraft:the_void", "minecraft:the_end", "minecraft:small_end_islands", "minecraft:end_midlands", "minecraft:end_highlands", "minecraft:end_barrens", "allthemodium:mining"] + From 7ca8ce16beae8ab5c365b2b9755469679d5c0f4b Mon Sep 17 00:00:00 2001 From: Jeremiah Winsley Date: Sat, 11 Sep 2021 18:51:38 -0400 Subject: [PATCH 10/33] Add dragon heart to drop table for Woot --- .../recipes/factory/ender_dragon.json | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 kubejs/data/allthetweaks/recipes/factory/ender_dragon.json diff --git a/kubejs/data/allthetweaks/recipes/factory/ender_dragon.json b/kubejs/data/allthetweaks/recipes/factory/ender_dragon.json new file mode 100644 index 00000000..a95bc10e --- /dev/null +++ b/kubejs/data/allthetweaks/recipes/factory/ender_dragon.json @@ -0,0 +1,73 @@ +{ + "type": "woot:factory", + "mob": "minecraft:ender_dragon", + "items": [ + { + "item": "minecraft:end_crystal", + "count": 4 + } + ], + "fluids": [], + "drops": [ + { + "item": "minecraft:dragon_egg", + "sizes": [ + 1, + 1, + 1, + 1 + ], + "chances": [ + 100.0, + 100.0, + 100.0, + 100.0 + ] + }, + { + "item": "minecraft:dragon_breath", + "sizes": [ + 2, + 4, + 6, + 8 + ], + "chances": [ + 100.0, + 100.0, + 100.0, + 100.0 + ] + }, + { + "item": "quark:dragon_scale", + "sizes": [ + 1, + 1, + 1, + 1 + ], + "chances": [ + 100.0, + 100.0, + 100.0, + 100.0 + ] + }, + { + "item": "draconicevolution:dragon_heart", + "sizes": [ + 1, + 1, + 1, + 1 + ], + "chances": [ + 100.0, + 100.0, + 100.0, + 100.0 + ] + } + ] +} \ No newline at end of file From 4929e8e17050e1c2404639d296e82f9f5847edde Mon Sep 17 00:00:00 2001 From: Jeremiah Winsley Date: Sat, 11 Sep 2021 19:40:33 -0400 Subject: [PATCH 11/33] quest fixes --- .../ftbquests/quests/chapters/creative.snbt | 2 +- .../quests/chapters/tips_and_tricks.snbt | 35 ++++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/config/ftbquests/quests/chapters/creative.snbt b/config/ftbquests/quests/chapters/creative.snbt index bcbfff96..3d6dc84f 100644 --- a/config/ftbquests/quests/chapters/creative.snbt +++ b/config/ftbquests/quests/chapters/creative.snbt @@ -902,7 +902,7 @@ { id: "08D9DBD77105C43B" type: "item" - item: "kubejs:atm_star_block" + item: "allthecompressed:atm_star_block" consume_items: false } { diff --git a/config/ftbquests/quests/chapters/tips_and_tricks.snbt b/config/ftbquests/quests/chapters/tips_and_tricks.snbt index d6c16b02..443dfa50 100644 --- a/config/ftbquests/quests/chapters/tips_and_tricks.snbt +++ b/config/ftbquests/quests/chapters/tips_and_tricks.snbt @@ -351,7 +351,8 @@ tasks: [{ id: "4A080582AC11BEB1" type: "item" - item: { + title: "Mob Shard (Gaia Guardian)" + icon: { id: "woot:mobshard" Count: 1b tag: { @@ -362,6 +363,38 @@ Kills: 5 } } + item: { + id: "itemfilters:and" + Count: 1b + tag: { + items: [ + { + id: "woot:mobshard" + Count: 1b + tag: { + Mob: { + keyTag: "" + keyEntity: "botania:doppleganger" + } + Kills: 5 + } + } + { + id: "itemfilters:weak_nbt" + Count: 1b + tag: { + value: { + Mob: { + keyTag: "" + keyEntity: "botania:doppleganger" + } + Kills: 5 + } + } + } + ] + } + } }] } ] From 248c4a919824ed7b87b325f9eace78ac2733c5cf Mon Sep 17 00:00:00 2001 From: Jeremiah Winsley Date: Sat, 11 Sep 2021 19:57:32 -0400 Subject: [PATCH 12/33] remove explosive arrow --- kubejs/client_scripts/jei_removals.js | 1 + kubejs/server_scripts/mod_specific/_misc/misc.js | 1 + 2 files changed, 2 insertions(+) diff --git a/kubejs/client_scripts/jei_removals.js b/kubejs/client_scripts/jei_removals.js index f61ec847..cdb94e9d 100644 --- a/kubejs/client_scripts/jei_removals.js +++ b/kubejs/client_scripts/jei_removals.js @@ -24,6 +24,7 @@ onEvent('jei.hide.items', e => { 'apotheosis:iron_mining_arrow', 'apotheosis:diamond_mining_arrow', 'apotheosis:explosive_arrow', + 'archers_paradox:explosive_arrow', 'iceandfire:copper_block', 'iceandfire:silver_block', 'projectred-exploration:copper_ore', diff --git a/kubejs/server_scripts/mod_specific/_misc/misc.js b/kubejs/server_scripts/mod_specific/_misc/misc.js index b79b1716..ee4e863b 100644 --- a/kubejs/server_scripts/mod_specific/_misc/misc.js +++ b/kubejs/server_scripts/mod_specific/_misc/misc.js @@ -135,6 +135,7 @@ onEvent('recipes', e => { 'moreminecarts:minecart_with_chunk_loader', 'moreminecarts:chunk_loader', 'silentgear:iron_rod', + 'archers_paradox:explosive_arrow', 'twilightforest:uncrafting_table' ]) From 1dbe39490c3d52e5f57273b35fced190a67ba6ef Mon Sep 17 00:00:00 2001 From: Jeremiah Winsley Date: Sat, 11 Sep 2021 19:58:43 -0400 Subject: [PATCH 13/33] update flowers and mutation blocks for draconic bees --- config/resourcefulbees/bees/bred/bees_ingot/Awakened.json | 4 ++-- config/resourcefulbees/bees/bred/bees_ingot/Draconium.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/resourcefulbees/bees/bred/bees_ingot/Awakened.json b/config/resourcefulbees/bees/bred/bees_ingot/Awakened.json index 177c34f6..2dc35170 100644 --- a/config/resourcefulbees/bees/bred/bees_ingot/Awakened.json +++ b/config/resourcefulbees/bees/bred/bees_ingot/Awakened.json @@ -1,5 +1,5 @@ { - "flower": "draconicevolution:awakened_crafting_injector", + "flower": "draconicevolution:awakened_draconium_block", "maxTimeInHive": 4800, "traits": ["awakened"], "hasHoneycomb": true, @@ -31,7 +31,7 @@ "mutationCount": 1, "mutations": [{ "type": "BLOCK_TO_ITEM", - "inputID": "draconicevolution:wyvern_crafting_injector", + "inputID": "draconicevolution:chaotic_crafting_injector", "outputs": [{ "outputID": "draconicevolution:small_chaos_frag", "weight": 80 diff --git a/config/resourcefulbees/bees/bred/bees_ingot/Draconium.json b/config/resourcefulbees/bees/bred/bees_ingot/Draconium.json index fb19d6d9..61a68e8a 100644 --- a/config/resourcefulbees/bees/bred/bees_ingot/Draconium.json +++ b/config/resourcefulbees/bees/bred/bees_ingot/Draconium.json @@ -1,5 +1,5 @@ { - "flower": "draconicevolution:wyvern_crafting_injector", + "flower": "draconicevolution:draconium_block", "maxTimeInHive": 4800, "traits": ["draconic"], "hasHoneycomb": true, @@ -30,7 +30,7 @@ "mutationCount": 1, "mutations": [{ "type": "BLOCK_TO_ITEM", - "inputID": "draconicevolution:wyvern_crafting_injector", + "inputID": "draconicevolution:awakened_crafting_injector", "outputs": [{ "outputID": "draconicevolution:awakened_draconium_nugget", "weight": 80 From 86e0ff408e5119fe5ee3a55b8539223dc782f589 Mon Sep 17 00:00:00 2001 From: Jeremiah Winsley Date: Sat, 11 Sep 2021 21:34:16 -0400 Subject: [PATCH 14/33] switch back to injectors for draconic bees --- config/resourcefulbees/bees/bred/bees_ingot/Awakened.json | 2 +- config/resourcefulbees/bees/bred/bees_ingot/Draconium.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/resourcefulbees/bees/bred/bees_ingot/Awakened.json b/config/resourcefulbees/bees/bred/bees_ingot/Awakened.json index 2dc35170..d4259278 100644 --- a/config/resourcefulbees/bees/bred/bees_ingot/Awakened.json +++ b/config/resourcefulbees/bees/bred/bees_ingot/Awakened.json @@ -1,5 +1,5 @@ { - "flower": "draconicevolution:awakened_draconium_block", + "flower": "draconicevolution:awakened_crafting_injector", "maxTimeInHive": 4800, "traits": ["awakened"], "hasHoneycomb": true, diff --git a/config/resourcefulbees/bees/bred/bees_ingot/Draconium.json b/config/resourcefulbees/bees/bred/bees_ingot/Draconium.json index 61a68e8a..9c4738e8 100644 --- a/config/resourcefulbees/bees/bred/bees_ingot/Draconium.json +++ b/config/resourcefulbees/bees/bred/bees_ingot/Draconium.json @@ -1,5 +1,5 @@ { - "flower": "draconicevolution:draconium_block", + "flower": "draconicevolution:wyvern_crafting_injector", "maxTimeInHive": 4800, "traits": ["draconic"], "hasHoneycomb": true, From 4878d342f51895dc4313f3d07ae66e347139c630 Mon Sep 17 00:00:00 2001 From: Lady Lexxie Date: Sun, 12 Sep 2021 04:06:03 +0100 Subject: [PATCH 15/33] Update options.txt --- config/defaultoptions/options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/defaultoptions/options.txt b/config/defaultoptions/options.txt index ac7a5f40..658ecf54 100644 --- a/config/defaultoptions/options.txt +++ b/config/defaultoptions/options.txt @@ -32,7 +32,7 @@ difficulty:2 graphicsMode:1 ao:2 biomeBlendRadius:2 -renderClouds:true +renderClouds:false resourcePacks:[] incompatibleResourcePacks:[] lastServer: From d484d55dba26eceb7383aec70fd1fe1de513e53b Mon Sep 17 00:00:00 2001 From: Lady Lexxie Date: Sun, 12 Sep 2021 04:24:46 +0100 Subject: [PATCH 16/33] Update allthetweaks-common.toml --- config/allthetweaks-common.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/allthetweaks-common.toml b/config/allthetweaks-common.toml index ca6efb3d..adb73554 100644 --- a/config/allthetweaks-common.toml +++ b/config/allthetweaks-common.toml @@ -21,5 +21,5 @@ [packversionminrev] #Pack Minor Version Revision : X #Range: 0 ~ 32768 - minorrev = 1 + minorrev = 2 From a4d5ec2ace64cbe627e4e7b31b5d8828919afaa0 Mon Sep 17 00:00:00 2001 From: EnzoBenzo1 Date: Sat, 11 Sep 2021 22:55:03 -0700 Subject: [PATCH 17/33] Thermal Sulfur crusher fix --- kubejs/server_scripts/mod_specific/thermal/thermal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/mod_specific/thermal/thermal.js b/kubejs/server_scripts/mod_specific/thermal/thermal.js index 4c45045e..4d46ff37 100644 --- a/kubejs/server_scripts/mod_specific/thermal/thermal.js +++ b/kubejs/server_scripts/mod_specific/thermal/thermal.js @@ -12,7 +12,7 @@ onEvent('recipes', e => { e.recipes.mekanism.crushing('6x thermal:sulfur', 'thermal:sulfur_ore') e.recipes.mekanism.crushing('thermal:diamond_dust', 'minecraft:diamond') - e.recipes.mekanism.crushing('thermal:sulfur', 'thermal:sulfur') + e.recipes.mekanism.crushing('thermal:sulfur_dust', 'thermal:sulfur') removeRecipeByID([ 'thermal:storage/tin_block', From c57a2d3f8ef9af0672d2c142e8ca124026a290b0 Mon Sep 17 00:00:00 2001 From: Lady Lexxie Date: Sun, 12 Sep 2021 12:42:09 +0100 Subject: [PATCH 18/33] Create biomesoplenty.js --- .../mod_specific/biomesoplenty/biomesoplenty.js | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 kubejs/server_scripts/mod_specific/biomesoplenty/biomesoplenty.js diff --git a/kubejs/server_scripts/mod_specific/biomesoplenty/biomesoplenty.js b/kubejs/server_scripts/mod_specific/biomesoplenty/biomesoplenty.js new file mode 100644 index 00000000..c6478cd7 --- /dev/null +++ b/kubejs/server_scripts/mod_specific/biomesoplenty/biomesoplenty.js @@ -0,0 +1,4 @@ +onEvent('recipes', e => { + e.shapeless('biomesoplenty:flesh', '9x minecraft:rotten_flesh') + e.shapeless('9x minecraft:rotten_flesh', 'biomesoplenty:flesh') +}) \ No newline at end of file From b17db02f25c8c646b220192d485ee2bb946b23c0 Mon Sep 17 00:00:00 2001 From: Lady Lexxie Date: Mon, 13 Sep 2021 06:20:23 +0100 Subject: [PATCH 19/33] Update custom_items.js --- kubejs/startup_scripts/custom_items.js | 1 + 1 file changed, 1 insertion(+) diff --git a/kubejs/startup_scripts/custom_items.js b/kubejs/startup_scripts/custom_items.js index dac85c28..adb59467 100644 --- a/kubejs/startup_scripts/custom_items.js +++ b/kubejs/startup_scripts/custom_items.js @@ -18,4 +18,5 @@ onEvent('block.registry', e => { e.create('potassium_block').displayName('Potassium Block').material('metal') e.create('potassium_nitrate_block').displayName('Potassium Nitrate Block').material('metal') e.create('uru_block').displayName('§6Uru Metal Block').material('metal') + e.create('atm_star_block').displayName('§eATM Star Block').material('iron').hardness(5).lightLevel(1) }) From f0c6b32564a715755e10df7aec4f7f95d4633cda Mon Sep 17 00:00:00 2001 From: Lady Lexxie Date: Mon, 13 Sep 2021 13:17:05 +0100 Subject: [PATCH 20/33] Update misc.js --- kubejs/server_scripts/mod_specific/_misc/misc.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kubejs/server_scripts/mod_specific/_misc/misc.js b/kubejs/server_scripts/mod_specific/_misc/misc.js index ee4e863b..91afbac7 100644 --- a/kubejs/server_scripts/mod_specific/_misc/misc.js +++ b/kubejs/server_scripts/mod_specific/_misc/misc.js @@ -98,6 +98,8 @@ onEvent('recipes', e => { ['enderium', [1, 3, 4]], ['brass', [2, 3], 57, 'create:brass_sheet'] ]) + + e.shapeless('9x atmadditions:atm_star', 'kubejs:atm_star_block').id('kubejs:atmadditions/atm_star_salvage') e.shapeless('astralsorcery:marble_raw', 'enviromats:marble').id('kubejs:marble/astral_to_envirotech') e.shapeless('enviromats:marble', 'quark:marble').id('kubejs:marble/envirotech_to_quark') From d5f76a76bfcb31b7c9ae788e70b4841362c08de2 Mon Sep 17 00:00:00 2001 From: Lady Lexxie Date: Mon, 13 Sep 2021 19:41:36 +0100 Subject: [PATCH 21/33] re-added woot config --- config/woot-common.toml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 config/woot-common.toml diff --git a/config/woot-common.toml b/config/woot-common.toml new file mode 100644 index 00000000..09ec23c9 --- /dev/null +++ b/config/woot-common.toml @@ -0,0 +1,14 @@ +[policy] + [policy.mob] + spawnTicks = ["minecraft:wither,1200", "minecraft:ender_dragon,12000", "botania:doppleganger,12000"] + tier = ["minecraft:wither_skeleton,4", "minecraft:villager,4", "minecraft:magma_cube,3", "minecraft:enderman,4", "minecraft:villager_golem,4", "minecraft:guardian,4", "minecraft:blaze,3", "minecraft:witch,3", "minecraft:ghast,3", "minecraft:zombie_pigman,3", "minecraft:ender_dragon,5", "minecraft:wither,5", "botania:doppleganger,5"] + xp = ["minecraft:iron_golem,20", "minecraft:bat,1", "minecraft:snow_golem,1", "minecraft:villager,2", "minecraft:wandering_villager,2", "minecraft:ender_dragon,500", "botania:doppleganger,1"] + health = ["minecraft:ender_dragon,500", "botania:doppleganger,250"] + customDropsOnly = ["minecraft:ender_dragon", "botania:doppleganger"] + [policy.mob.perk] + mass1 = ["minecraft:ender_dragon,2", "minecraft:wither,2", "botania:doppleganger,2"] + mass2 = ["minecraft:ender_dragon,3", "minecraft:wither,3", "botania:doppleganger,3"] + mass3 = ["minecraft:ender_dragon,4", "minecraft:wither,4", "botania:doppleganger,4"] + [policy.blacklist] + captureMod = [] + From 269cc53f291c191de828a835a8d19d2753ba5b02 Mon Sep 17 00:00:00 2001 From: Lady Lexxie Date: Mon, 13 Sep 2021 19:43:51 +0100 Subject: [PATCH 22/33] Update misc.js --- kubejs/server_scripts/mod_specific/_misc/misc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/mod_specific/_misc/misc.js b/kubejs/server_scripts/mod_specific/_misc/misc.js index 91afbac7..5f24e0f6 100644 --- a/kubejs/server_scripts/mod_specific/_misc/misc.js +++ b/kubejs/server_scripts/mod_specific/_misc/misc.js @@ -99,7 +99,7 @@ onEvent('recipes', e => { ['brass', [2, 3], 57, 'create:brass_sheet'] ]) - e.shapeless('9x atmadditions:atm_star', 'kubejs:atm_star_block').id('kubejs:atmadditions/atm_star_salvage') + e.shapeless('allthecompressed:atm_star_block', 'kubejs:atm_star_block').id('kubejs:atmadditions/atm_star_block_conversion') e.shapeless('astralsorcery:marble_raw', 'enviromats:marble').id('kubejs:marble/astral_to_envirotech') e.shapeless('enviromats:marble', 'quark:marble').id('kubejs:marble/envirotech_to_quark') From d1c713ba98b3bef7cee29756672968d5d6a427cd Mon Sep 17 00:00:00 2001 From: Lady Lexxie Date: Mon, 13 Sep 2021 19:58:27 +0100 Subject: [PATCH 23/33] Update allthetweaks-common.toml --- config/allthetweaks-common.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/allthetweaks-common.toml b/config/allthetweaks-common.toml index adb73554..5987ea26 100644 --- a/config/allthetweaks-common.toml +++ b/config/allthetweaks-common.toml @@ -21,5 +21,5 @@ [packversionminrev] #Pack Minor Version Revision : X #Range: 0 ~ 32768 - minorrev = 2 + minorrev = 3 From c76a3bd762eca04c66fbd77362a42bff6a21a450 Mon Sep 17 00:00:00 2001 From: Lady Lexxie Date: Mon, 13 Sep 2021 22:48:23 +0100 Subject: [PATCH 24/33] Update common.toml --- config/resourcefulbees/common.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/resourcefulbees/common.toml b/config/resourcefulbees/common.toml index c3e6d954..a1bf60ae 100644 --- a/config/resourcefulbees/common.toml +++ b/config/resourcefulbees/common.toml @@ -1,2 +1,3 @@ ["General Options"] generateDefaults = false + useForgeBiomeDictionaries = false From 214011a1cca0b258ab66cfb17e758e7639f70e0d Mon Sep 17 00:00:00 2001 From: Lady Lexxie Date: Tue, 14 Sep 2021 08:01:29 +0100 Subject: [PATCH 25/33] Bee fixes made bees spawn up to 2 to reduce lag and accommodate for the hive space re-added ghost bee properly this time added more biomes to salt/aquamarine bees as well as increasing their spawn weights --- .../bees/bred/bees_gem/Certus.json | 2 +- .../bees/bred/bees_gem/Diamond.json | 2 +- .../bees/bred/bees_gem/Emerald.json | 2 +- .../bees/bred/bees_gem/Fluorite.json | 2 +- .../bees/bred/bees_gem/Lapis.json | 2 +- .../bees/bred/bees_gem/Redstone.json | 2 +- .../bees/bred/bees_ingot/Allthemodium.json | 2 +- .../bees/bred/bees_ingot/Aluminum.json | 2 +- .../bees/bred/bees_ingot/Copper.json | 2 +- .../bees/bred/bees_ingot/Gold.json | 2 +- .../bees/bred/bees_ingot/Iron.json | 2 +- .../bees/bred/bees_ingot/Lead.json | 2 +- .../bees/bred/bees_ingot/Netherite.json | 2 +- .../bees/bred/bees_ingot/Nickel.json | 2 +- .../bees/bred/bees_ingot/Osmium.json | 2 +- .../bees/bred/bees_ingot/Platinum.json | 2 +- .../bees/bred/bees_ingot/Silver.json | 2 +- .../bees/bred/bees_ingot/Tin.json | 2 +- .../bees/bred/bees_ingot/Unobtainium.json | 2 +- .../bees/bred/bees_ingot/Uraninite.json | 2 +- .../bees/bred/bees_ingot/Uranium.json | 2 +- .../bees/bred/bees_ingot/Vibranium.json | 2 +- .../bees/bred/bees_ingot/Zinc.json | 2 +- .../bees/bred/bees_mob/Blazing.json | 2 +- .../bees/bred/bees_mob/Dragonic.json | 2 +- .../bees/bred/bees_mob/Wither.json | 2 +- .../bees/bred/bees_mob/Withered.json | 2 +- .../bees/natural/bees_gem/Aquamarine.json | 10 +-- .../bees/natural/bees_gem/Quartz.json | 2 +- .../bees/natural/bees_ingot/Cobalt.json | 2 +- .../bees/natural/bees_ingot/Crimson_Iron.json | 2 +- .../bees/natural/bees_misc/Cobbee.json | 2 +- .../bees/natural/bees_misc/Cropy.json | 2 +- .../bees/natural/bees_misc/Dirty.json | 8 +- .../bees/natural/bees_misc/Glowing.json | 2 +- .../bees/natural/bees_misc/Gravely.json | 2 +- .../bees/natural/bees_misc/Icey.json | 2 +- .../bees/natural/bees_misc/Lava.json | 2 +- .../bees/natural/bees_misc/Leafy.json | 2 +- .../bees/natural/bees_misc/Lumber.json | 2 +- .../bees/natural/bees_misc/Mana.json | 2 +- .../bees/natural/bees_misc/Mason.json | 2 +- .../bees/natural/bees_misc/Mystical.json | 2 +- .../bees/natural/bees_misc/RGBee.json | 2 +- .../bees/natural/bees_misc/Salt_Baee.json | 8 +- .../bees/natural/bees_misc/Sandy.json | 2 +- .../bees/natural/bees_misc/Stan.json | 2 +- .../bees/natural/bees_misc/Water.json | 2 +- .../bees/natural/bees_mob/Beeper.json | 2 +- .../bees/natural/bees_mob/Ender.json | 2 +- .../bees/natural/bees_mob/Guardian.json | 2 +- .../bees/natural/bees_mob/KoBee_Beef.json | 2 +- .../bees/natural/bees_mob/Magma.json | 2 +- .../bees/natural/bees_mob/Slimy.json | 2 +- .../bees/natural/bees_mob/Spider.json | 2 +- .../bees/natural/bees_mob/Spooky.json | 2 +- .../bees/natural/bees_mob/Zombee.json | 2 +- config/resourcefulbees/common.toml | 2 + .../assets/resourcefulbees/lang/en_us.json | 77 +++++++++++++++++-- 59 files changed, 139 insertions(+), 74 deletions(-) diff --git a/config/resourcefulbees/bees/bred/bees_gem/Certus.json b/config/resourcefulbees/bees/bred/bees_gem/Certus.json index 7aa7ec84..dc9126be 100644 --- a/config/resourcefulbees/bees/bred/bees_gem/Certus.json +++ b/config/resourcefulbees/bees/bred/bees_gem/Certus.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_gem/Diamond.json b/config/resourcefulbees/bees/bred/bees_gem/Diamond.json index 716f75c6..733e6e6d 100644 --- a/config/resourcefulbees/bees/bred/bees_gem/Diamond.json +++ b/config/resourcefulbees/bees/bred/bees_gem/Diamond.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_gem/Emerald.json b/config/resourcefulbees/bees/bred/bees_gem/Emerald.json index de531046..e05537db 100644 --- a/config/resourcefulbees/bees/bred/bees_gem/Emerald.json +++ b/config/resourcefulbees/bees/bred/bees_gem/Emerald.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_gem/Fluorite.json b/config/resourcefulbees/bees/bred/bees_gem/Fluorite.json index eb818dc0..d5bccc45 100644 --- a/config/resourcefulbees/bees/bred/bees_gem/Fluorite.json +++ b/config/resourcefulbees/bees/bred/bees_gem/Fluorite.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_gem/Lapis.json b/config/resourcefulbees/bees/bred/bees_gem/Lapis.json index 8a117cd3..fe107eb5 100644 --- a/config/resourcefulbees/bees/bred/bees_gem/Lapis.json +++ b/config/resourcefulbees/bees/bred/bees_gem/Lapis.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_gem/Redstone.json b/config/resourcefulbees/bees/bred/bees_gem/Redstone.json index 1f3f85ec..e461c00a 100644 --- a/config/resourcefulbees/bees/bred/bees_gem/Redstone.json +++ b/config/resourcefulbees/bees/bred/bees_gem/Redstone.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_ingot/Allthemodium.json b/config/resourcefulbees/bees/bred/bees_ingot/Allthemodium.json index aa8acce8..5eb1fe59 100644 --- a/config/resourcefulbees/bees/bred/bees_ingot/Allthemodium.json +++ b/config/resourcefulbees/bees/bred/bees_ingot/Allthemodium.json @@ -86,7 +86,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_ingot/Aluminum.json b/config/resourcefulbees/bees/bred/bees_ingot/Aluminum.json index 7db793cf..1f4a6dd1 100644 --- a/config/resourcefulbees/bees/bred/bees_ingot/Aluminum.json +++ b/config/resourcefulbees/bees/bred/bees_ingot/Aluminum.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_ingot/Copper.json b/config/resourcefulbees/bees/bred/bees_ingot/Copper.json index d0bcedc0..3569a669 100644 --- a/config/resourcefulbees/bees/bred/bees_ingot/Copper.json +++ b/config/resourcefulbees/bees/bred/bees_ingot/Copper.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_ingot/Gold.json b/config/resourcefulbees/bees/bred/bees_ingot/Gold.json index 3fb25d01..e6e4b6bc 100644 --- a/config/resourcefulbees/bees/bred/bees_ingot/Gold.json +++ b/config/resourcefulbees/bees/bred/bees_ingot/Gold.json @@ -86,7 +86,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_ingot/Iron.json b/config/resourcefulbees/bees/bred/bees_ingot/Iron.json index 1cbac239..9f4f78bc 100644 --- a/config/resourcefulbees/bees/bred/bees_ingot/Iron.json +++ b/config/resourcefulbees/bees/bred/bees_ingot/Iron.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_ingot/Lead.json b/config/resourcefulbees/bees/bred/bees_ingot/Lead.json index 5b0a9c6e..cccaf207 100644 --- a/config/resourcefulbees/bees/bred/bees_ingot/Lead.json +++ b/config/resourcefulbees/bees/bred/bees_ingot/Lead.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_ingot/Netherite.json b/config/resourcefulbees/bees/bred/bees_ingot/Netherite.json index 73eb5acd..b577b942 100644 --- a/config/resourcefulbees/bees/bred/bees_ingot/Netherite.json +++ b/config/resourcefulbees/bees/bred/bees_ingot/Netherite.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_ingot/Nickel.json b/config/resourcefulbees/bees/bred/bees_ingot/Nickel.json index 52ae08b3..f3387b0d 100644 --- a/config/resourcefulbees/bees/bred/bees_ingot/Nickel.json +++ b/config/resourcefulbees/bees/bred/bees_ingot/Nickel.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_ingot/Osmium.json b/config/resourcefulbees/bees/bred/bees_ingot/Osmium.json index d40f2806..241da46f 100644 --- a/config/resourcefulbees/bees/bred/bees_ingot/Osmium.json +++ b/config/resourcefulbees/bees/bred/bees_ingot/Osmium.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_ingot/Platinum.json b/config/resourcefulbees/bees/bred/bees_ingot/Platinum.json index 9a6b3fde..4266eb25 100644 --- a/config/resourcefulbees/bees/bred/bees_ingot/Platinum.json +++ b/config/resourcefulbees/bees/bred/bees_ingot/Platinum.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_ingot/Silver.json b/config/resourcefulbees/bees/bred/bees_ingot/Silver.json index 9010d157..ca39cad9 100644 --- a/config/resourcefulbees/bees/bred/bees_ingot/Silver.json +++ b/config/resourcefulbees/bees/bred/bees_ingot/Silver.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_ingot/Tin.json b/config/resourcefulbees/bees/bred/bees_ingot/Tin.json index 331f2aea..495b2274 100644 --- a/config/resourcefulbees/bees/bred/bees_ingot/Tin.json +++ b/config/resourcefulbees/bees/bred/bees_ingot/Tin.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_ingot/Unobtainium.json b/config/resourcefulbees/bees/bred/bees_ingot/Unobtainium.json index cb5b639f..1ef05986 100644 --- a/config/resourcefulbees/bees/bred/bees_ingot/Unobtainium.json +++ b/config/resourcefulbees/bees/bred/bees_ingot/Unobtainium.json @@ -81,7 +81,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_ingot/Uraninite.json b/config/resourcefulbees/bees/bred/bees_ingot/Uraninite.json index 17a28362..f0e345ba 100644 --- a/config/resourcefulbees/bees/bred/bees_ingot/Uraninite.json +++ b/config/resourcefulbees/bees/bred/bees_ingot/Uraninite.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_ingot/Uranium.json b/config/resourcefulbees/bees/bred/bees_ingot/Uranium.json index 106542ae..d363d305 100644 --- a/config/resourcefulbees/bees/bred/bees_ingot/Uranium.json +++ b/config/resourcefulbees/bees/bred/bees_ingot/Uranium.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_ingot/Vibranium.json b/config/resourcefulbees/bees/bred/bees_ingot/Vibranium.json index 64de254b..338be299 100644 --- a/config/resourcefulbees/bees/bred/bees_ingot/Vibranium.json +++ b/config/resourcefulbees/bees/bred/bees_ingot/Vibranium.json @@ -86,7 +86,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_ingot/Zinc.json b/config/resourcefulbees/bees/bred/bees_ingot/Zinc.json index 57251ce7..6d6585d8 100644 --- a/config/resourcefulbees/bees/bred/bees_ingot/Zinc.json +++ b/config/resourcefulbees/bees/bred/bees_ingot/Zinc.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_mob/Blazing.json b/config/resourcefulbees/bees/bred/bees_mob/Blazing.json index c52178bc..6f4d31e5 100644 --- a/config/resourcefulbees/bees/bred/bees_mob/Blazing.json +++ b/config/resourcefulbees/bees/bred/bees_mob/Blazing.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_mob/Dragonic.json b/config/resourcefulbees/bees/bred/bees_mob/Dragonic.json index 8a104cee..7ab95ec1 100644 --- a/config/resourcefulbees/bees/bred/bees_mob/Dragonic.json +++ b/config/resourcefulbees/bees/bred/bees_mob/Dragonic.json @@ -101,7 +101,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_mob/Wither.json b/config/resourcefulbees/bees/bred/bees_mob/Wither.json index 1478af04..12873499 100644 --- a/config/resourcefulbees/bees/bred/bees_mob/Wither.json +++ b/config/resourcefulbees/bees/bred/bees_mob/Wither.json @@ -86,7 +86,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/bred/bees_mob/Withered.json b/config/resourcefulbees/bees/bred/bees_mob/Withered.json index 5f87e540..1f22b3b5 100644 --- a/config/resourcefulbees/bees/bred/bees_mob/Withered.json +++ b/config/resourcefulbees/bees/bred/bees_mob/Withered.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_gem/Aquamarine.json b/config/resourcefulbees/bees/natural/bees_gem/Aquamarine.json index a7efd56b..20504aa7 100644 --- a/config/resourcefulbees/bees/natural/bees_gem/Aquamarine.json +++ b/config/resourcefulbees/bees/natural/bees_gem/Aquamarine.json @@ -1,7 +1,7 @@ { "flower": "astralsorcery:starmetal", "maxTimeInHive": 1200, - "traits": [], + "traits": ["can_swim"], "hasHoneycomb": true, "baseLayerTexture": "misc/aquamarine_bee", "ColorData": { @@ -65,13 +65,13 @@ }, "SpawnData": { "canSpawnInWorld": true, - "biomeWhitelist": "tag:beach, tag:lake", + "biomeWhitelist": "tag:beach, tag:lake, tag:river", "biomeBlacklist": "", - "spawnWeight": 5, + "spawnWeight": 10, "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { @@ -86,6 +86,6 @@ "breedDelay": 6000 }, "TraitData": { - "hasTraits": false + "hasTraits": true } } \ No newline at end of file diff --git a/config/resourcefulbees/bees/natural/bees_gem/Quartz.json b/config/resourcefulbees/bees/natural/bees_gem/Quartz.json index 95a10a18..c2795860 100644 --- a/config/resourcefulbees/bees/natural/bees_gem/Quartz.json +++ b/config/resourcefulbees/bees/natural/bees_gem/Quartz.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_ingot/Cobalt.json b/config/resourcefulbees/bees/natural/bees_ingot/Cobalt.json index 651f3147..3fa15ee2 100644 --- a/config/resourcefulbees/bees/natural/bees_ingot/Cobalt.json +++ b/config/resourcefulbees/bees/natural/bees_ingot/Cobalt.json @@ -65,7 +65,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_ingot/Crimson_Iron.json b/config/resourcefulbees/bees/natural/bees_ingot/Crimson_Iron.json index a04a45d7..0edf4084 100644 --- a/config/resourcefulbees/bees/natural/bees_ingot/Crimson_Iron.json +++ b/config/resourcefulbees/bees/natural/bees_ingot/Crimson_Iron.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_misc/Cobbee.json b/config/resourcefulbees/bees/natural/bees_misc/Cobbee.json index 13664d67..06ce194a 100644 --- a/config/resourcefulbees/bees/natural/bees_misc/Cobbee.json +++ b/config/resourcefulbees/bees/natural/bees_misc/Cobbee.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_misc/Cropy.json b/config/resourcefulbees/bees/natural/bees_misc/Cropy.json index b7c81edd..01a5d7ca 100644 --- a/config/resourcefulbees/bees/natural/bees_misc/Cropy.json +++ b/config/resourcefulbees/bees/natural/bees_misc/Cropy.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_misc/Dirty.json b/config/resourcefulbees/bees/natural/bees_misc/Dirty.json index 864cf5ba..1e9c4b21 100644 --- a/config/resourcefulbees/bees/natural/bees_misc/Dirty.json +++ b/config/resourcefulbees/bees/natural/bees_misc/Dirty.json @@ -1,7 +1,7 @@ { "flower": "tag:forge:dirt", "maxTimeInHive": 1200, - "traits": [], + "traits": ["can_swim"], "hasHoneycomb": true, "baseLayerTexture": "misc/dirty_bee", "ColorData": { @@ -67,11 +67,11 @@ "canSpawnInWorld": true, "biomeWhitelist": "tag:OVERWORLD", "biomeBlacklist": "", - "spawnWeight": 5, + "spawnWeight": 2, "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { @@ -86,6 +86,6 @@ "breedDelay": 6000 }, "TraitData": { - "hasTraits": false + "hasTraits": true } } \ No newline at end of file diff --git a/config/resourcefulbees/bees/natural/bees_misc/Glowing.json b/config/resourcefulbees/bees/natural/bees_misc/Glowing.json index 578804b2..020ff95a 100644 --- a/config/resourcefulbees/bees/natural/bees_misc/Glowing.json +++ b/config/resourcefulbees/bees/natural/bees_misc/Glowing.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_misc/Gravely.json b/config/resourcefulbees/bees/natural/bees_misc/Gravely.json index a4e9cdde..c3fc83cd 100644 --- a/config/resourcefulbees/bees/natural/bees_misc/Gravely.json +++ b/config/resourcefulbees/bees/natural/bees_misc/Gravely.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_misc/Icey.json b/config/resourcefulbees/bees/natural/bees_misc/Icey.json index b103f61a..f290cca2 100644 --- a/config/resourcefulbees/bees/natural/bees_misc/Icey.json +++ b/config/resourcefulbees/bees/natural/bees_misc/Icey.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_misc/Lava.json b/config/resourcefulbees/bees/natural/bees_misc/Lava.json index f364d46d..23b47bfd 100644 --- a/config/resourcefulbees/bees/natural/bees_misc/Lava.json +++ b/config/resourcefulbees/bees/natural/bees_misc/Lava.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_misc/Leafy.json b/config/resourcefulbees/bees/natural/bees_misc/Leafy.json index 5d53aed0..ae28f955 100644 --- a/config/resourcefulbees/bees/natural/bees_misc/Leafy.json +++ b/config/resourcefulbees/bees/natural/bees_misc/Leafy.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_misc/Lumber.json b/config/resourcefulbees/bees/natural/bees_misc/Lumber.json index f732fa57..3ec1908a 100644 --- a/config/resourcefulbees/bees/natural/bees_misc/Lumber.json +++ b/config/resourcefulbees/bees/natural/bees_misc/Lumber.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_misc/Mana.json b/config/resourcefulbees/bees/natural/bees_misc/Mana.json index 9fef0e42..c0724649 100644 --- a/config/resourcefulbees/bees/natural/bees_misc/Mana.json +++ b/config/resourcefulbees/bees/natural/bees_misc/Mana.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_misc/Mason.json b/config/resourcefulbees/bees/natural/bees_misc/Mason.json index 69d0f088..cd74c7fa 100644 --- a/config/resourcefulbees/bees/natural/bees_misc/Mason.json +++ b/config/resourcefulbees/bees/natural/bees_misc/Mason.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_misc/Mystical.json b/config/resourcefulbees/bees/natural/bees_misc/Mystical.json index 5c8c6532..aee510c1 100644 --- a/config/resourcefulbees/bees/natural/bees_misc/Mystical.json +++ b/config/resourcefulbees/bees/natural/bees_misc/Mystical.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_misc/RGBee.json b/config/resourcefulbees/bees/natural/bees_misc/RGBee.json index 181f4f1a..da83fb11 100644 --- a/config/resourcefulbees/bees/natural/bees_misc/RGBee.json +++ b/config/resourcefulbees/bees/natural/bees_misc/RGBee.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_misc/Salt_Baee.json b/config/resourcefulbees/bees/natural/bees_misc/Salt_Baee.json index 1f70f297..a29a42ff 100644 --- a/config/resourcefulbees/bees/natural/bees_misc/Salt_Baee.json +++ b/config/resourcefulbees/bees/natural/bees_misc/Salt_Baee.json @@ -1,7 +1,7 @@ { "flower": "mekanism:block_salt", "maxTimeInHive": 1200, - "traits": [], + "traits": ["can_swim"], "hasHoneycomb": true, "baseLayerTexture": "misc/salt_baee", "ColorData": { @@ -67,11 +67,11 @@ "canSpawnInWorld": true, "biomeWhitelist": "tag:salt_baee, tag:lake", "biomeBlacklist": "", - "spawnWeight": 5, + "spawnWeight": 10, "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { @@ -86,6 +86,6 @@ "breedDelay": 6000 }, "TraitData": { - "hasTraits": false + "hasTraits": true } } \ No newline at end of file diff --git a/config/resourcefulbees/bees/natural/bees_misc/Sandy.json b/config/resourcefulbees/bees/natural/bees_misc/Sandy.json index 495c13c7..5602be2b 100644 --- a/config/resourcefulbees/bees/natural/bees_misc/Sandy.json +++ b/config/resourcefulbees/bees/natural/bees_misc/Sandy.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_misc/Stan.json b/config/resourcefulbees/bees/natural/bees_misc/Stan.json index 0d065923..49b5346d 100644 --- a/config/resourcefulbees/bees/natural/bees_misc/Stan.json +++ b/config/resourcefulbees/bees/natural/bees_misc/Stan.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_misc/Water.json b/config/resourcefulbees/bees/natural/bees_misc/Water.json index 2878cff1..3df5fb7d 100644 --- a/config/resourcefulbees/bees/natural/bees_misc/Water.json +++ b/config/resourcefulbees/bees/natural/bees_misc/Water.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 1, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_mob/Beeper.json b/config/resourcefulbees/bees/natural/bees_mob/Beeper.json index 9bbd9eb1..0148b7f0 100644 --- a/config/resourcefulbees/bees/natural/bees_mob/Beeper.json +++ b/config/resourcefulbees/bees/natural/bees_mob/Beeper.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_mob/Ender.json b/config/resourcefulbees/bees/natural/bees_mob/Ender.json index 9ce5919e..39c43b5c 100644 --- a/config/resourcefulbees/bees/natural/bees_mob/Ender.json +++ b/config/resourcefulbees/bees/natural/bees_mob/Ender.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_mob/Guardian.json b/config/resourcefulbees/bees/natural/bees_mob/Guardian.json index 877ca6f2..a9008fbf 100644 --- a/config/resourcefulbees/bees/natural/bees_mob/Guardian.json +++ b/config/resourcefulbees/bees/natural/bees_mob/Guardian.json @@ -71,7 +71,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 1, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_mob/KoBee_Beef.json b/config/resourcefulbees/bees/natural/bees_mob/KoBee_Beef.json index 5a30fb3f..92073628 100644 --- a/config/resourcefulbees/bees/natural/bees_mob/KoBee_Beef.json +++ b/config/resourcefulbees/bees/natural/bees_mob/KoBee_Beef.json @@ -72,7 +72,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_mob/Magma.json b/config/resourcefulbees/bees/natural/bees_mob/Magma.json index a10be06c..a54811ae 100644 --- a/config/resourcefulbees/bees/natural/bees_mob/Magma.json +++ b/config/resourcefulbees/bees/natural/bees_mob/Magma.json @@ -72,7 +72,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_mob/Slimy.json b/config/resourcefulbees/bees/natural/bees_mob/Slimy.json index c27ef858..89cb3e97 100644 --- a/config/resourcefulbees/bees/natural/bees_mob/Slimy.json +++ b/config/resourcefulbees/bees/natural/bees_mob/Slimy.json @@ -72,7 +72,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_mob/Spider.json b/config/resourcefulbees/bees/natural/bees_mob/Spider.json index f1802e14..a90d0506 100644 --- a/config/resourcefulbees/bees/natural/bees_mob/Spider.json +++ b/config/resourcefulbees/bees/natural/bees_mob/Spider.json @@ -72,7 +72,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_mob/Spooky.json b/config/resourcefulbees/bees/natural/bees_mob/Spooky.json index 9f585960..47d9f71d 100644 --- a/config/resourcefulbees/bees/natural/bees_mob/Spooky.json +++ b/config/resourcefulbees/bees/natural/bees_mob/Spooky.json @@ -72,7 +72,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/bees/natural/bees_mob/Zombee.json b/config/resourcefulbees/bees/natural/bees_mob/Zombee.json index b9755eb2..1133310b 100644 --- a/config/resourcefulbees/bees/natural/bees_mob/Zombee.json +++ b/config/resourcefulbees/bees/natural/bees_mob/Zombee.json @@ -72,7 +72,7 @@ "minYLevel": 0, "maxYLevel": 255, "minGroupSize": 1, - "maxGroupSize": 3, + "maxGroupSize": 2, "lightLevel": "ANY" }, "BreedData": { diff --git a/config/resourcefulbees/common.toml b/config/resourcefulbees/common.toml index a1bf60ae..1e30a504 100644 --- a/config/resourcefulbees/common.toml +++ b/config/resourcefulbees/common.toml @@ -1,3 +1,5 @@ + ["General Options"] generateDefaults = false useForgeBiomeDictionaries = false + diff --git a/config/resourcefulbees/resources/assets/resourcefulbees/lang/en_us.json b/config/resourcefulbees/resources/assets/resourcefulbees/lang/en_us.json index ba653ba0..710e87e0 100644 --- a/config/resourcefulbees/resources/assets/resourcefulbees/lang/en_us.json +++ b/config/resourcefulbees/resources/assets/resourcefulbees/lang/en_us.json @@ -3,130 +3,162 @@ "item.resourcefulbees.diamond_honeycomb": "Diamond Honeycomb", "item.resourcefulbees.diamond_bee_spawn_egg": "Diamond Bee Spawn Egg", "entity.resourcefulbees.diamond_bee": "Diamond Bee", + "block.resourcefulbees.emerald_honeycomb_block": "Emerald Honeycomb Block", "item.resourcefulbees.emerald_honeycomb": "Emerald Honeycomb", "item.resourcefulbees.emerald_bee_spawn_egg": "Emerald Bee Spawn Egg", "entity.resourcefulbees.emerald_bee": "Emerald Bee", + "block.resourcefulbees.lapis_honeycomb_block": "Lapis Honeycomb Block", "item.resourcefulbees.lapis_honeycomb": "Lapis Honeycomb", "item.resourcefulbees.lapis_bee_spawn_egg": "Lapis Bee Spawn Egg", "entity.resourcefulbees.lapis_bee": "Lapis Bee", + "block.resourcefulbees.quartz_honeycomb_block": "Quartz Honeycomb Block", "item.resourcefulbees.quartz_honeycomb": "Quartz Honeycomb", "item.resourcefulbees.quartz_bee_spawn_egg": "Quartz Bee Spawn Egg", "entity.resourcefulbees.quartz_bee": "Quartz Bee", + "block.resourcefulbees.allthemodium_honeycomb_block": "Allthemodium Honeycomb Block", "item.resourcefulbees.allthemodium_honeycomb": "Allthemodium Honeycomb", "item.resourcefulbees.allthemodium_bee_spawn_egg": "Allthemodium Bee Spawn Egg", "entity.resourcefulbees.allthemodium_bee": "Allthemodium Bee", + "block.resourcefulbees.aluminum_honeycomb_block": "Aluminum Honeycomb Block", "item.resourcefulbees.aluminum_honeycomb": "Aluminum Honeycomb", "item.resourcefulbees.aluminum_bee_spawn_egg": "Aluminum Bee Spawn Egg", "entity.resourcefulbees.aluminum_bee": "Aluminum Bee", + "block.resourcefulbees.copper_honeycomb_block": "Copper Honeycomb Block", "item.resourcefulbees.copper_honeycomb": "Copper Honeycomb", "item.resourcefulbees.copper_bee_spawn_egg": "Copper Bee Spawn Egg", "entity.resourcefulbees.copper_bee": "Copper Bee", + "block.resourcefulbees.gold_honeycomb_block": "Gold Honeycomb Block", "item.resourcefulbees.gold_honeycomb": "Gold Honeycomb", "item.resourcefulbees.gold_bee_spawn_egg": "Gold Bee Spawn Egg", "entity.resourcefulbees.gold_bee": "Gold Bee", + "block.resourcefulbees.iron_honeycomb_block": "Iron Honeycomb Block", "item.resourcefulbees.iron_honeycomb": "Iron Honeycomb", "item.resourcefulbees.iron_bee_spawn_egg": "Iron Bee Spawn Egg", "entity.resourcefulbees.iron_bee": "Iron Bee", + "block.resourcefulbees.lead_honeycomb_block": "Lead Honeycomb Block", "item.resourcefulbees.lead_honeycomb": "Lead Honeycomb", "item.resourcefulbees.lead_bee_spawn_egg": "Lead Bee Spawn Egg", "entity.resourcefulbees.lead_bee": "Lead Bee", + "block.resourcefulbees.netherite_honeycomb_block": "Netherite Honeycomb Block", "item.resourcefulbees.netherite_honeycomb": "Netherite Honeycomb", "item.resourcefulbees.netherite_bee_spawn_egg": "Netherite Bee Spawn Egg", "entity.resourcefulbees.netherite_bee": "Netherite Bee", + "block.resourcefulbees.nickel_honeycomb_block": "Nickel Honeycomb Block", "item.resourcefulbees.nickel_honeycomb": "Nickel Honeycomb", "item.resourcefulbees.nickel_bee_spawn_egg": "Nickel Bee Spawn Egg", "entity.resourcefulbees.nickel_bee": "Nickel Bee", + "block.resourcefulbees.osmium_honeycomb_block": "Osmium Honeycomb Block", "item.resourcefulbees.osmium_honeycomb": "Osmium Honeycomb", "item.resourcefulbees.osmium_bee_spawn_egg": "Osmium Bee Spawn Egg", "entity.resourcefulbees.osmium_bee": "Osmium Bee", + "block.resourcefulbees.platinum_honeycomb_block": "Platinum Honeycomb Block", "item.resourcefulbees.platinum_honeycomb": "Platinum Honeycomb", "item.resourcefulbees.platinum_bee_spawn_egg": "Platinum Bee Spawn Egg", "entity.resourcefulbees.platinum_bee": "Platinum Bee", + "block.resourcefulbees.silver_honeycomb_block": "Silver Honeycomb Block", "item.resourcefulbees.silver_honeycomb": "Silver Honeycomb", "item.resourcefulbees.silver_bee_spawn_egg": "Silver Bee Spawn Egg", "entity.resourcefulbees.silver_bee": "Silver Bee", + "block.resourcefulbees.tin_honeycomb_block": "Tin Honeycomb Block", "item.resourcefulbees.tin_honeycomb": "Tin Honeycomb", "item.resourcefulbees.tin_bee_spawn_egg": "Tin Bee Spawn Egg", "entity.resourcefulbees.tin_bee": "Tin Bee", + "block.resourcefulbees.unobtainium_honeycomb_block": "Unobtainium Honeycomb Block", "item.resourcefulbees.unobtainium_honeycomb": "Unobtainium Honeycomb", "item.resourcefulbees.unobtainium_bee_spawn_egg": "Unobtainium Bee Spawn Egg", "entity.resourcefulbees.unobtainium_bee": "Unobtainium Bee", + "block.resourcefulbees.uranium_honeycomb_block": "Uranium Honeycomb Block", "item.resourcefulbees.uranium_honeycomb": "Uranium Honeycomb", "item.resourcefulbees.uranium_bee_spawn_egg": "Uranium Bee Spawn Egg", "entity.resourcefulbees.uranium_bee": "Uranium Bee", + "block.resourcefulbees.vibranium_honeycomb_block": "Vibranium Honeycomb Block", "item.resourcefulbees.vibranium_honeycomb": "Vibranium Honeycomb", "item.resourcefulbees.vibranium_bee_spawn_egg": "Vibranium Bee Spawn Egg", "entity.resourcefulbees.vibranium_bee": "Vibranium Bee", + "block.resourcefulbees.zinc_honeycomb_block": "Zinc Honeycomb Block", "item.resourcefulbees.zinc_honeycomb": "Zinc Honeycomb", "item.resourcefulbees.zinc_bee_spawn_egg": "Zinc Bee Spawn Egg", "entity.resourcefulbees.zinc_bee": "Zinc Bee", + "block.resourcefulbees.crimson_iron_honeycomb_block": "Crimson Iron Honeycomb Block", "item.resourcefulbees.crimson_iron_honeycomb": "Crimson Iron Honeycomb", "item.resourcefulbees.crimson_iron_bee_spawn_egg": "Crimson Iron Bee Spawn Egg", "entity.resourcefulbees.crimson_iron_bee": "Crimson Iron Bee", + "block.resourcefulbees.coal_honeycomb_block": "Coal Honeycomb Block", "item.resourcefulbees.coal_honeycomb": "Coal Honeycomb", "item.resourcefulbees.coal_bee_spawn_egg": "Coal Bee Spawn Egg", "entity.resourcefulbees.coal_bee": "Coal Bee", + "block.resourcefulbees.obsidian_honeycomb_block": "Obsidian Honeycomb Block", "item.resourcefulbees.obsidian_honeycomb": "Obsidian Honeycomb", "item.resourcefulbees.obsidian_bee_spawn_egg": "Obsidian Bee Spawn Egg", "entity.resourcefulbees.obsidian_bee": "Obsidian Bee", + "block.resourcefulbees.redstone_honeycomb_block": "Redstone Honeycomb Block", "item.resourcefulbees.redstone_honeycomb": "Redstone Honeycomb", "item.resourcefulbees.redstone_bee_spawn_egg": "Redstone Bee Spawn Egg", "entity.resourcefulbees.redstone_bee": "Redstone Bee", + "block.resourcefulbees.uraninite_honeycomb_block": "Uraninite Honeycomb Block", "item.resourcefulbees.uraninite_honeycomb": "Uraninite Honeycomb", "item.resourcefulbees.uraninite_bee_spawn_egg": "Uraninite Bee Spawn Egg", "entity.resourcefulbees.uraninite_bee": "Uraninite Bee", + "block.resourcefulbees.glowing_honeycomb_block": "Glowing Honeycomb Block", "item.resourcefulbees.glowing_honeycomb": "Glowing Honeycomb", "item.resourcefulbees.glowing_bee_spawn_egg": "Glowing Bee Spawn Egg", "entity.resourcefulbees.glowing_bee": "Glowing Bee", + "block.resourcefulbees.leafy_honeycomb_block": "Leafy Honeycomb Block", "item.resourcefulbees.leafy_honeycomb": "Leafy Honeycomb", "item.resourcefulbees.leafy_bee_spawn_egg": "Leafy Bee Spawn Egg", "entity.resourcefulbees.leafy_bee": "Leafy Bee", + "block.resourcefulbees.lumber_honeycomb_block": "Lumber Honeycomb Block", "item.resourcefulbees.lumber_honeycomb": "Lumber Honeycomb", "item.resourcefulbees.lumber_bee_spawn_egg": "Lumber Bee Spawn Egg", "entity.resourcefulbees.lumber_bee": "Lumber Bee", + "block.resourcefulbees.mana_honeycomb_block": "Mana Honeycomb Block", "item.resourcefulbees.mana_honeycomb": "Mana Honeycomb", "item.resourcefulbees.mana_bee_spawn_egg": "Mana Bee Spawn Egg", "entity.resourcefulbees.mana_bee": "Mana Bee", + "block.resourcefulbees.mason_honeycomb_block": "Mason Honeycomb Block", "item.resourcefulbees.mason_honeycomb": "Mason Honeycomb", "item.resourcefulbees.mason_bee_spawn_egg": "Mason Bee Spawn Egg", "entity.resourcefulbees.mason_bee": "Mason Bee", + "block.resourcefulbees.miner_honeycomb_block": "Miner Honeycomb Block", "item.resourcefulbees.miner_honeycomb": "Miner Honeycomb", "item.resourcefulbees.miner_bee_spawn_egg": "Miner Bee Spawn Egg", "entity.resourcefulbees.miner_bee": "Miner Bee", + "block.resourcefulbees.rgbee_honeycomb_block": "RGBee Honeycomb Block", "item.resourcefulbees.rgbee_honeycomb": "RGBee Honeycomb", "item.resourcefulbees.rgbee_bee_spawn_egg": "RGBee Spawn Egg", "entity.resourcefulbees.rgbee_bee": "RGBee", + "block.resourcefulbees.stoned_honeycomb_block": "Stoned Honeycomb Block", "item.resourcefulbees.stoned_honeycomb": "Stoned Honeycomb", "item.resourcefulbees.stoned_bee_spawn_egg": "Stoned Bee Spawn Egg", @@ -135,122 +167,152 @@ "item.resourcefulbees.sandy_honeycomb": "Sandy Honeycomb", "item.resourcefulbees.sandy_bee_spawn_egg": "Sandy Bee Spawn Egg", "entity.resourcefulbees.sandy_bee": "Sandy Bee", + "block.resourcefulbees.blazing_honeycomb_block": "Blazing Honeycomb Block", "item.resourcefulbees.blazing_honeycomb": "Blazing Honeycomb", "item.resourcefulbees.blazing_bee_spawn_egg": "Blazing Bee Spawn Egg", "entity.resourcefulbees.blazing_bee": "Blazing Bee", + "block.resourcefulbees.dragonic_honeycomb_block": "Dragonic Honeycomb Block", "item.resourcefulbees.dragonic_honeycomb": "Dragonic Honeycomb", "item.resourcefulbees.dragonic_bee_spawn_egg": "Dragonic Bee Spawn Egg", "entity.resourcefulbees.dragonic_bee": "Dragonic Bee", + "block.resourcefulbees.ghost_honeycomb_block": "Ghost Honeycomb Block", "item.resourcefulbees.ghost_honeycomb": "Ghost Honeycomb", "item.resourcefulbees.ghost_bee_spawn_egg": "Ghost Bee Spawn Egg", "entity.resourcefulbees.ghost_bee": "Ghost Bee", + "block.resourcefulbees.wither_honeycomb_block": "Wither Honeycomb Block", "item.resourcefulbees.wither_honeycomb": "Wither Honeycomb", "item.resourcefulbees.wither_bee_spawn_egg": "Wither Bee Spawn Egg", "entity.resourcefulbees.wither_bee": "Wither Bee", + "block.resourcefulbees.withered_honeycomb_block": "Withered Honeycomb Block", "item.resourcefulbees.withered_honeycomb": "Withered Honeycomb", "item.resourcefulbees.withered_bee_spawn_egg": "Withered Bee Spawn Egg", "entity.resourcefulbees.withered_bee": "Withered Bee", + "block.resourcefulbees.beeper_honeycomb_block": "Beeper Honeycomb Block", "item.resourcefulbees.beeper_honeycomb": "Beeper Honeycomb", "item.resourcefulbees.beeper_bee_spawn_egg": "Beeper Spawn Egg", "entity.resourcefulbees.beeper_bee": "Beeper", + "block.resourcefulbees.ender_honeycomb_block": "Ender Honeycomb Block", "item.resourcefulbees.ender_honeycomb": "Ender Honeycomb", "item.resourcefulbees.ender_bee_spawn_egg": "Ender Bee Spawn Egg", "entity.resourcefulbees.ender_bee": "Ender Bee", + "block.resourcefulbees.guardian_honeycomb_block": "Guardian Honeycomb Block", "item.resourcefulbees.guardian_honeycomb": "Guardian Honeycomb", "item.resourcefulbees.guardian_bee_spawn_egg": "Guardian Bee Spawn Egg", "entity.resourcefulbees.guardian_bee": "Guardian Bee", + "block.resourcefulbees.magma_honeycomb_block": "Magma Honeycomb Block", "item.resourcefulbees.magma_honeycomb": "Magma Honeycomb", "item.resourcefulbees.magma_bee_spawn_egg": "Magma Bee Spawn Egg", "entity.resourcefulbees.magma_bee": "Magma Bee", + "block.resourcefulbees.spooky_honeycomb_block": "Spooky Honeycomb Block", "item.resourcefulbees.spooky_honeycomb": "Spooky Honeycomb", "item.resourcefulbees.spooky_bee_spawn_egg": "Spooky Bee Spawn Egg", "entity.resourcefulbees.spooky_bee": "Spooky Bee", + "block.resourcefulbees.slimy_honeycomb_block": "Slimy Honeycomb Block", "item.resourcefulbees.slimy_honeycomb": "Slimy Honeycomb", "item.resourcefulbees.slimy_bee_spawn_egg": "Slimy Bee Spawn Egg", "entity.resourcefulbees.slimy_bee": "Slimy Bee", + "block.resourcefulbees.zombee_honeycomb_block": "Zombee Honeycomb Block", "item.resourcefulbees.zombee_honeycomb": "Zombee Honeycomb", "item.resourcefulbees.zombee_bee_spawn_egg": "Zombee Spawn Egg", - "entity.resourcefulbees.zombee_bee": "Zombee", + "entity.resourcefulbees.zombee_bee": "ZomBee", + "block.resourcefulbees.water_honeycomb_block": "Water Honeycomb Block", "item.resourcefulbees.water_honeycomb": "Water Honeycomb", "item.resourcefulbees.water_bee_spawn_egg": "Water Bee Spawn Egg", "entity.resourcefulbees.water_bee": "Water Bee", + "block.resourcefulbees.lava_honeycomb_block": "Lava Honeycomb Block", "item.resourcefulbees.lava_honeycomb": "Lava Honeycomb", "item.resourcefulbees.lava_bee_spawn_egg": "Lava Bee Spawn Egg", "entity.resourcefulbees.lava_bee": "Lava Bee", + "block.resourcefulbees.certus_honeycomb_block": "Certus Honeycomb Block", "item.resourcefulbees.certus_honeycomb": "Certus Honeycomb", "item.resourcefulbees.certus_bee_spawn_egg": "Certus Bee Spawn Egg", "entity.resourcefulbees.certus_bee": "Certus Bee", + "block.resourcefulbees.spider_honeycomb_block": "Spider Honeycomb Block", "item.resourcefulbees.spider_honeycomb": "Spider Honeycomb", "item.resourcefulbees.spider_bee_spawn_egg": "Spider Bee Spawn Egg", "entity.resourcefulbees.spider_bee": "Spider Bee", + "block.resourcefulbees.fluorite_honeycomb_block": "Fluorite Honeycomb Block", "item.resourcefulbees.fluorite_honeycomb": "Fluorite Honeycomb", "item.resourcefulbees.fluorite_bee_spawn_egg": "Fluorite Bee Spawn Egg", "entity.resourcefulbees.fluorite_bee": "Fluorite Bee", + "block.resourcefulbees.aquamarine_honeycomb_block": "Aquamarine Honeycomb Block", "item.resourcefulbees.aquamarine_honeycomb": "Aquamarine Honeycomb", "item.resourcefulbees.aquamarine_bee_spawn_egg": "Aquamarine Bee Spawn Egg", "entity.resourcefulbees.aquamarine_bee": "Aquamarine Bee", + "block.resourcefulbees.cobbee_honeycomb_block": "Cobbee Honeycomb Block", "item.resourcefulbees.cobbee_honeycomb": "Cobbee Honeycomb", "item.resourcefulbees.cobbee_bee_spawn_egg": "Cobbee Spawn Egg", - "entity.resourcefulbees.cobbee_bee": "Cobbee", + "entity.resourcefulbees.cobbee_bee": "CobBee", + "block.resourcefulbees.icey_honeycomb_block": "Icey Honeycomb Block", "item.resourcefulbees.icey_honeycomb": "Icey Honeycomb", "item.resourcefulbees.icey_bee_spawn_egg": "Icey Spawn Egg", "entity.resourcefulbees.icey_bee": "Icey Bee", + "block.resourcefulbees.gravely_honeycomb_block": "Gravely Honeycomb Block", "item.resourcefulbees.gravely_honeycomb": "Gravely Honeycomb", "item.resourcefulbees.gravely_bee_spawn_egg": "Gravely Spawn Egg", "entity.resourcefulbees.gravely_bee": "Gravely Bee", + "block.resourcefulbees.soul_lava_honeycomb_block": "Soul Lava Honeycomb Block", "item.resourcefulbees.soul_lava_honeycomb": "Soul Lava Honeycomb", "item.resourcefulbees.soul_lava_bee_spawn_egg": "Soul Lava Bee Spawn Egg", "entity.resourcefulbees.soul_lava_bee": "Soul Lava Bee", + "block.resourcefulbees.mystical_honeycomb_block": "Mystical Honeycomb Block", "item.resourcefulbees.mystical_honeycomb": "Mystical Honeycomb", "item.resourcefulbees.mystical_bee_spawn_egg": "Mystical Spawn Egg", "entity.resourcefulbees.mystical_bee": "Mystical Bee", - "block.resourcefulbees.cropy_honeycomb_block": "Cropy Honeycomb Block", - "item.resourcefulbees.cropy_honeycomb": "Cropy Honeycomb", - "item.resourcefulbees.cropy_bee_spawn_egg": "Cropy Spawn Egg", - "entity.resourcefulbees.cropy_bee": "Cropy Bee", + + "block.resourcefulbees.cropy_honeycomb_block": "Croppy Honeycomb Block", + "item.resourcefulbees.cropy_honeycomb": "Croppy Honeycomb", + "item.resourcefulbees.cropy_bee_spawn_egg": "Croppy Spawn Egg", + "entity.resourcefulbees.cropy_bee": "Croppy Bee", + "block.resourcefulbees.salt_baee_honeycomb_block": "Salt Baee Honeycomb Block", "item.resourcefulbees.salt_baee_honeycomb": "Salt Baee Honeycomb", "item.resourcefulbees.salt_baee_bee_spawn_egg": "Salt Baee Spawn Egg", "entity.resourcefulbees.salt_baee_bee": "Salt Baee", + "block.resourcefulbees.cobalt_honeycomb_block": "Cobalt Honeycomb Block", "item.resourcefulbees.cobalt_honeycomb": "Cobalt Honeycomb", "item.resourcefulbees.cobalt_bee_spawn_egg": "Cobalt Spawn Egg", "entity.resourcefulbees.cobalt_bee": "Cobalt Bee", + "block.resourcefulbees.kobee_beef_honeycomb_block": "KoBee Beef Honeycomb Block", "item.resourcefulbees.kobee_beef_honeycomb": "KoBee Beef Honeycomb", "item.resourcefulbees.kobee_beef_bee_spawn_egg": "KoBee Beef Spawn Egg", "entity.resourcefulbees.kobee_beef_bee": "KoBee Beef", + "block.resourcefulbees.stan_honeycomb_block": "Stan Bee Honeycomb Block", "item.resourcefulbees.stan_honeycomb": "Stan Bee Honeycomb", "item.resourcefulbees.stan_bee_spawn_egg": "Stan Bee Spawn Egg", "entity.resourcefulbees.stan_bee": "Stan Bee", + "block.resourcefulbees.dirty_honeycomb_block": "Dirty Honeycomb Block", "item.resourcefulbees.dirty_honeycomb": "Dirty Honeycomb", "item.resourcefulbees.dirty_bee_spawn_egg": "Dirty Bee Spawn Egg", "entity.resourcefulbees.dirty_bee": "Dirty Bee", + "block.resourcefulbees.starry_honeycomb_block": "Starry Honeycomb Block", "item.resourcefulbees.starry_honeycomb": "Starry Honeycomb", "item.resourcefulbees.starry_bee_spawn_egg": "Starry Bee Spawn Egg", @@ -259,6 +321,7 @@ "item.resourcefulbees.starry_honey_fluid_bucket": "Starry Honey Bucket", "block.resourcefulbees.starry_honey_block": "Starry Honey Block", "fluid.resourcefulbees.starry_honey": "Starry Honey", + "block.resourcefulbees.papa_beemeritus_honeycomb_block": "Papa Beemeritus Honeycomb Block", "item.resourcefulbees.papa_beemeritus_honeycomb": "Papa Beemeritus Honeycomb", "item.resourcefulbees.papa_beemeritus_bee_spawn_egg": "Papa Beemeritus Spawn Egg", @@ -273,7 +336,7 @@ "item.resourcefulbees.awakened_honeycomb": "Awakened Honeycomb", "item.resourcefulbees.awakened_bee_spawn_egg": "Awakened Bee Spawn Egg", "entity.resourcefulbees.awakened_bee": "Awakened Bee", - + "block.resourcefulbees.chaotic_honeycomb_block": "Chaotic Honeycomb Block", "item.resourcefulbees.chaotic_honeycomb": "Chaotic Honeycomb", "item.resourcefulbees.chaotic_bee_spawn_egg": "Chaotic Bee Spawn Egg", From 43aa35d3bb5fe2ecfbfcd9668194316f29357c0e Mon Sep 17 00:00:00 2001 From: Lady Lexxie Date: Tue, 14 Sep 2021 09:07:19 +0100 Subject: [PATCH 26/33] Ghastly Bee --- .../bees/bred/bees_mob/Ghastly.json | 63 ++++++++++++++++++ .../assets/resourcefulbees/lang/en_us.json | 8 +-- .../textures/entity/misc/ghost_bee.png | Bin 0 -> 762 bytes .../textures/entity/misc/ghost_bee_angry.png | Bin 0 -> 808 bytes 4 files changed, 67 insertions(+), 4 deletions(-) create mode 100644 config/resourcefulbees/bees/bred/bees_mob/Ghastly.json create mode 100644 config/resourcefulbees/resources/assets/resourcefulbees/textures/entity/misc/ghost_bee.png create mode 100644 config/resourcefulbees/resources/assets/resourcefulbees/textures/entity/misc/ghost_bee_angry.png diff --git a/config/resourcefulbees/bees/bred/bees_mob/Ghastly.json b/config/resourcefulbees/bees/bred/bees_mob/Ghastly.json new file mode 100644 index 00000000..a8091940 --- /dev/null +++ b/config/resourcefulbees/bees/bred/bees_mob/Ghastly.json @@ -0,0 +1,63 @@ +{ + "flower": "tag:misctags:flowers/nether_flowers", + "maxTimeInHive": 2400, + "traits": ["nether"], + "hasHoneycomb": true, + "baseLayerTexture": "misc/ghost_bee", + "ColorData": { + "primaryColor": "#B7C7C7", + "secondaryColor": "#B7C7C7", + "honeycombColor": "#B7C7C7", + "primaryLayerTexture": "empty_layer", + "secondaryLayerTexture": "empty_layer", + "emissiveLayerTexture": "empty_layer", + "isBeeColored": false, + "isRainbowBee": false, + "isGlowing": false, + "glowColor": "#B7C7C7", + "isEnchanted": false, + "glowingPulse": 0, + "modelType": "DEFAULT" + }, + "CombatData": { + "isPassive": true, + "removeStingerOnAttack": true, + "inflictsPoison": true, + "attackDamage": 1 + }, + "MutationData": { + "hasMutation": false + }, + "CentrifugeData": { + "hasCentrifugeOutput": true, + "mainInputCount": 1, + "mainOutput": "minecraft:ghast_tear", + "mainOutputWeight": 0.50, + "mainOutputCount": 1, + "secondaryOutput": "minecraft:gunpowder", + "secondaryOutputWeight": 0.10, + "secondaryOutputCount": 2, + "bottleOutput": "minecraft:honey_bottle", + "bottleOutputWeight": 0.25, + "bottleOutputCount": 1, + "recipeTime": 200, + "hasFluidOutput": false + }, + "SpawnData": { + "canSpawnInWorld": false + }, + "BreedData": { + "isBreedable": true, + "parent1": "Creeper", + "parent2": "Magma", + "breedWeight": 10, + "breedChance": 0.60, + "feedItem": "xreliquary:catalyzing_gland", + "feedAmount": 5, + "childGrowthDelay": -24000, + "breedDelay": 6000 + }, + "TraitData": { + "hasTraits": true + } +} \ No newline at end of file diff --git a/config/resourcefulbees/resources/assets/resourcefulbees/lang/en_us.json b/config/resourcefulbees/resources/assets/resourcefulbees/lang/en_us.json index 710e87e0..6604a178 100644 --- a/config/resourcefulbees/resources/assets/resourcefulbees/lang/en_us.json +++ b/config/resourcefulbees/resources/assets/resourcefulbees/lang/en_us.json @@ -178,10 +178,10 @@ "item.resourcefulbees.dragonic_bee_spawn_egg": "Dragonic Bee Spawn Egg", "entity.resourcefulbees.dragonic_bee": "Dragonic Bee", - "block.resourcefulbees.ghost_honeycomb_block": "Ghost Honeycomb Block", - "item.resourcefulbees.ghost_honeycomb": "Ghost Honeycomb", - "item.resourcefulbees.ghost_bee_spawn_egg": "Ghost Bee Spawn Egg", - "entity.resourcefulbees.ghost_bee": "Ghost Bee", + "block.resourcefulbees.ghastly_honeycomb_block": "Ghastly Honeycomb Block", + "item.resourcefulbees.ghastly_honeycomb": "Ghastly Honeycomb", + "item.resourcefulbees.ghastly_bee_spawn_egg": "Ghastly Bee Spawn Egg", + "entity.resourcefulbees.ghastly_bee": "Ghastly Bee", "block.resourcefulbees.wither_honeycomb_block": "Wither Honeycomb Block", "item.resourcefulbees.wither_honeycomb": "Wither Honeycomb", diff --git a/config/resourcefulbees/resources/assets/resourcefulbees/textures/entity/misc/ghost_bee.png b/config/resourcefulbees/resources/assets/resourcefulbees/textures/entity/misc/ghost_bee.png new file mode 100644 index 0000000000000000000000000000000000000000..20f1d1f4226d92322f78e2db260897c473100157 GIT binary patch literal 762 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sEXgD|57Yp@Cf15>}Ji(^Pd+}r8<{iGcQ+QpZgFxw~)B;q01 z$+mF9a*p#U+t;B6S7L{f;-iFU%{eu%e@7nv^@n{)L7(mXl3TNH z?%q3h=G~n)dp9UFA58f1_nBJA_U*>L9Cv^J{!o^$KiTQU*Q%R$JG_<(c`dzk=)OkN z*)?;ykMaKc>m$|JGw=27uca2YmYiqPjJMh6<*UmuO@IE}`L@{E7Us6Y&(FU8d^7UL zrM&jj-Q72oo_~Dz;6Y%tNiutaMfl#h`f2PbHYYeWU24Xid{bW`jFY^S6t}g|A-t|AWB$LKePCuDPpMzsYma5u5Tc3PgDX{8l*2lk* zp4&Lg40@E@E-u-%_`t@CQv)Y#XUeg^5Uw@-c&PHH-+%u)sLt$LTi6w)X~>@8ByoPp zTbAG}=I9@be5=^2vL%=M$5QTh58wI4{}ZPq`ZHeOXU^S@D^5*2gYcD!87${ZCUzqGh8&{u~?j zj@0$y*MvpwSD(4EnL$ImWBuE2r>s+$B-d^}aI5j*YMGxiqZy`b4OV|qu=!KO;hpM+ m>v})-J+{D&{v2=lz@ApMEQo!LjxaF2GI+ZBxvXPx#1ZP1_K>z@;j|==^1poj532;bRa{vGizW@LZzX3P}QzQTY0=-E@K~#8N?U&t3 zTR{-V$3XL8g9((X7X_iH)ILS?4h0`1xyo&>^B`XM4E6z}msO%ID7}c5LSj?%(TgZWmiaM+#wIA>;dXLrt;EJ(lKAO5(xk^IJnZ4v3*-O1~%Eh~w1yIorw zlgs5KlgTXnjS!@4ITsk$@Aa%S1~S_5e80MqOgUgU ze4JjNPEO=Yqao*KXQqT4$M){-L>ZdM0Wcg-rBZp62WUK?6MV4h#bVKf1j=RD1(5?_ zIG%dFo*1*)^>z8(=~!tJ8c%!~_^ZAQyC8A^40nx>3x${Yy!7txO&yMaLmoo&^3vAE z_;Lsm4?*k(hK0+Y(a8^fHJipEJt0;g`?oSR@@8jX2c>u?=jqwgJ&v%sT*f{3(|4UL(-dB_{%JyotYRb>o*HRjt z?udJokOBKSp7UMD@;iAa{(&z)H4|q5fTB1Q0S)1bg138nwkGoJ;= Date: Tue, 14 Sep 2021 09:42:47 +0100 Subject: [PATCH 27/33] Config Tidying --- config/ProjectRed.cfg | 1 - config/adchimneys-client.toml | 43 --- config/advancedperipherals-common.toml | 4 - config/allthetweaks-common.toml | 13 - config/cyclic.toml | 1 - config/dynview-common.toml | 11 - config/fluxnetworks-common.toml | 1 - config/iceandfire-common.toml | 2 - config/jeresources-common.toml | 31 -- config/packmenu.cfg | 110 ------ config/theoneprobe-client.toml | 1 - config/tombstone-server.toml | 2 - config/woot-common.toml | 1 - config/xreliquary-common.toml | 486 ------------------------- 14 files changed, 707 deletions(-) diff --git a/config/ProjectRed.cfg b/config/ProjectRed.cfg index c992e3ce..9438a84e 100644 --- a/config/ProjectRed.cfg +++ b/config/ProjectRed.cfg @@ -1,7 +1,6 @@ "General Settings" { B:"Unbreakable Screwdriver"=true } - "Machine Settings" { B:"Enable the Diamond Block Breaker"=true } diff --git a/config/adchimneys-client.toml b/config/adchimneys-client.toml index 6915d8b1..24a39995 100644 --- a/config/adchimneys-client.toml +++ b/config/adchimneys-client.toml @@ -1,46 +1,3 @@ - [Smoke] - #Affects probability of coloring smoke by chimneys - #Range: 0.0 ~ 1.0 - coloringFactor = 0.10000000149011612 - #Maximum smoke particles that can be rendered at scene. - #If exceeded, smoke amount will be reduced proportionally for each rendered chimney - #Range: 0 ~ 2000 - maxRenderedParticlesAmount = 800 - #If true, smoke particles will collide with obstacles - canCollide = true - #If true, all emitters will produce smoke even without connected chimneys emitWithoutChimney = false - #Use retro smoke particles instead of modern ones - retroSmokeParticles = false - #Completely disables vanilla cozy smoke particles from a campfire - disableVanillaCampfireSmoke = false - #Whether or not to colorize smoke particles - colorize = true - -[MaterialGroups] - - [MaterialGroups.Brick] - #Whether to display this group of blocks or not - enabled = true - - [MaterialGroups.Cobblestone] - #Whether to display this group of blocks or not - enabled = true - - [MaterialGroups.Concrete] - #Whether to display this group of blocks or not - enabled = true - - [MaterialGroups.Glass] - #Whether to display this group of blocks or not - enabled = true - - [MaterialGroups.Terracotta] - #Whether to display this group of blocks or not - enabled = true - - [MaterialGroups.Other] - #Whether to display this group of blocks or not - enabled = true diff --git a/config/advancedperipherals-common.toml b/config/advancedperipherals-common.toml index e46abd7d..e5f92adb 100644 --- a/config/advancedperipherals-common.toml +++ b/config/advancedperipherals-common.toml @@ -1,10 +1,6 @@ [Features] - #Enable the Chunky Turtle or not. enableChunkyTurtle = false - [world] - #Enable the villager structures for the computer scientist. enableVillagerStructures = false - #Gives the ap documentation to new players on a world. givePlayerBookOnJoin = false diff --git a/config/allthetweaks-common.toml b/config/allthetweaks-common.toml index 5987ea26..17386caa 100644 --- a/config/allthetweaks-common.toml +++ b/config/allthetweaks-common.toml @@ -1,25 +1,12 @@ - [packmode] #ATM = 0 SLOP = 1 SKY = 2 MAGIC = 3 EXPERT = 4 - #Range: 0 ~ 4 enable = 0 - [discord] - #Enable Discord Rich Prescence discord = true - [packversionmaj] - #Pack Release Version Format : X - #Range: 0 ~ 32768 major = 1 - [packversionmin] - #Pack Minor Version : X - #Range: 0 ~ 32768 minor = 8 - [packversionminrev] - #Pack Minor Version Revision : X - #Range: 0 ~ 32768 minorrev = 3 diff --git a/config/cyclic.toml b/config/cyclic.toml index 47e0f799..beadbb51 100644 --- a/config/cyclic.toml +++ b/config/cyclic.toml @@ -1,6 +1,5 @@ [cyclic] [cyclic.enchantment] - #Beheading enchant add player skin head drop, add any mob id and any skin beheadingEntityMHF = [] magnet = false \ No newline at end of file diff --git a/config/dynview-common.toml b/config/dynview-common.toml index b6a3502e..1f9aad5e 100644 --- a/config/dynview-common.toml +++ b/config/dynview-common.toml @@ -1,19 +1,8 @@ ["Dynamic Chunk View Distance Settings"] - #The minimum chunk view distance allowed to use. Default: 4 - #Range: 3 ~ 200 - minChunkViewDist = 4 - #The maximum chunk view distance allowed to use. Set to the max a player could benefit from. Default: 20 - #Range: 1 ~ 200 maxChunkViewDist = 10 - #The average tick time to stabilize the chunk view distance around. Setting it higher than 50ms is not advised, as after 50ms the TPS will go below 20. Default: 45ms - #Range: 10 ~ 100 meanAvgTickTime = 43 - #The update frequency of average server tick time checks to update view distances. Default: 30sec - #Range: 1 ~ 1000 viewDistanceUpdateRate = 120 - #Whether to output log messages for actions done. This can be helpful to balance the other settings nicely. logMessages = true - ["Chunk slow unload settings"] chunkunload = true diff --git a/config/fluxnetworks-common.toml b/config/fluxnetworks-common.toml index bd970f60..89e9f969 100644 --- a/config/fluxnetworks-common.toml +++ b/config/fluxnetworks-common.toml @@ -1,6 +1,5 @@ [networks] maximumPerPlayer = -1 - [general] enableChunkLoading = false \ No newline at end of file diff --git a/config/iceandfire-common.toml b/config/iceandfire-common.toml index d94c2966..76561f3e 100644 --- a/config/iceandfire-common.toml +++ b/config/iceandfire-common.toml @@ -16,14 +16,12 @@ "Dangerous World Gen Dist Seperation" = 128 "Mausoleum Gen Chance" = 800 [Dragons] - "Max Dragon Flight Height" = 250 [Dragons.Griefing] blacklistedBreakBlocks = ["minecraft:obsidian", "minecraft:bedrock", "minecraft:ancient_debris", "minecraft:barrier", "cyclic:unbreakable_block", "cyclic:unbreakable_reactive", "metalbarrels:obsidian_barrel", "ironfurnaces:million_furnace", "powah:energy_cell_creative", "mekanism:creative_energy_cube", "ctiers:centrifuge_controller_tier_creative", "ctiers:centrifuge_casing_tier_creative", "refinedstorage:creative_controller", "creativewirelesstransmitter:creative_wireless_transmitter", "creativecrafter:creative_crafter", "creativeapiary:tcreative_apiary", "compactmachines:solid_wall"] "Dragon Griefing" = 1 "Tamed Dragon Griefing" = false noDropBreakBlocks = ["minecraft:stone", "minecraft:dirt", "minecraft:grass_block", "minecraft:netherrack"] - [Dragons.Attributes] "Dragon Attack Damage(Lightning breath)" = 33.5 "Dragon Health" = 32768.0 diff --git a/config/jeresources-common.toml b/config/jeresources-common.toml index 997a7db4..9712d85e 100644 --- a/config/jeresources-common.toml +++ b/config/jeresources-common.toml @@ -1,34 +1,3 @@ -#Range: 1 ~ 4 -itemsPerColumn = 4 -#Range: 1 ~ 4 -itemsPerRow = 4 -diyData = true -showDevData = false enchantsBlacklist = ["flimflam","soulBound","reactive"] -hiddenTabs = [ - "minecolonies:baker/crafting", - "minecolonies:blacksmith/crafting", - "minecolonies:composting", - "minecolonies:concretemixer/custom", - "minecolonies:cook/smelting", - "minecolonies:cookassistant/crafting", - "minecolonies:crusher/custom", - "minecolonies:dyer/crafting", - "minecolonies:dyer/smelting", - "minecolonies:enchanter/custom", - "minecolonies:farmer/crafting", - "minecolonies:fletcher/crafting", - "minecolonies:glassblower/crafting", - "minecolonies:glassblower/smelting", - "minecolonies:lumberjack/custom", - "minecolonies:mechanic/crafting", - "minecolonies:planter/crafting", - "minecolonies:sawmill/crafting", - "minecolonies:sifter/custom", - "minecolonies:smelter/smelting", - "minecolonies:stonemason/crafting", - "minecolonies:stonesmeltery/smelting" -] -dimensionsBlacklist = [-11] disableLootManagerReloading = true diff --git a/config/packmenu.cfg b/config/packmenu.cfg index 612d63fd..788b0e58 100644 --- a/config/packmenu.cfg +++ b/config/packmenu.cfg @@ -1,126 +1,16 @@ -# Configuration file - -"forge info" { - # The anchor point for this element. [default: FORGE] - S:"Anchor Point"=FORGE - - # The X offset for this element. [range: -1000 ~ 1000, default: 0] - I:"X Offset"=0 - - # The Y Offset for this element. [range: -1000 ~ 1000, default: 0] - I:"Y Offset"=0 -} - - general { - # If forge information is drawn at the top center. This includes beta and update warnings. [default: true] B:"Draw Forge Info"=false - - # If the "Java Edition" text is drawn. [default: true] B:"Draw Java Edition"=false - - # If the vanilla panorama, and it's fade-in, are rendered. Enabling this disables the use of the custom background options. [default: false] - B:"Draw Panorama"=false - - # If the splash text is drawn. [default: true] B:"Draw Splash"=false - - # If the title (the giant minecraft text) is drawn. [default: true] B:"Draw Title"=false - - # If the resource pack is loaded from /resources instead of /resources.zip [default: true] B:"Folder Pack"=false - - # If the Panorama has a fade-in effect. [default: false] - B:"Panorama Fade In"=false - - # A multiplier on panorama speed. [range: 0.01 ~ 100.0, default: 1.0] - S:"Panorama Speed"=1.0 - - # The number of variations of panorama that exist. Panorama files other than the original set must have the form panorama_.png. For example the first file of varation #2 would be panorama1_0.png [range: 1 ~ 10, default: 1] - I:"Panorama Variations"=1 } - - -"java edition text" { - # The anchor point for this element. [default: JAVAED] - S:"Anchor Point"=JAVAED - - # The X offset for this element. [range: -1000 ~ 1000, default: 0] - I:"X Offset"=0 - - # The Y Offset for this element. [range: -1000 ~ 1000, default: 0] - I:"Y Offset"=0 -} - - logo { - # The anchor point of the logo. The types of anchor points are available on the wiki. [default: DEFAULT_LOGO] S:"Anchor Point"=TOP_LEFT - - # The height of the logo. [range: 0 ~ 500000, default: 100] I:Height=160 - - # The height of the logo's texture. [range: 0 ~ 500000, default: 300] I:"Texture Height"=500 - - # The location of the logo texture. Must be a png file. Should contain the extension. [default: packmenu:textures/gui/logo.png] S:"Texture Path"=atm:textures/logosmall.png - - # The width of the logo's texture. [range: 0 ~ 500000, default: 300] I:"Texture Width"=500 - - # The width of the logo. [range: 0 ~ 500000, default: 100] I:Width=160 - - # The X offset of the logo. [range: -500000 ~ 500000, default: -650] - I:"X Offset"=0 - - # The Y offset of the logo. [range: -500000 ~ 500000, default: 0] - I:"Y Offset"=0 -} - - -slideshow { - # How long between slideshow transitions. [range: 1 ~ 1000000, default: 200] - I:Duration=200 - - # The list of textures to be displayed on the slideshow. If empty, the slideshow is ignored. [default: ] - S:Textures < - > - - # How long the slideshow transition lasts. [range: 1 ~ 1000000, default: 20] - I:"Transition Duration"=20 -} - - -"splash text" { - # The anchor point for this element. [default: SPLASH] - S:"Anchor Point"=SPLASH - - # The color of the splash text. [range: -2147483647 ~ 2147483647, default: -256] - I:Color=-256 - - # The rotation value of the splash text. [range: -360.0 ~ 360.0, default: -20.0] - S:Rotation=-20.0 - - # The X offset for this element. [range: -1000 ~ 1000, default: 0] - I:"X Offset"=0 - - # The Y Offset for this element. [range: -1000 ~ 1000, default: 0] - I:"Y Offset"=0 -} - - -title { - # The anchor point for this element. [default: TITLE] - S:"Anchor Point"=TITLE - - # The X offset for this element. [range: -1000 ~ 1000, default: 0] I:"X Offset"=0 - - # The Y Offset for this element. [range: -1000 ~ 1000, default: 0] - I:"Y Offset"=0 } - - diff --git a/config/theoneprobe-client.toml b/config/theoneprobe-client.toml index 2c4b301a..b59a39c3 100644 --- a/config/theoneprobe-client.toml +++ b/config/theoneprobe-client.toml @@ -10,5 +10,4 @@ boxThickness = 0 InfoImportant = "blue" Label = "gray" Error = "red,bold" - #Text style. Use a comma delimited list with colors like: 'red', 'green', 'blue', ... or style codes like 'underline', 'bold', 'italic', 'strikethrough', ..." Obsolete = "gray,strikethrough" \ No newline at end of file diff --git a/config/tombstone-server.toml b/config/tombstone-server.toml index dcb4affc..4f04b9b1 100644 --- a/config/tombstone-server.toml +++ b/config/tombstone-server.toml @@ -1,7 +1,5 @@ -#Allows to customize or disable the enchantments [enchantments] enable_enchantment_soulbound = false - [player_death] xp_loss = 0 [decorative_grave] diff --git a/config/woot-common.toml b/config/woot-common.toml index 09ec23c9..d44543cc 100644 --- a/config/woot-common.toml +++ b/config/woot-common.toml @@ -11,4 +11,3 @@ mass3 = ["minecraft:ender_dragon,4", "minecraft:wither,4", "botania:doppleganger,4"] [policy.blacklist] captureMod = [] - diff --git a/config/xreliquary-common.toml b/config/xreliquary-common.toml index 6a534357..de9c6109 100644 --- a/config/xreliquary-common.toml +++ b/config/xreliquary-common.toml @@ -1,494 +1,8 @@ [disable] alkahestryTome = true -[potions] - #Whether potions augmented with Redstone and Glowstone appear in creative tabs / JEI - differentDurations = false - #Whether potions that are made out of three base ingredients appear in creative tabs / JEI - threeIngredients = false - #Map of POTION ingredients and their effects - potionMap = ["minecraft:sugar=speed|3|0;haste|3|0", "minecraft:apple=instant_health|0|0;health_boost|3|0;xreliquary:cure|1|0", "minecraft:coal=blindness|1|0;absorption|3|0", "minecraft:coal=invisibility|1|0;wither|0|0", "minecraft:feather=jump_boost|3|0;weakness|1|0", "minecraft:wheat_seeds=instant_damage|0|0;health_boost|3|0", "minecraft:wheat=instant_health|0|0;health_boost|3|0", "minecraft:flint=instant_damage|0|0;strength|3|0", "minecraft:porkchop=slowness|1|0;mining_fatigue|1|0", "minecraft:leather=resistance|3|0;absorption|3|0", "minecraft:clay_ball=slowness|1|0;health_boost|3|0", "minecraft:egg=absorption|3|0;regeneration|0|0", "minecraft:red_dye=instant_health|0|0;health_boost|3|0", "minecraft:yellow_dye=jump_boost|3|0;weakness|1|0", "minecraft:green_dye=resistance|3|0;absorption|3|0", "minecraft:bone_meal=weakness|1|0;mining_fatigue|1|0", "minecraft:pumpkin_seeds=invisibility|1|0;fire_resistance|1|0", "minecraft:beef=slowness|1|0;saturation|0|0", "minecraft:chicken=nausea|1|0;poison|1|0", "minecraft:rotten_flesh=nausea|1|0;hunger|1|0;wither|0|0", "minecraft:gold_nugget=strength|0|0;haste|0|0", "minecraft:carrot=night_vision|3|0;health_boost|3|0", "minecraft:potato=health_boost|3|0;saturation|0|0", "minecraft:cod=saturation|0|0;water_breathing|1|0", "minecraft:spider_eye=night_vision|4|0;poison|2|0", "minecraft:blaze_powder=strength|4|0;instant_damage|0|0", "minecraft:iron_ingot=resistance|4|0;slowness|2|0", "minecraft:string=slowness|2|0;mining_fatigue|2|0", "minecraft:bread=health_boost|4|0;saturation|0|0", "minecraft:cooked_porkchop=mining_fatigue|2|0;saturation|0|0", "minecraft:slime_ball=resistance|4|0;fire_resistance|2|0", "minecraft:cooked_cod=saturation|0|0;water_breathing|2|0", "minecraft:lapis_lazuli=haste|4|0;strength|4|0", "minecraft:ink_sac=blindness|2|0;invisibility|2|0", "minecraft:bone=weakness|2|0;mining_fatigue|2|0", "minecraft:cookie=instant_health|0|0;saturation|0|0", "minecraft:melon=instant_health|0|0;speed|4|0", "minecraft:cooked_beef=resistance|4|0;saturation|0|0", "minecraft:cooked_chicken=jump_boost|4|0;saturation|0|0", "minecraft:baked_potato=saturation|0|0;regeneration|1|0", "minecraft:poisonous_potato=poison|2|0;wither|1|0", "minecraft:quartz=instant_damage|0|0;strength|4|0", "xreliquary:zombie_heart=nausea|2|0;hunger|2|0;wither|1|0", "xreliquary:squid_beak=hunger|2|0;water_breathing|2|0", "minecraft:pumpkin_pie=invisibility|1|0;fire_resistance|1|0;speed|3|0;haste|3|0;absorption|3|0;regeneration|0|0", "minecraft:magma_cream=strength|4|0;instant_damage|0|0;resistance|4|0;fire_resistance|2|0", "minecraft:glistering_melon_slice=strength|3|0;haste|3|0;instant_health|0|0;speed|4|0", "minecraft:ghast_tear=regeneration|3|0;absorption|5|0", "minecraft:fermented_spider_eye=night_vision|4|0;poison|2|0;speed|3|0;haste|3|0", "minecraft:golden_carrot=strength|3|0;haste|3|0;health_boost|3|0;night_vision|3|0", "minecraft:gold_ingot=strength|4|0;haste|4|0;xreliquary:cure|1|0", "xreliquary:rib_bone=weakness|3|0;mining_fatigue|3|0;xreliquary:cure|1|0", "minecraft:ender_pearl=invisibility|5|0;speed|5|0", "minecraft:blaze_rod=strength|8|0;instant_damage|0|0", "minecraft:fire_charge=strength|4|0;instant_damage|0|0;blindness|1|0;absorption|3|0", "xreliquary:catalyzing_gland=regeneration|3|0;health_boost|5|0", "xreliquary:chelicerae=poison|3|0;weakness|3|0", "xreliquary:slime_pearl=resistance|5|0;absorption|5|0", "xreliquary:kraken_shell_fragment=absorption|5|0;water_breathing|5|0", "xreliquary:bat_wing=jump_boost|5|0;weakness|3|0", "minecraft:golden_apple=xreliquary:cure|1|1", "minecraft:golden_apple=xreliquary:cure|1|2", "minecraft:diamond=resistance|6|1;absorption|6|1;fire_resistance|6|0;xreliquary:cure|1|0", "xreliquary:withered_rib=wither|2|1;weakness|3|1;slowness|3|1;mining_fatigue|3|1;xreliquary:cure|1|0", "minecraft:ender_eye=strength|6|1;invisibility|6|0;speed|6|1;instant_damage|0|1", "minecraft:emerald=haste|6|1;speed|6|1;health_boost|6|1;xreliquary:cure|1|1", "minecraft:nether_star=health_boost|24|1;regeneration|24|1;absorption|24|1;xreliquary:cure|1|2", "xreliquary:molten_core=strength|6|1;fire_resistance|6|0;instant_damage|0|1", "xreliquary:eye_of_the_storm=haste|24|1;speed|24|1;jump_boost|24|1;instant_damage|0|1;xreliquary:cure|1|1", "xreliquary:fertile_essence=health_boost|8|1;regeneration|3|1;instant_health|0|1;saturation|0|1;weakness|9|1;mining_fatigue|9|1;xreliquary:cure|1|0", "xreliquary:frozen_core=absorption|6|1;slowness|3|1;mining_fatigue|3|1;instant_damage|0|1;fire_resistance|6|0", "xreliquary:nebulous_heart=night_vision|6|0;invisibility|6|0;instant_damage|0|1;health_boost|6|1;strength|6|1;speed|6|1;haste|6|1", "xreliquary:infernal_claw=instant_damage|0|1;resistance|6|1;fire_resistance|6|0;strength|6|1;saturation|0|1;instant_health|0|1"] - [items] - - #Ender Staff settings - [items.enderStaff] - #Number of ender pearls per use - #Range: 0 ~ 3 - enderPearlCastCost = 1 - #Time it takes to teleport to the wraith node - #Range: 10 ~ 120 - nodeWarpCastTime = 60 - #Number of ender pearls per teleportation to the wraith node - #Range: 0 ~ 3 - enderPearlNodeWarpCost = 1 - #Number of ender pearls that the ender staff can store - #Range: 0 ~ 9999 - enderPearlLimit = 250 - #Number of ender pearls that get added to the staff per one that's consumed from players inventory - #Range: 1 ~ 10 - enderPearlWorth = 1 - - #Pyromancer Staff settings - [items.pyromancerStaff] - #Number of fire charges the staff can hold - #Range: 0 ~ 9999 - fireChargeLimit = 250 - #Number of fire charges used when the staff is fired - #Range: 0 ~ 3 - fireChargeCost = 1 - #Number of fire charges that get added to the staff per one that's consumed from player's inventory - #Range: 1 ~ 3 - fireChargeWorth = 1 - #Number of fire charges added to the staff per one that was shot by ghast and gets absorbed by the staff - #Range: 0 ~ 3 - ghastAbsorbWorth = 1 - #Number of blaze powder added to the staff per one fireball that was shot by blaze and gets absorbed by the staff - #Range: 0 ~ 3 - blazeAbsorbWorth = 1 - #Number of blaze powder that gets added to the staff per one that's consumed from player's inventory - #Range: 1 ~ 3 - blazePowderWorth = 1 - #Number of blaze powder the staff can hold - #Range: 0 ~ 9999 - blazePowderLimit = 250 - #Number of blaze powder used when staff is fired - #Range: 0 ~ 3 - blazePowderCost = 1 - - #Angelic Feather settings - [items.angelicFeather] - #Percent hunger used to heal player per 1 damage that would be taken otherwise. - #Range: 0 ~ 100 - hungerCostPercent = 50 - #Potency of the leaping effect - #Range: 0 ~ 5 - leapingPotency = 1 - - #Harvest Rod settings - [items.harvestRod] - #Radius in which harvest rod breaks crops, bonemeals/plants/hoes blocks - #Range: 0 ~ 5 - aoeRadius = 2 - #Maximum number of units harvest rod can hold per plantable item - #Range: 0 ~ 9999 - maxCapacityPerPlantable = 250 - #Number of bonemeal the rod can hold - #Range: 0 ~ 9999 - boneMealLimit = 250 - #Number of bonemeal consumed per use - #Range: 0 ~ 3 - boneMealCost = 1 - #Number of bonemeal that gets added to the rod per one that's consumed from player's inventory - #Range: 1 ~ 3 - boneMealWorth = 1 - #Ticks in between harvest rod actions when in pedestals - #Range: 1 ~ 20 - pedestalCooldown = 5 - #Number of times that a rod may apply additional luck based bonemeal - #Range: 0 ~ 7 - boneMealLuckRolls = 2 - #Range at which harvest rod will automatically hoe/plant/bonemeal/break crops around pedestals - #Range: 1 ~ 20 - pedestalRange = 4 - #Ticks in between bonemealing/planting/hoeing blocks when player is using one of these AOE actions - #Range: 1 ~ 20 - aoeCooldown = 3 - #Percent chance that a bonemeal will get applied during a luck roll - #Range: 1 ~ 100 - boneMealLuckPercentChance = 33 - - #Rending Gale settings - [items.rendingGale] - #Number of feathers the rending gale can hold - #Range: > 0 - chargeLimit = 30000 - #Number of feathers that get added to the rending gale per one that's consumed from player's inventory - #Range: 1 ~ 250 - chargeFeatherWorth = 100 - #Cost per second of buffing players with flight - #Range: 1 ~ 20 - pedestalCostPerSecond = 5 - #List of projectiles that are banned from being pushed by the Rending Gale - pushableProjectilesBlacklist = [] - #How far a lightning block can be cast - #Range: 5 ~ 15 - blockTargetRange = 12 - #Whether the rending gale can push projectiles - canPushProjectiles = true - #List of entities that are banned from being pushed by the Rending Gale - pushableEntitiesBlacklist = [] - #Number of feathers used when the rending gale is cast in flight mode - #Range: 0 ~ 3 - castChargeCost = 1 - #Range from pedestals at which players will get buffed with flight - #Range: 10 ~ 100 - pedestalFlightRange = 30 - #Number of feathers used to cast a lightning bolt - #Range: 0 ~ 250 - boltChargeCost = 100 - #Radius in which entities can be pushed/pulled - #Range: 1 ~ 20 - pushPullRadius = 10 - - #Ice Magus Rod settings - [items.iceMagusRod] - #Number of snowballs that get added to the rod per one that's consumed from player's inventory - #Range: 1 ~ 3 - snowballWorth = 1 - #The damage that snowballs cause - #Range: 0 ~ 4 - snowballDamage = 2 - #Damage bonus against fire immune mobs - #Range: 0 ~ 4 - snowballDamageBonusFireImmune = 2 - #Number of snowballs the rod can hold - #Range: 0 ~ 9999 - snowballLimit = 250 - #Damage bonus against blaze - #Range: 0 ~ 8 - snowballDamageBonusBlaze = 4 - #Number of snowballs it costs when the rod is used - #Range: 0 ~ 3 - snowballCost = 1 - - #Phoenix Down settings - [items.PhoenixDown] - #Whether to give temporary fire resistance when the player would die. Applies only when the player is being hurt by fire damage. - giveTemporaryFireResistanceIfFireDamageKilledYou = true - #Percent hunger used to heal player per 1 damage that would be taken otherwise - #Range: 0 ~ 50 - hungerCostPercent = 25 - #Whether to give temporary damage resistance when the player would die - giveTemporaryDamageResistance = true - #Percent of life that gets healed when the player would die - #Range: 0 ~ 100 - healPercentageOfMaxLife = 100 - #Potency of the leaping effect - #Range: 0 ~ 5 - leapingPotency = 1 - #Whether the player gets negative statuses removed when they were saved by Phoenix Down - removeNegativeStatus = true - #Whether to give temporary regeneration when the player would die - giveTemporaryRegeneration = true - #Whether to give temporary damage resistance when the player would die. Applies only when the player is drowning. - giveTemporaryWaterBreathingIfDrowningKilledYou = true - - #Angelheart Vial settings - [items.angelheartVial] - #Percent of life that gets healed when the player would die - #Range: 0 ~ 100 - healPercentageOfMaxLife = 25 - #Whether the player gets negative statuses removed - removeNegativeStatus = true - - #Glacial Staff settings - [items.glacialStaff] - #Number of snowballs that get added to the staff per one that's consumed from player's inventory - #Range: 1 ~ 3 - snowballWorth = 1 - #The damage that snowballs cause - #Range: 0 ~ 6 - snowballDamage = 3 - #The damage bonus against entities that are immune to fire - #Range: 0 ~ 6 - snowballDamageBonusFireImmune = 3 - #Number of snowballs the staff can hold - #Range: 0 ~ 9999 - snowballLimit = 250 - #The damage bonus against blaze - #Range: 0 ~ 12 - snowballDamageBonusBlaze = 6 - #Number of snowballs it costs when the staff is used - #Range: 0 ~ 3 - snowballCost = 1 - - #Sojourner Staff settings [items.sojournerStaff] - #Distance after which there is an additional cost for torch placement. The additional cost is the number of times this distance fits in the distance at which the torch is being placed. - #Range: 6 ~ 30 - tilePerCostMultiplier = 6 - #Maximum range at which torches can be placed - #Range: 1 ~ 30 - maxRange = 30 - #List of torches that are supported by the staff torches = ["minecraft:torch"] - #Number of items the staff can store per item type - #Range: 1 ~ 9999 - maxCapacityPerItemType = 1500 - - #Infernal Chalice settings - [items.infernalChalice] - #Percent hunger used to heal player per 1 damage that would be taken otherwise. - #Range: 0 ~ 10 - hungerCostPercent = 1 - #Millibuckets of lava that the chalice can hold - #Range: > 0 - fluidLimit = 500000 - - #Void Tear settings - [items.voidTear] - #Whether the void tear starts absorbing immediately after it is set to item type - absorbWhenCreated = true - #Number of items the tear can hold of the item type it is set to - #Range: > 0 - itemLimit = 2000000000 - - #Twilight Cloak settings - [items.twilightCloak] - #Maximum light level at which the player is still invisible to the mobs - #Range: 0 ~ 15 - maxLightLevel = 4 - - #Fortune Coin settings - [items.fortuneCoin] - #The distance that it pulls from when right click is held - #Range: 9 ~ 30 - longRangePullDistance = 15 - #The distance that it pulls from when activated - #Range: 3 ~ 10 - standardPullDistance = 5 - - #Emperor Chalice settings - [items.emperorChalice] - #How much saturation is added in addition to filling the hunger - #Range: 0 ~ 10 - hungerSatiationMultiplier = 4 - - #Seeker Shot settings - [items.seekerShot] - #Entities that are banned from being tracked by seeker shot - huntableEntitiesBlacklist = [] - - #Rod of Lyssa settings [items.rodOfLyssa] - #The experience level cap after which the failure rate is at a minimum and doesn't get better - #Range: 1 ~ 900 - levelCapForLeveledFormula = 100 - #Allows switching stealing from player on and off stealFromPlayers = false - #If set to false it goes through additional 4 accessible slots and looks for items in case the one selected randomly was empty - stealFromVacantSlots = true - #Whether entities get angry at player if stealing fails - angerOnStealFailure = true - #Whether stealing from an empty slot triggers failure even if otherwise it would be successful - failStealFromVacantSlots = false - #The flat failure rate in case failure rate isn't influenced by player's level - #Range: 0 ~ 100 flatStealFailurePercentRate = 100 - #Whether level influences stealing failure rate of the rod - useLeveledFailureRate = true - - #Kraken Shell settings - [items.krakenShell] - #Percent hunger used to heal player per 1 damage that would be taken otherwise. - #Range: 0 ~ 50 - hungerCostPercent = 25 - - #Lantern of Paranoia settings - [items.lanternOfParanoia] - #Radius in which the lantern checks for light levels and places torches - #Range: 1 ~ 15 - placementScanRadius = 6 - #Minimum light level below which the lantern will place torches - #Range: 0 ~ 15 - minLightLevel = 8 - #List of torches that are supported by the lantern - torches = ["minecraft:torch"] - - #Alkahestry Tome settings - [items.alkahestryTome] - #Charge limit of the tome - #Range: 0 ~ 9999 - chargeLimit = 9999 - - #Mob Charm settings - [items.mobCharm] - #Maximum charms that will get displayed in HUD - #Range: 1 ~ 20 - maxCharmsToDisplay = 6 - #Sets how much durability of Mob Charm gets repaired per special drop - #Range: 1 ~ 200 - dropDurabilityRepair = 20 - #Total durability of Mob Charm - #Range: 20 ~ 1000 - durability = 80 - #Damage that Mob Charm takes when player kills mob it protects them from - #Range: 0 ~ 40 - damagePerKill = 1 - #Range in which mob charm or belt in pedestals will keep monsters from attacking players - #Range: 10 ~ 100 - pedestalRange = 21 - #Determines if almost destroyed charms stay displayed in the hud - keepAlmostDestroyedDisplayed = true - #List of hostile entities that are not supposed to have mob charms registered for them - entityBlockList = ["minecraft:ender_dragon", "minecraft:wither"] - - #Infernal Claws settings - [items.infernalClaws] - #Percent hunger used to heal player per 1 damage that would be taken otherwise. - #Range: 0 ~ 30 - hungerCostPercent = 5 - - #Midas Touchstone settings - [items.midasTouchstone] - #Number of glowstone that the repair costs - #Range: 0 ~ 3 - glowstoneCost = 1 - #Number of glowstone the touchstone can hold - #Range: 0 ~ 9999 - glowstoneLimit = 250 - #Number of glowstone that gets added to the touchstone per one in player's inventory - #Range: 1 ~ 12 - glowstoneWorth = 4 - #Gold items that can be repaired by the touchstone - goldItems = [] - - #Infernal Tear settings - [items.infernalTear] - #Whether the infernal tear starts absorbing immediately after it is set to item type - absorbWhenCreated = false - #List of items that can be consumed by infernal tear with their experience point value - entityLootTableList = ["minecraft:emerald|63", "minecraft:sandstone|1", "minecraft:gravel|1", "minecraft:diamond|125", "minecraft:gunpowder|8", "minecraft:nether_star|500", "minecraft:iron_ingot|63", "minecraft:charcoal|2", "minecraft:soul_sand|2", "minecraft:lapis_lazuli|8", "minecraft:obsidian|4", "minecraft:end_stone|1", "minecraft:gold_ingot|63", "minecraft:netherrack|1", "minecraft:flint|2", "minecraft:clay|4", "minecraft:chorus_fruit|2", "minecraft:quartz|16", "minecraft:honeycomb|4", "minecraft:netherite_scrap|250"] - - #Destruction Catalyst settings - [items.destructionCatalyst] - #Number of gunpowder it costs per catalyst use - #Range: 0 ~ 10 - gunpowderCost = 3 - #Whether the explosion is centered on the block that gets clicked - centeredExplosion = false - #Whether the explosion makes a perfect cube hole - perfectCube = true - #List of mundane blocks the catalyst will break - mundaneBlocks = ["minecraft:dirt", "minecraft:coarse_dirt", "minecraft:podzol", "minecraft:mycelium", "minecraft:grass_block", "minecraft:gravel", "minecraft:cobblestone", "minecraft:stone", "minecraft:granite", "minecraft:diorite", "minecraft:andesite", "minecraft:sand", "minecraft:sandstone", "minecraft:snow", "minecraft:soul_sand", "minecraft:netherrack", "minecraft:end_stone"] - #Number of gunpowder that can be stored in destruction catalyst - #Range: 0 ~ 9999 - gunpowderLimit = 250 - #Number of gunpowder that gets added to catalyst per one that's consumed from players inventory - #Range: 1 ~ 3 - gunpowderWorth = 1 - #Radius of the explosion - #Range: 1 ~ 5 - explosionRadius = 1 - - #Hero Medallion settings - [items.heroMedallion] - #How much experience gets dropped on ground when hero's medallion is right clicked on it (9 is the first level of player xp) - #Range: 1 ~ 100 - experienceDrop = 9 - #A player's experience level at which the medallion will stop pulling from the player - #Range: 0 ~ 30 - experienceLevelMinimum = 0 - #Maximum amount of xp that is used each time medallion repairs items - #Range: 1 ~ 20 - pedestalRepairStepXP = 5 - #A player's experience level at which pulling from the medallion to player will stop - #Range: 0 ~ 1000 - experienceLevelMaximum = 200 - #Cooldown between hero medallion tries to fix mending items in nearby pedestals - #Range: 1 ~ 100 - pedestalCoolDown = 20 - #Range in which pedestals are checked for items with mending enchant that need fixing - #Range: 1 ~ 20 - pedestalRange = 5 - - #Handgun settings - [items.handgun] - #Experience level at which handgun has the fastest reload time and shortes cooldown between shots - #Range: 0 ~ 100 - maxSkillLevel = 20 - - #Mob Charm Fragment Settings - [items.mobCharmFragment] - #Chance of fragment droping from mobs that don't have fragment that can be crafted - #Range: 0.0 ~ 1.0 - dropChance = 0.01666666753590107 - #Additional chance per level of looting - #Range: 0.0 ~ 1.0 - lootingMultiplier = 0.008333333767950535 - -[blocks] - - #Pedestal related settings - [blocks.pedestal] - #Range at which bucket will pickup liquid blocks or milk cows - #Range: 1 ~ 10 - bucketWrapperRange = 4 - #Range at which pedestals will get turned on if either redstone block gets put in or redstone dust and transmitting pedestals is powered - #Range: 1 ~ 200 - redstoneWrapperRange = 10 - #How long it takes after a melee weapon swing before it can swing again (in ticks) - #Range: 1 ~ 200 - meleeWrapperCooldown = 5 - #How long it takes in between bucket actions (in ticks) - #Range: 1 ~ 200 - bucketWrapperCooldown = 40 - #How long it takes between shearing actions (in ticks) - #Range: 1 ~ 10 - shearsWrapperRange = 4 - #Success rate of fishing in percent. When unsuccessful it will pull the hook too late to catch a fish. - #Range: 0 ~ 100 - fishingWrapperSuccessRate = 80 - #Delay in seconds before it would start fishing again after retracting the hook. - #Range: 1 ~ 20 - fishingWrapperRetractDelay = 2 - #Range at which shears will shear sheep or shearable blocks - #Range: 1 ~ 200 - shearsWrapperCooldown = 10 - #Range of the melee weapons in which these will attack when in pedestals - #Range: 1 ~ 10 - meleeWrapperRange = 5 - - #Apothecary Cauldron settings - [blocks.apothecaryCauldron] - #Limit of glowstone that can be used in cauldron to make POTION more potent - #Range: 0 ~ 4 - glowstoneLimit = 2 - #List of acceptable heat sources - heatSources = [] - #Time it takes to cook POTION - #Range: 20 ~ 32000 - cookTime = 160 - #Limit of redstone that can be used in cauldron to make POTION last longer - #Range: 0 ~ 5 - redstoneLimit = 3 - - #Altar of Light settings - [blocks.altar] - #Time in minutes it takes for the altar to create glowstone block - #Range: 0 ~ 60 - timeInMinutes = 20 - #Number of redstone it costs to activate altar - #Range: 0 ~ 10 - redstoneCost = 3 - #Maximum time variance in minutes. A random part of it gets added to the Time in minutes. - #Range: 0 ~ 15 - maximumTimeVarianceInMinutes = 5 - #Light level that the altar outputs while active - #Range: 0 ~ 16 - outputLightLevelWhileActive = 16 - - #Interdiction Torch settings - [blocks.interdictionTorch] - #List of projectiles that are banned from being pushed by the torch - pushableProjectilesBlacklist = [] - #Radius in which the torch can push out mobs - #Range: 1 ~ 15 - pushRadius = 5 - #Whether the torch can push projectiles - canPushProjectiles = false - #List of entities that are banned from being pushed by the torch - pushableEntitiesBlacklist = [] - - #Lilypad of Fertility settings - [blocks.fertileLilypad] - #Radius in which lilypad causes growh ticks - #Range: 1 ~ 15 - tileRange = 4 - #Interval in seconds at which the lilypad causes growth tick updates - #Range: 1 ~ 150 - secondsBetweenGrowthTicks = 10 - #Radius around lilypad where the growth ticks occur the most often - #Range: 1 ~ 15 - fullPotencyRange = 1 - From a1ef2522a6db51f74efe0a2511eb8be0dfe468ec Mon Sep 17 00:00:00 2001 From: Harry Walker Date: Tue, 14 Sep 2021 20:49:06 +1000 Subject: [PATCH 28/33] Update tags.js --- kubejs/server_scripts/tags.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/tags.js b/kubejs/server_scripts/tags.js index e698910d..4fc69c7d 100644 --- a/kubejs/server_scripts/tags.js +++ b/kubejs/server_scripts/tags.js @@ -108,6 +108,7 @@ onEvent('item.tags', e => { e.add('forge:hoes', ['/.+_hoe/', '/.+:hoe_.+/']) e.add('forge:simple_honeycombs', '/^.+:(?!(catnip|rgbee)_).*honeycomb$/') e.add('forge:simple_honeycomb_blocks', '/^.+:(?!(catnip|rgbee)_).*honeycomb_block$/') + e.add('forge:wooden_buttons', '/forbidden_arcanus:.+_button/') //#endregion //#region removals e.remove(`minecraft:flowers`, `#botania:special_flowers`) @@ -204,4 +205,4 @@ onEvent('fluid.tags', e => { e.add('forge:essence', 'pneumaticcraft:memory_essence') e.add('minecraft:water', ['cofh_core:honey', 'cyclic:honey', 'resourcefulbees:catnip_honey', 'resourcefulbees:honey', 'resourcefulbees:rainbow_honey_flowing', 'resourcefulbees:rainbow_honey']) }) -//#endregion \ No newline at end of file +//#endregion From f4399b556b802c2ad7570632e0994e1cb5ac1769 Mon Sep 17 00:00:00 2001 From: Harry Walker Date: Tue, 14 Sep 2021 20:52:54 +1000 Subject: [PATCH 29/33] Update tags.js --- kubejs/server_scripts/tags.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/tags.js b/kubejs/server_scripts/tags.js index 4fc69c7d..da8e978a 100644 --- a/kubejs/server_scripts/tags.js +++ b/kubejs/server_scripts/tags.js @@ -108,7 +108,7 @@ onEvent('item.tags', e => { e.add('forge:hoes', ['/.+_hoe/', '/.+:hoe_.+/']) e.add('forge:simple_honeycombs', '/^.+:(?!(catnip|rgbee)_).*honeycomb$/') e.add('forge:simple_honeycomb_blocks', '/^.+:(?!(catnip|rgbee)_).*honeycomb_block$/') - e.add('forge:wooden_buttons', '/forbidden_arcanus:.+_button/') + e.add('minecraft:wooden_buttons', '/forbidden_arcanus:.+_button/') //#endregion //#region removals e.remove(`minecraft:flowers`, `#botania:special_flowers`) From 5c3e42683784e5277fb71332a8a1926062572265 Mon Sep 17 00:00:00 2001 From: Lady Lexxie Date: Tue, 14 Sep 2021 14:41:13 +0100 Subject: [PATCH 30/33] Create equipmentcompare-common.toml --- config/equipmentcompare-common.toml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 config/equipmentcompare-common.toml diff --git a/config/equipmentcompare-common.toml b/config/equipmentcompare-common.toml new file mode 100644 index 00000000..47f24b6e --- /dev/null +++ b/config/equipmentcompare-common.toml @@ -0,0 +1,3 @@ +[client] + [client.control_options] + blacklist = ["sophisticatedbackpacks:backpack", "sophisticatedbackpacks:iron_backpack", "sophisticatedbackpacks:gold_backpack", "sophisticatedbackpacks:diamond_backpack", "sophisticatedbackpacks:netherite_backpack"] From 06db94dc8a77acc9081c963bbf93bef62f270d9e Mon Sep 17 00:00:00 2001 From: Lady Lexxie Date: Tue, 14 Sep 2021 15:16:11 +0100 Subject: [PATCH 31/33] unified menril log in ultimine --- defaultconfigs/ftbultimine-server.snbt | 3 +++ kubejs/server_scripts/tags.js | 1 + 2 files changed, 4 insertions(+) create mode 100644 defaultconfigs/ftbultimine-server.snbt diff --git a/defaultconfigs/ftbultimine-server.snbt b/defaultconfigs/ftbultimine-server.snbt new file mode 100644 index 00000000..c6a28902 --- /dev/null +++ b/defaultconfigs/ftbultimine-server.snbt @@ -0,0 +1,3 @@ +{ + merge_tags: ["minecraft:base_stone_overworld", "integrateddynamics:menril_log"] +} diff --git a/kubejs/server_scripts/tags.js b/kubejs/server_scripts/tags.js index e698910d..f7c25d39 100644 --- a/kubejs/server_scripts/tags.js +++ b/kubejs/server_scripts/tags.js @@ -27,6 +27,7 @@ onEvent('item.tags', e => { e.add(`mekanism:crystals`, `#mekanism:crystals/${item}`) }) e.add('forge:marble', '#chisel:marble') + e.add('integrateddynamics:menril_log', 'integrateddynamics:menril_log_filled') e.add('chisel:marble', ['astralsorcery:marble_raw', 'enviromats:marble', 'quark:marble']) e.add('chisel:limestone', ['create:limestone', 'create:weathered_limestone', 'quark:limestone']) e.add('forge:ingots/aluminum', 'zycraft:aluminium') From bb840ccfa92a265ec96955ae98195d9b818f59ba Mon Sep 17 00:00:00 2001 From: Lady Lexxie Date: Tue, 14 Sep 2021 16:02:47 +0100 Subject: [PATCH 32/33] final things --- config/resourcefulbees/bees/bred/bees_mob/Ghastly.json | 2 +- defaultconfigs/ftbultimine-server.snbt | 2 +- kubejs/server_scripts/tags.js | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/resourcefulbees/bees/bred/bees_mob/Ghastly.json b/config/resourcefulbees/bees/bred/bees_mob/Ghastly.json index a8091940..2c342a91 100644 --- a/config/resourcefulbees/bees/bred/bees_mob/Ghastly.json +++ b/config/resourcefulbees/bees/bred/bees_mob/Ghastly.json @@ -48,7 +48,7 @@ }, "BreedData": { "isBreedable": true, - "parent1": "Creeper", + "parent1": "Beeper", "parent2": "Magma", "breedWeight": 10, "breedChance": 0.60, diff --git a/defaultconfigs/ftbultimine-server.snbt b/defaultconfigs/ftbultimine-server.snbt index c6a28902..d6cad225 100644 --- a/defaultconfigs/ftbultimine-server.snbt +++ b/defaultconfigs/ftbultimine-server.snbt @@ -1,3 +1,3 @@ { - merge_tags: ["minecraft:base_stone_overworld", "integrateddynamics:menril_log"] + merge_tags: ["minecraft:base_stone_overworld", "integrateddynamics:menril_logs"] } diff --git a/kubejs/server_scripts/tags.js b/kubejs/server_scripts/tags.js index 41e592b5..d9d79da0 100644 --- a/kubejs/server_scripts/tags.js +++ b/kubejs/server_scripts/tags.js @@ -27,7 +27,7 @@ onEvent('item.tags', e => { e.add(`mekanism:crystals`, `#mekanism:crystals/${item}`) }) e.add('forge:marble', '#chisel:marble') - e.add('integrateddynamics:menril_log', 'integrateddynamics:menril_log_filled') + e.add('integrateddynamics:menril_logs', 'integrateddynamics:menril_log_filled') e.add('chisel:marble', ['astralsorcery:marble_raw', 'enviromats:marble', 'quark:marble']) e.add('chisel:limestone', ['create:limestone', 'create:weathered_limestone', 'quark:limestone']) e.add('forge:ingots/aluminum', 'zycraft:aluminium') @@ -135,6 +135,7 @@ onEvent('item.tags', e => { //#region BLOCK TAGS onEvent('block.tags', e => { //#region additions + e.add('integrateddynamics:menril_logs', 'integrateddynamics:menril_log_filled') e.add('resourcefulbees:valid_apiary', ['glassential:glass_dark_ethereal', 'glassential:glass_dark_ethereal_reverse', 'glassential:glass_ethereal', 'glassential:glass_ethereal_reverse', 'glassential:glass_ghostly']) e.add('forge:storage_blocks/uru', 'kubejs:uru_block') e.add('pedestals:quarry/blacklist', ['allthemodium:allthemodium_ore', 'allthemodium:vibranium_ore', 'allthemodium:unobtainium_ore']) From 4f697f8061acdaf420957efd205686745ddeedb0 Mon Sep 17 00:00:00 2001 From: Lady Lexxie Date: Tue, 14 Sep 2021 17:40:11 +0100 Subject: [PATCH 33/33] Powah fix --- kubejs/server_scripts/constants.js | 4 ++-- kubejs/server_scripts/mod_specific/powah/powah.js | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kubejs/server_scripts/constants.js b/kubejs/server_scripts/constants.js index 2c0ce7ad..d91bc6b6 100644 --- a/kubejs/server_scripts/constants.js +++ b/kubejs/server_scripts/constants.js @@ -16,12 +16,12 @@ const draconicFusion = function (output, craftingTier, energy, middleItem, ingre }) } -const energize = function (ingredient, result, power) { +const energize = function (ingredient, result, power, count) { onEvent('recipes', e => { e.recipes.powah.energizing({ ingredients: ingredient.map(i => Ingredient.of(i).toJson()), energy: power, - result: Item.of(result).toResultJson() + result: Item.of(result, count ? count : 1).toResultJson() }) }) } diff --git a/kubejs/server_scripts/mod_specific/powah/powah.js b/kubejs/server_scripts/mod_specific/powah/powah.js index f05a0d09..88cdbf1a 100644 --- a/kubejs/server_scripts/mod_specific/powah/powah.js +++ b/kubejs/server_scripts/mod_specific/powah/powah.js @@ -6,10 +6,10 @@ onEvent('recipes', e => { }) energize(['powah:energy_cell_nitro', 'powah:energy_cell_nitro', 'atmadditions:atm_star', 'powah:energy_cell_nitro', 'powah:energy_cell_nitro'], 'powah:energy_cell_creative', '2147483647') - energize([{ tag: 'forge:storage_blocks/iron' }, { tag: 'forge:storage_blocks/gold' }], 'powah:energized_steel_block', 2, '90000') - energize([{ item: 'botania:blaze_block' }], 'powah:blazing_crystal_block', 1, '810000') - energize([{ tag: 'forge:storage_blocks/diamond' }], 'powah:niotic_crystal_block', 1, '2700000') - energize([{ tag: 'forge:storage_blocks/emerald' }], 'powah:spirited_crystal_block', 1, '9000000') + energize([{ tag: 'forge:storage_blocks/iron' }, { tag: 'forge:storage_blocks/gold' }], 'powah:energized_steel_block', '90000', 2) + energize([{ item: 'botania:blaze_block' }], 'powah:blazing_crystal_block', '810000') + energize([{ tag: 'forge:storage_blocks/diamond' }], 'powah:niotic_crystal_block', '2700000') + energize([{ tag: 'forge:storage_blocks/emerald' }], 'powah:spirited_crystal_block', '9000000') e.shaped('powah:thermoelectric_plate', ['BAB', 'ACA', 'BAB'], { B: '#forge:rods/blaze',