Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

defaultconfigs/sns-server.toml

@@ -187,7 +187,7 @@
 	["Boot config"."Blue Steel Toe Boots"]
 		#The movement speed bonus these boots provide
 		#Range: 0.0 ~ 1024.0
-		movementSpeed = 0.2
+		movementSpeed = 0.25
 		#The step height bonus these boots provide
 		#Range: 0.0 ~ 512.0
 		stepHeight = 0.5
@@ -197,7 +197,7 @@
 		#The amount of 'steps' taken before one point of durability is lost
 		#Steps are defined as being any change in position while grounded between ticks (IE over 1 second 20 'steps' occur)
 		#Range: > 0
-		stepsPerDamage = 4000
+		stepsPerDamage = 3000
 
 	["Boot config"."Red Steel Toe Boots"]
 		#The movement speed bonus these boots provide

kubejs/server_scripts/create/recipes.js

@@ -1554,20 +1554,23 @@ const registerCreateRecipes = (event) => {
 	//#region Blaze burner
 
 	event.shaped('create:blaze_burner', [
-		'B B',
+		'EFE',
 		'BAB',
 		'DCD'
 	], {
-		A: '#forge:storage_blocks/coke',
-		B: 'tfc:metal/bars/black_steel',
-		C: '#forge:plates/black_steel',
-		D: '#forge:plates/steel'
+		A: '#forge:gems/coke',
+		B: 'tfc:metal/bars/steel',
+		C: '#forge:double_plates/steel',
+		D: '#forge:plates/steel',
+		E: '#forge:rods/steel',
+		F: '#forge:tools/hammers'
 	}).id('tfg:create/shaped/blaze_burner')
 
 	event.recipes.gtceu.assembler('create:blaze_burner')
-		.itemInputs('#forge:storage_blocks/coke', '4x tfc:metal/bars/black_steel', '#forge:plates/black_steel')
+		.itemInputs('#forge:gems/coke', '2x tfc:metal/bars/steel', '2x #forge:rods/steel', '#forge:double_plates/steel', '2x #forge:plates/steel')
 		.itemOutputs('create:blaze_burner')
 		.duration(50)
+		.circuit(2)
 		.EUt(GTValues.VA[GTValues.ULV])
 
 	//#endregion

kubejs/server_scripts/main_server_script.js

@@ -45,7 +45,7 @@ ServerEvents.tags('item', event => {
 	registerRnrItemTags(event)
 	registerSophisticatedBackpacksItemTags(event)
 	registerSoulboundItemTags(event)
-	registeSNSItemTags(event)
+	registerSNSItemTags(event)
 	registerSpeciesItemTags(event)
 	registerTACZItemTags(event)
 	registerTFCAmbientalItemTags(event)

kubejs/server_scripts/sacksnstuff/tags.js

@@ -1,7 +1,7 @@
 // priority: 0
 "use strict";
 
-function registeSNSItemTags(event) {
+function registerSNSItemTags(event) {
 
 	global.SNS_DISABLED_ITEMS.forEach(item => {
 		event.removeAllTagsFrom(item)
@@ -22,7 +22,7 @@ function registeSNSItemTags(event) {
 	
 	event.add('sns:allowed_in_ore_sack', '#tfc:sedimentary_rock')
 	event.add('sns:allowed_in_ore_sack', '#tfc:metamorphic_rock')
-	event.add('sns:allowed_in_ore_sack', '#tfg:igneous_intrusive_rock')
+	event.add('sns:allowed_in_ore_sack', '#tfc:igneous_intrusive_rock')
 	event.add('sns:allowed_in_ore_sack', '#tfc:igneous_extrusive_rock')
 	
 	event.add('sns:prevented_in_item_containers', '#tfc:fired_vessels')

kubejs/server_scripts/tfg/recipes.food.js

@@ -469,7 +469,7 @@ function registerTFGFoodRecipes(event) {
 	global.TFC_JAMS.forEach(name => {
 		processorRecipe(`${name}_jam`, 200, 8, {
 			circuit: 15,
-			itemInputs: [`4x tfc:food/${name}`, "#tfg:sugars", "4x #tfc:empty_jar_with_lid"],
+			itemInputs: [`4x tfc:food/${name}`, "#tfc:sweetener", "4x #tfc:empty_jar_with_lid"],
 			fluidInputs: ['#tfg:clean_water 100'],
 			itemOutputs: [`4x tfc:jar/${name}`],
 			itemOutputProvider: TFC.isp.of(`4x tfc:jar/${name}`).copyFood()
@@ -477,7 +477,7 @@ function registerTFGFoodRecipes(event) {
 
 		processorRecipe(`${name}_jam_no_seal`, 200, 8, {
 			circuit: 16,
-			itemInputs: [`4x tfc:food/${name}`, "#tfg:sugars", "4x tfc:empty_jar"],
+			itemInputs: [`4x tfc:food/${name}`, "#tfc:sweetener", "4x tfc:empty_jar"],
 			fluidInputs: ['#tfg:clean_water 100'],
 			itemOutputs: [`4x tfc:jar/${name}_unsealed`],
 			itemOutputProvider: TFC.isp.of(`4x tfc:jar/${name}_unsealed`).copyFood()
@@ -487,7 +487,7 @@ function registerTFGFoodRecipes(event) {
 	global.FIRMALIFE_JAMS.forEach(name => {
 		processorRecipe(`${name}_jam`, 200, 8, {
 			circuit: 15,
-			itemInputs: [`4x firmalife:food/${name}`, "#tfg:sugars", "4x #tfc:empty_jar_with_lid"],
+			itemInputs: [`4x firmalife:food/${name}`, "#tfc:sweetener", "4x #tfc:empty_jar_with_lid"],
 			fluidInputs: ['#tfg:clean_water 100'],
 			itemOutputs: [`4x firmalife:jar/${name}`],
 			itemOutputProvider: TFC.isp.of(`4x firmalife:jar/${name}`).copyFood()
@@ -495,7 +495,7 @@ function registerTFGFoodRecipes(event) {
 
 		processorRecipe(`${name}_jam_no_seal`, 200, 8, {
 			circuit: 16,
-			itemInputs: [`4x firmalife:food/${name}`, "#tfg:sugars", "4x tfc:empty_jar"],
+			itemInputs: [`4x firmalife:food/${name}`, "#tfc:sweetener", "4x tfc:empty_jar"],
 			fluidInputs: ['#tfg:clean_water 100'],
 			itemOutputs: [`4x firmalife:jar/${name}_unsealed`],
 			itemOutputProvider: TFC.isp.of(`4x firmalife:jar/${name}_unsealed`).copyFood()

kubejs/startup_scripts/main_startup_script.js

@@ -27,6 +27,7 @@ ItemEvents.modification(event => {
 	registerFirmalifeItemModifications(event)
 	registerGTCEuItemModifications(event)
 	registerMinecraftItemModifications(event)
+    registerSNSItemModifications(event)
 })
 
 StartupEvents.registry('fluid', event => {

kubejs/startup_scripts/sacksnsuch/modifications.js

@@ -0,0 +1,23 @@
+"use strict";
+
+function registerSNSItemModifications(event) {
+    const bootPairs = [
+        // [hiking_boot, non-hiking_equivalent]
+        ['sns:hiking_boots', 'minecraft:leather_boots'],
+        ['sns:steel_toe_hiking_boots', 'tfc:metal/boots/steel'],
+        ['sns:black_steel_toe_hiking_boots', 'tfc:metal/boots/black_steel'],
+        ['sns:blue_steel_toe_hiking_boots', 'tfc:metal/boots/blue_steel'],
+        ['sns:red_steel_toe_hiking_boots', 'tfc:metal/boots/red_steel']
+    ]
+
+    // for each pair, set the max damage of the hiking boot to 10% more than the normal boot
+    bootPairs.forEach(pair => {
+        const hikingBoot = pair[0]
+        const normalBoot = pair[1]
+
+        event.modify(hikingBoot, item => {
+            item.maxDamage = Item.of(normalBoot).maxDamage * 1.1
+        })
+    })
+}
+