merge

kubejs/server_scripts/ad_astra/data.js

@@ -0,0 +1,13 @@
+// priority: 0
+
+function registerTFCDataForAdAstra(event) {
+
+	event.itemSize('ad_astra:tier_1_rocket', 'huge', 'very_heavy')
+	event.itemSize('ad_astra:tier_2_rocket', 'huge', 'very_heavy')
+	event.itemSize('ad_astra:tier_3_rocket', 'huge', 'very_heavy')
+	event.itemSize('ad_astra:tier_4_rocket', 'huge', 'very_heavy')
+
+	event.itemSize('ad_astra:tier_1_rover', 'very_large', 'very_heavy')
+
+	event.itemSize('ad_astra:launch_pad', 'very_large', 'very_heavy')
+}

kubejs/server_scripts/ad_astra/tags.js

@@ -179,10 +179,13 @@ const registerAdAstraEntityTypeTags = (event) => {
 		'minecraft:endermite',
 		'minecraft:shulker',
 		'minecraft:shulker_bullet',
+		'minecraft:skeleton',
 		'species:limpet',
 		'endermanoverhaul:windswept_hills_enderman',
 		'endermanoverhaul:soulsand_valley_enderman',
-		'endermanoverhaul:spirit'
+		'endermanoverhaul:spirit',
+		'endermanoverhaul:end_enderman',
+		'endermanoverhaul:end_islands_enderman'
 	]
 
 	MOON_ENTITIES.forEach(entity => {
@@ -192,8 +195,11 @@ const registerAdAstraEntityTypeTags = (event) => {
 	})
 
 	event.add('tfc:deals_crushing_damage', 'minecraft:enderman')
+	event.add('tfc:deals_crushing_damage', 'minecraft:skeleton')
 	event.add('tfc:deals_crushing_damage', 'endermanoverhaul:windswept_hills_enderman')
 	event.add('tfc:deals_crushing_damage', 'endermanoverhaul:soulsand_valley_enderman')
+	event.add('tfc:deals_crushing_damage', 'endermanoverhaul:end_enderman')
+	event.add('tfc:deals_crushing_damage', 'endermanoverhaul:end_islands_enderman')
 	event.add('tfc:deals_piercing_damage', 'minecraft:endermite')
 	event.add('tfc:deals_crushing_damage', 'ad_astra:star_crawler')
 }

kubejs/server_scripts/main_server_script.js

@@ -136,6 +136,7 @@ ServerEvents.highPriorityData(event => {
  * Срабатывает до инициализации рецептов, но после тегов.
  */
 TFCEvents.data(event => {
+    registerTFCDataForAdAstra(event);
     registerTFCDataForArborFirmaCraft(event)
     registerTFCDataForChalk(event);
     registerTFCDataForGTCEU(event)

kubejs/server_scripts/minecraft/tags.js

@@ -29,11 +29,13 @@ const registerMinecraftItemTags = (event) => {
     event.add('tfc:foods', 'minecraft:brown_mushroom')
     event.add('tfc:foods', 'minecraft:glow_berries')
     event.add('tfc:foods', 'minecraft:chorus_fruit')
+    event.add('tfc:foods', 'minecraft:popped_chorus_fruit')
 
     event.add('tfc:foods/vegetables', 'minecraft:red_mushroom')
     event.add('tfc:foods/vegetables', 'minecraft:brown_mushroom')
     event.add('tfc:foods/fruits', 'minecraft:glow_berries')
     event.add('tfc:foods/fruits', 'minecraft:chorus_fruit')
+    event.add('tfc:foods/fruits', 'minecraft:popped_chorus_fruit')
 
     event.add('beneath:usable_in_juicer', 'minecraft:glow_berries')
     event.add('beneath:usable_in_juicer', 'minecraft:chorus_fruit')
@@ -44,11 +46,13 @@ const registerMinecraftItemTags = (event) => {
     event.add('tfc:foods/usable_in_soup', 'minecraft:brown_mushroom')
     event.add('tfc:foods/usable_in_soup', 'minecraft:glow_berries')
     event.add('tfc:foods/usable_in_soup', 'minecraft:chorus_fruit')
+    event.add('tfc:foods/usable_in_soup', 'minecraft:popped_chorus_fruit')
 
     event.add('tfc:foods/usable_in_salad', 'minecraft:red_mushroom')
     event.add('tfc:foods/usable_in_salad', 'minecraft:brown_mushroom')
     event.add('tfc:foods/usable_in_salad', 'minecraft:glow_berries')
     event.add('tfc:foods/usable_in_salad', 'minecraft:chorus_fruit')
+    event.add('tfc:foods/usable_in_salad', 'minecraft:popped_chorus_fruit')
     
     event.add('tfc:rock/raw', 'minecraft:deepslate')
     event.add('tfc:rock/raw', 'minecraft:blackstone')

kubejs/server_scripts/tfc/data.js

@@ -251,10 +251,15 @@ const registerTFCFoodData = (event) => {
     
     event.foodItem('minecraft:chorus_fruit', food => {
         food.hunger(1.5)
-        food.fruit(1)
+        food.fruit(2)
         food.water(5)
     })
 
+    event.foodItem('minecraft:popped_chorus_fruit', food => {
+        food.hunger(2)
+        food.fruit(3)
+        food.decayModifier(0.5)
+    })
 
     event.foodItem('minecraft:red_mushroom', food => {
         food.hunger(1.5)

kubejs/server_scripts/tfg/tags.js

@@ -279,10 +279,9 @@ const registerTFGBlockTags = (event) => {
 
 	// #region Space blocks (TODO: undo these when merging space into dev!)
 
-	event.add('c:hidden_from_recipe_viewers', 'tfg:lunar_roots')
-	event.add('c:hidden_from_recipe_viewers', 'tfg:lunar_sprouts')
-	event.add('c:hidden_from_recipe_viewers', 'tfg:lunar_chorus_plant')
-	event.add('c:hidden_from_recipe_viewers', 'tfg:lunar_chorus_flower')
+	event.add('tfc:plants', 'tfg:lunar_roots')
+	event.add('tfc:plants', 'tfg:lunar_sprouts')
+	event.add('tfc:plants', 'tfg:lunar_chorus_flower')
 
 	// #endregion
 }