Merge pull request #438 from MuteTiefling/e9e-tweaks

E9E tweaks
EnigmaticaModpacks · Jun 23, 2023 · fa3a2df · fa3a2df
2 parents f5f1757 + 4e4b53c
commit fa3a2df
Show file tree

Hide file tree

Showing 26 changed files with 726 additions and 120 deletions.
diff --git a/config/configswapper/expert/config/entangled-common.toml b/config/configswapper/expert/config/entangled-common.toml
@@ -1,18 +1,9 @@
-[Client]
-    # When looking at an Entangled Block, should its bound block be highlighted?
-    # Allowed values: true, false - Default: true
-    renderBlockHighlight = true
-
-    # Should the block rendered inside entangled blocks rotate?
-    # Allowed values: true, false - Default: true
-    rotateRenderedBlock = true
-
 [General]
     # Can entangled blocks be bound between different dimensions? Previously bound entangled blocks won't be affected.
     # Allowed values: true, false - Default: true
     allowDimensional = false
 
     # What is the max range in which entangled blocks can be bound? Only affects blocks in the same dimension. -1 for infinite range. Previously bound entangled blocks won't be affected.
     # Allowed range: -1 ~ 2147483647 - Default: -1
-    maxDistance = 128
+    maxDistance = 32
 
diff --git a/config/configswapper/expert/serverconfig/enigmaticunity-server.toml b/config/configswapper/expert/serverconfig/enigmaticunity-server.toml
@@ -3,7 +3,7 @@
 auraConversion = 40.0
 #Conversion multiplier from Source to Power
 #Range: 4.9E-324 ~ 1.7976931348623157E308
-sourceConversion = 250.0
+sourceConversion = 400.0
 
 ["Dim type"]
 	#Power Buffer size  of the Dim type
@@ -20,10 +20,10 @@ sourceConversion = 250.0
 	tickinterval = 80
 	#Amount of Source to convert per Operation with the Dim type
 	#Range: > 0
-	amountperoperation = 40
+	amountperoperation = 20
 	#Amount of Aura to drain/provide when theDim type operates
 	#Range: > 0
-	change = 750
+	change = 800
 
 ["Bright type"]
 	#Power Buffer size  of the Bright type
@@ -40,10 +40,10 @@ sourceConversion = 250.0
 	tickinterval = 40
 	#Amount of Source to convert per Operation with the Bright type
 	#Range: > 0
-	amountperoperation = 40
+	amountperoperation = 20
 	#Amount of Aura to drain/provide when theBright type operates
 	#Range: > 0
-	change = 3750
+	change = 3800
 
 ["Iridescent type"]
 	#Power Buffer size  of the Iridescent type
@@ -60,8 +60,8 @@ sourceConversion = 250.0
 	tickinterval = 20
 	#Amount of Source to convert per Operation with the Iridescent type
 	#Range: > 0
-	amountperoperation = 40
+	amountperoperation = 20
 	#Amount of Aura to drain/provide when theIridescent type operates
 	#Range: > 0
-	change = 7750
+	change = 7800
 
diff --git a/config/configswapper/normal/config/entangled-common.toml b/config/configswapper/normal/config/entangled-common.toml
@@ -1,12 +1,3 @@
-[Client]
-    # When looking at an Entangled Block, should its bound block be highlighted?
-    # Allowed values: true, false - Default: true
-    renderBlockHighlight = true
-
-    # Should the block rendered inside entangled blocks rotate?
-    # Allowed values: true, false - Default: true
-    rotateRenderedBlock = true
-
 [General]
     # Can entangled blocks be bound between different dimensions? Previously bound entangled blocks won't be affected.
     # Allowed values: true, false - Default: true

diff --git a/config/ftbquests/quests/chapters/ars_nouveau_expert.snbt b/config/ftbquests/quests/chapters/ars_nouveau_expert.snbt
@@ -791,7 +791,7 @@
 					type: "item"
 				}
 			]
