Merge pull request AllTheMods#3005 from AllTheMods/bee-fixes

Increase starry bee drops, fix bee info

changelog/1.8.21.md

@@ -5,7 +5,7 @@
 ### Mod Updates
 - AllTheCompressed-1.0.4-1.16.5-36.2.29.jar
 - appleskin-forge-mc1.16.x-2.4.0.jar
-- architectury-1.30.55.jar
+- architectury-1.30.56.jar
 - ars_nouveau-1.16.5-1.24.19.jar
 - Artifacts-1.16.5-2.10.5.jar
 - botanicalmachinery-1.16.4-0.4.6.jar
@@ -16,12 +16,14 @@
 - comforts-forge-1.16.5-4.0.1.5.jar
 - Cyclic-1.16.5-1.5.14.jar
 - CyclopsCore-1.16.5-1.12.2.jar
+- dpanvil-1.16.5-1.3.1.jar
 - Draconic-Evolution-1.16.5-3.0.22.444-universal.jar
+- elementalcraft-1.16.5-2.7.16.jar
 - entityculling-forge-mc1.16.5-1.5.1.jar
-- FramedBlocks-2.14.0-hotfix.jar
+- FramedBlocks-2.14.1.jar
 - ftb-quests-forge-1605.3.6-build.98.jar
 - getittogetherdrops-1.16.5-v1.2.jar
-- incontrol-1.16-5.2.5.jar
+- incontrol-1.16-5.2.6.jar
 - IntegratedDynamics-1.16.5-1.10.8.jar
 - IntegratedTerminals-1.16.5-1.2.13.jar
 - jei-1.16.5-7.7.1.152.jar
@@ -42,13 +44,14 @@
 - rftoolsstorage-1.16-2.0.18.jar
 - rftoolsutility-1.16-3.1.11.jar
 - simplemagnets-1.1.6-mc1.16.jar
-- sophisticatedbackpacks-1.16.5-3.15.12.552.jar
+- sophisticatedbackpacks-1.16.5-3.15.13.560.jar
 - structurize-1.16.5-1.0.355-ALPHA.jar
 - TConstruct-1.16.5-3.3.4.335.jar
 - theoneprobe-1.16-3.1.5.jar
 - tombstone-6.7.4-1.16.5.jar
 - ToolBelt-1.16.5-1.16.2.jar
-- universalgrid-1.16.5-1.02.jar
+- trashcans-1.0.13-mc1.16.jar
+- universalgrid-1.16.5-1.03.jar
 ### Other Changes
 - Update Forge to 36.2.31
 - Add Mekanism to copy/paste gadget blacklist