-			x: 3.5d
+			x: 3.0d
 			y: 2.5d
 		}
 		{
@@ -816,7 +816,7 @@
 				item: "ars_nouveau:ritual_cloudshaping"
 				type: "item"
 			}]
-			x: 0.5d
+			x: 1.0d
 			y: 2.5d
 		}
 		{
@@ -1073,39 +1073,6 @@
 			x: -6.5d
 			y: -2.0d
 		}
-		{
-			dependencies: ["2CFCF5AFECE471E7"]
-			description: [
-				"First shalt thou take out the Holy Pin. Then, shalt thou count to three, no more, no less…"
-				""
-				"Useful for summoning Wilden of all sizes. When augmented with body parts from each of the lesser Wilden, the Wilden Chimera will appear to avenge his kin."
-			]
-			icon: "ars_nouveau:ritual_wilden_summon"
-			id: "4C8EE3E4E174B4CC"
-			rewards: [{
-				command: "/execute at @p run loot spawn ~ ~1 ~ loot enigmatica:loot_boxes/sorcerers_delight"
-				icon: "kubejs:sorcerers_delight"
-				id: "04F678C5D7C1C7F5"
-				player_command: false
-				title: "Sorcerer's Delight"
-				type: "command"
-			}]
-			subtitle: "The Beast of Caerbannog"
-			tasks: [
-				{
-					id: "0609A04F9472F422"
-					item: "ars_nouveau:ritual_wilden_summon"
-					type: "item"
-				}
-				{
-					id: "60A51BD60D1A43AC"
-					item: "ars_nouveau:wilden_tribute"
-					type: "item"
-				}
-			]
-			x: 1.5d
-			y: 3.0d
-		}
 		{
 			dependencies: ["0558849340629198"]
 			description: [
@@ -1861,7 +1828,7 @@
 					type: "item"
 				}
 			]
-			x: 2.5d
+			x: 2.0d
 			y: 3.0d
 		}
 		{

diff --git a/config/ftbquests/quests/chapters/chapter_three.snbt b/config/ftbquests/quests/chapters/chapter_three.snbt
@@ -135,6 +135,13 @@
 		}
 		{
 			dependencies: ["0672B242C31F4A11"]
+			description: [
+				""
+				""
+				"================================="
+				""
+				"Teleportation using the Tree of Life is prone to… drift. Be sure to bring along some means to return home as well as to set up a portal on the other side. "
+			]
 			icon: "minecraft:chorus_fruit"
 			id: "0EBE44D4C30C0E51"
 			shape: "hexagon"

diff --git a/config/ftbquests/quests/chapters/chapter_two.snbt b/config/ftbquests/quests/chapters/chapter_two.snbt
@@ -10,7 +10,13 @@
 	quests: [
 		{
 			dependencies: ["4F90F6437D6CF7EC"]
-			description: ["With items attuned to the destination it is now possible to travel to the Nether."]
+			description: [
+				"With items attuned to the destination it is now possible to travel to the Nether."
+				""
+				"================================="
+				""
+				"Teleportation using the Tree of Life is prone to… drift. Be sure to bring along some means to return home as well as to set up a portal on the other side. "
+			]
 			icon: "minecraft:crimson_fungus"
 			id: "3D0B7DA1DD0A74B1"
 			rewards: [{
@@ -49,7 +55,9 @@
 				""
 				"========================================"
 				""
-				"The Gateway for this fight is on a short timer. Capture a Wither and defeat the rest to obtain a Nether Star. The captured Wither will be used to mine Blighted Ichor, which may be used to produce more Nether Stars. "
+				"The Gateway for this fight is on a short timer. "
+				""
+				"Capture a Wither and defeat the rest. The captured Wither will be used to mine Blighted Ichor, which may be used to produce Nether Stars. "
 				""
 				"Feel free to repeat this fight, but it is not intended to be needed more than once. "
 			]
@@ -233,7 +241,9 @@
 				""
 				"========================================"
 				""
-				"The Gateway for this fight is on a short timer. Capture a Wilden Chimera and defeat the rest to obtain a Wilden Tribute. The captured Wilden Chimera will be used to mine Magicite, which has multiple uses. "
+				"The Gateway for this fight is on a short timer. "
+				""
+				"Capture a Wilden Chimera and defeat the rest to obtain a Wilden Tribute. The captured Wilden Chimera will be used to mine Magicite, which has multiple uses. "
 				""
 				"Feel free to repeat this fight, but it is not intended to be needed more than once. "
 			]
@@ -888,19 +898,31 @@
 			hide_dependency_lines: true
 			icon: "kubejs:tree_of_life_2"
 			id: "2759988A5B69A455"
-			rewards: [{
-				id: "0FB91854818547CC"
-				item: {
-					Count: 1b
-					id: "trofers:medium_plate"
-					tag: {
-						BlockEntityTag: {
-							Trophy: "trofers:tree_of_life_2"
+			rewards: [
+				{
+					id: "0FB91854818547CC"
+					item: {
+						Count: 1b
+						id: "trofers:medium_plate"
+						tag: {
+							BlockEntityTag: {
+								Trophy: "trofers:tree_of_life_2"
+							}
 						}
 					}
+					type: "item"
 				}
-				type: "item"
-			}]
+				{
+					count: 2
+					id: "0606173E7BE74E39"
+					item: {
+						Count: 1b
+						id: "ars_nouveau:stable_warp_scroll"
+						tag: { }
+					}
+					type: "item"
+				}
+			]
 			shape: "hexagon"
 			tasks: [
 				{
@@ -921,7 +943,13 @@
 		}
 		{
 			dependencies: ["2759988A5B69A455"]
-			description: ["With items attuned to the destination and the blessings of the Queen Bee, travel to the Overworld is now achievable."]
+			description: [
+				"With items attuned to the destination and the blessings of the Queen Bee, travel to the Overworld is now achievable."
+				""
+				"================================="
+				""
+				"Teleportation using the Tree of Life is prone to… drift. Be sure to bring along some means to return home as well as to set up a portal on the other side. "
+			]
 			icon: "supplementaries:globe"
 			id: "356B7D1DFF632DBD"
 			rewards: [{

diff --git a/kubejs/assets/kubejs/textures/item/drillhead_steel.png b/kubejs/assets/kubejs/textures/item/drillhead_steel.png
diff --git a/kubejs/assets/kubejs/textures/item/sawblade.png b/kubejs/assets/kubejs/textures/item/sawblade.png
diff --git a/kubejs/client_scripts/constants/jei_hidden_disabled.js b/kubejs/client_scripts/constants/jei_hidden_disabled.js
@@ -323,6 +323,7 @@ jei.expert.items.disabled = [
     'immersiveengineering:breaker_switch',
     'immersiveengineering:current_transformer',
     'immersiveengineering:cloche',
+    'immersiveengineering:drillhead_iron',
 
     /industrialforegoing:.*black_hole/,
     /industrialforegoing:conveyor/,
@@ -470,6 +471,7 @@ jei.expert.items.disabled = [
     'mekanism:hdpe_sheet',
     'mekanism:hdpe_rod',
     'mekanism:hdpe_pellet',
+    'mekanism:steel_casing',
 
     'mekanismgenerators:gas_burning_generator',
     'mekanismgenerators:advanced_solar_generator',

diff --git a/kubejs/client_scripts/expert/textures.js b/kubejs/client_scripts/expert/textures.js
@@ -32,6 +32,20 @@ ClientEvents.highPriorityAssets((event) => {
                 textures: { layer0: 'kubejs:item/drill_bit_diamond' }
             }
         },
+        {
+            path: 'immersiveengineering:models/item/drillhead_steel',
+            json_model: {
+                parent: 'minecraft:item/generated',
+                textures: { layer0: 'kubejs:item/drillhead_steel' }
+            }
+        },
+        {
+            path: 'immersiveengineering:models/item/sawblade',
+            json_model: {
+                parent: 'minecraft:item/generated',
+                textures: { layer0: 'kubejs:item/sawblade' }
+            }
+        },
         {
             path: 'occultism:models/block/golden_sacrificial_bowl',
             json_model: {

diff --git a/kubejs/client_scripts/lang_modifications.js b/kubejs/client_scripts/lang_modifications.js
@@ -945,7 +945,14 @@ const entries = {
             key: 'item.immersiveengineering.drillhead_steel',
             value: {
                 normal: 'Steel Drill Head',
-                expert: 'Reinforced Drill Head'
+                expert: `Skyseeker's Drill Head`
+            }
+        },
+        {
+            key: 'item.immersiveengineering.sawblade',
+            value: {
+                normal: 'Sawblade',
+                expert: `Botanist's Sawblade`
             }
         },
         {

diff --git a/kubejs/server_scripts/base/block_events/clear_weather.js b/kubejs/server_scripts/base/block_events/clear_weather.js
@@ -0,0 +1,18 @@
+BlockEvents.rightClicked((event) => {
+    const { entity, block, level, server } = event;
+    if (!entity.isPlayer() || entity.isFake()) {
+        return;
+    }
+
+    const dimension = String(level.getDimension());
+    if (
+        dimension == 'twilightforest:twilight_forest' &&
+        block.getId().match(/(minecraft:|comforts:).*(_bed|sleeping_bag|hammock_)/)
+    ) {
+        // clear weather after 100 ticks
+        server.scheduleInTicks(100, (schedule) => {
+            let command = `/execute in minecraft:overworld run weather clear`;
+            schedule.server.runCommandSilent(command);
+        });
+    }
+});
diff --git a/kubejs/server_scripts/base/recipes/lychee/block_interacting.js b/kubejs/server_scripts/base/recipes/lychee/block_interacting.js
@@ -389,6 +389,37 @@ ServerEvents.recipes((event) => {
         }
     ];
 
+    // colors.forEach((color) => {
+    //     [`minecraft:${color}_bed`, `comforts:sleeping_bag_${color}`, `comforts:hammock_${color}`].forEach((bed) => {
+    //         recipes.push({
+    //             hide_in_viewer: true,
+    //             item_in: { type: 'lychee:always_true' },
+    //             block_in: bed,
+    //             contextual: [
+    //                 {
+    //                     type: 'and',
+    //                     contextual: [
+    //                         { type: 'not', contextual: { type: 'weather', weather: 'clear' } },
+    //                         {
+    //                             type: 'location',
+    //                             predicate: { location: { dimension: 'twilightforest:twilight_forest' } }
+    //                         }
+    //                     ]
+    //                 }
+    //             ],
+    //             post: [
+    //                 { type: 'prevent_default' },
+    //                 {
+    //                     type: 'execute',
+    //                     command: 'execute in minecraft:overworld run weather clear 3600',
+    //                     hide: true
+    //                 }
+    //             ],
+    //             id: `${id_prefix}clear_twilight_weather_${bed.split(':')[1]}`
+    //         });
+    //     });
+    // });
+
     recipes.forEach((recipe) => {
         recipe.type = 'lychee:block_interacting';
         event.custom(recipe).id(recipe.id);

diff --git a/kubejs/server_scripts/base/tags/blocks/ars_nouveau/harvest.js b/kubejs/server_scripts/base/tags/blocks/ars_nouveau/harvest.js
@@ -1,7 +1,7 @@
 ServerEvents.tags('block', (event) => {
     tree_properties.trees.forEach((tree) => {
         event.add('ars_nouveau:harvest/foliage', tree.foliage);
-        event.add('ars_nouveau:harvest/stems', tree.stems);
+        // event.add('ars_nouveau:harvest/stems', tree.stems);
     });
 
     tree_properties.shrooms.forEach((shroom) => {