@@ -62,3 +65,6 @@
 - Add repair enchantments to Mahou projection blacklist (#2995)
 - Disable reducedChunkNBT from ferritecore (#2974)
 - Disable ghost spawns in The Other (#2632)
+- Increase centrifuge drops for Starry combs
+- Fixed honey unification (#3001)
+- Additional obsidian blocks added to dragon break blacklist

config/ftbquests/quests/chapters/creative.snbt

@@ -243,7 +243,7 @@
 				"                  &4&lWARNING:&r"
 				"The bee is immune to damage, but there might still be sources that will harm her. She's unique, so take care of her!"
 				""
-				"She will only produce 1 comb item, no matter what apiary or hive you're using. Centrifuge multipliers also do not work on the combs."
+				"She will only produce 1 comb item in regular apiaries, but 10 combs in the Creative Apiary. Centrifuge multipliers do not work on the combs."
 			]
 			hide_dependency_lines: true
 			id: "5C010374A550B53F"

config/ftbquests/quests/chapters/storage.snbt

@@ -773,7 +773,6 @@
 			title: "Mekanism Storage"
 			x: 9.0d
 			y: 3.0d
-			description: ["Go to the &aMekanism&f quest chapter for more on this mod."]
 			hide_dependency_lines: true
 			dependencies: ["5A94A2664BFDD7B9"]
 			id: "6B639160FD560CC1"

config/iceandfire-common.toml

@@ -18,7 +18,7 @@
 [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"]
+		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", "compressium:obsidian_1", "compressium:obsidian_2", "compressium:obsidian_3", "compressium:obsidian_4", "compressium:obsidian_5", "compressium:obsidian_6", "compressium:obsidian_7", "compressium:obsidian_8", "compressium:obsidian_9", "absentbydesign:fence_obsidian", "absentbydesign:slab_obsidian", "absentbydesign:stairs_obsidian", "absentbydesign:wall_obsidian", "absentbydesign:gate_obsidian", "minecraft:crying_obsidian", "absentbydesign:fence_crying_obsidian", "absentbydesign:slab_crying_obsidian", "absentbydesign:stairs_crying_obsidian", "absentbydesign:wall_crying_obsidian", "bloodmagic:obsidanbrickpath", "bloodmagic:obsidantilepath", "mekanism:block_refined_obsidian", "draconicevolution:infused_obsidian"]
 		"Dragon Griefing" = 1
 		"Tamed Dragon Griefing" = false
 		noDropBreakBlocks = ["minecraft:stone", "minecraft:dirt", "minecraft:grass_block", "minecraft:netherrack"]
@@ -46,4 +46,4 @@
 	"Dragonsteel Base Armor" = 75
 	"Chunk Load Summon Crystal" = true
 	"Dragonsteel Sword Base Attack Strength" = 1350.0
-	"Dragonsteel Base Durability Equipment" = 8000
+	"Dragonsteel Base Durability Equipment" = 8000

config/resourcefulbees/bees/RBeeDev/Starry.json

@@ -66,7 +66,7 @@
   },
   "CentrifugeData": {
     "hasCentrifugeOutput": true,
-    "mainInputCount": 9,
+    "mainInputCount": 1,
     "mainOutput": "resourcefulbees:starry_honey",
     "mainOutputWeight": 0.01,
     "mainOutputCount": 50,

config/pylons-common.toml → defaultconfigs/pylons-server.toml

@@ -1,3 +1,7 @@
 [expulsion_pylon]
 	#Which dimensions the Expulsion Pylon is allowed to operate in.
 	expulsionAllowedDimensions = ["minecraft:overworld", "compactmachines:compact_world", "allthemodium:mining"]
+[infusion_pylon]
+	#Effects that may not be used in the Infusion Pylon.
+	#This list will override the allowed effect list.
+	infusionDeniedEffects = ["tombstone:ghostly_shape"]

kubejs/client_scripts/jei_info.js

@@ -1,6 +1,6 @@
 onEvent('jei.information', e => {
   let beeTypes = java('com.resourcefulbees.resourcefulbees.compat.jei.JEICompat').ENTITY_INGREDIENT
-  e.addForType(beeTypes, ['bee:starry'], ['Housing this bee in a Creative Apiary will yield 10 comb blocks per harvest', 'You should have one by now, make use of it!'])
+  e.addForType(beeTypes, ['bee:starry'], ['Housing this bee in a Creative Apiary will yield 10 combs per harvest', 'You should have one by now, make use of it!'])
   e.add('thermal:bitumen', ['Byproduct of refining Oil in a Distillation Tower'])
   e.add('mekanism:creative_energy_cube', ['To fill the Cube you have to get 2x Ultimate Induction Providers, 2x filled Ultimate Energy Cubes and an ATM Star.',
     '',

kubejs/data/thermal/recipes/machine/centrifuge/centrifuge_honey_bottle.json

@@ -0,0 +1,16 @@
+{
+  "type": "thermal:centrifuge",
+  "ingredient": {
+    "item": "minecraft:honey_bottle"
+  },
+  "result": [
+    {
+      "item": "minecraft:glass_bottle"
+    },
+    {
+      "fluid": "resourcefulbees:honey",
+      "amount": 250
+    }
+  ],
+  "energy": 400
+}

kubejs/server_scripts/mod_specific/resourcefulbees/comb_recipes.js

@@ -31,8 +31,6 @@ onEvent('recipes', e => {
   ] // 25 now
   let dyes = []
   let botaniaFlowers = []
-  let honey = ['resourcefulbees:honey', 'cyclic:honey', 'create:honey']
-  let customHoney = ['resourcefulbees:rainbow_honey', 'resourcefulbees:catnip_honey']
 
   function shapedRecipe(results, craftingItem, itemCount) {
     let maxLength = Math.min(craftingShapes.length, results.length)
@@ -57,14 +55,6 @@ onEvent('recipes', e => {
     botaniaFlowers.push(`botania:${color}_mystical_flower`)
   })
 
-  e.recipes.thermal.chiller('resourcefulbees:starry_honey_block', fluid.of('resourcefulbees:starry_honey', 1000))
-
-  honey.forEach(type => e.recipes.thermal.chiller('minecraft:honey_block', fluid.of(`${type}`, 1000)))
-  customHoney.forEach(type => {
-    e.recipes.thermal.chiller(`${type}_block`, fluid.of(`${type}`, 1000))
-    e.shaped('compressium:honey_1', ['AAA', 'AAA', 'AAA'], { A: `${type}_block` })
-  })
-
   shapedRecipe(dyes, 'resourcefulbees:rainbow_honey_block', 32)
   shapedRecipe(botaniaFlowers, 'resourcefulbees:mystical_honeycomb', 2)
   shapedRecipe(botaniaFlowers, 'resourcefulbees:mystical_honeycomb_block', 18)

kubejs/server_scripts/unify.js

@@ -505,7 +505,7 @@ onEvent('recipes', e => {
 
   // #region Honey
   let simpleHoneys = ['cofh_core:honey', 'resourcefulbees:honey', 'cyclic:honey', 'create:honey']
-  let customHoneys = ['resourcefulbees:catnip_honey', 'resourcefulbees:rainbow_honey']
+  let customHoneys = ['resourcefulbees:catnip_honey', 'resourcefulbees:rainbow_honey', 'resourcefulbees:starry_honey']
 
   function cyclicHoneyMelter(entries) {
     entries.forEach(([input, honey, honeyAmount]) => {