diff --git a/config/ftbquests/quests/chapters/queststfg.snbt b/config/ftbquests/quests/chapters/queststfg.snbt index d47911446..03040b111 100644 --- a/config/ftbquests/quests/chapters/queststfg.snbt +++ b/config/ftbquests/quests/chapters/queststfg.snbt @@ -32,11 +32,6 @@ description: ["{quests.tfg.create_team.desc}"] icon: "minecraft:cake" id: "6D43C29AC049341D" - rewards: [{ - id: "703B1DE66D788924" - item: "gtceu:copper_credit" - type: "item" - }] subtitle: "{quests.tfg.create_team.subtitle}" tasks: [{ id: "124CFC2DE7647588" diff --git a/eslint.config.js b/eslint.config.js index ce47c6090..ac4e75807 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -6,7 +6,7 @@ import stylistic from '@stylistic/eslint-plugin' export default defineConfig([ { - files: ["**/*.{js,mjs,cjs,ts,mts,cts}"], + files: ["kubejs/startup_scripts/**/*.js", "kubejs/server_scripts/**/*.js", "kubejs/client_scripts/**/*.js"], plugins: { "js": js, "@stylistic": stylistic @@ -18,6 +18,14 @@ export default defineConfig([ "no-undef": "off", "no-unused-vars": "off", "no-unexpected-multiline": "off", + "no-var": "warn", + "prefer-template": "warn", + "no-unreachable-loop": "warn", + "no-useless-assignment": "warn", + "no-self-compare": "warn", + "no-template-curly-in-string": "error", + "no-unmodified-loop-condition": "warn", + "eqeqeq": "warn", "@stylistic/comma-style": [1, "last"], "@stylistic/brace-style": [1, "1tbs"], "@stylistic/function-call-spacing": [1, "never"], diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_emissive_ref.gif b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_emissive_ref.gif deleted file mode 100644 index 383a1c800..000000000 Binary files a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_emissive_ref.gif and /dev/null differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_ref.gif b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_ref.gif deleted file mode 100644 index d766d3c18..000000000 Binary files a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_ref.gif and /dev/null differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_front_active.png b/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_front_active.png deleted file mode 100644 index e10b0db21..000000000 Binary files a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_front_active.png and /dev/null differ diff --git a/kubejs/assets/tfg/blockstates/ev_aqueous_accumulator.json b/kubejs/assets/tfg/blockstates/ev_aqueous_accumulator.json new file mode 100644 index 000000000..5a06bf6f8 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/ev_aqueous_accumulator.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/ev_aqueous_accumulator", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/ev_aqueous_accumulator" + }, + "facing=south": { + "model": "tfg:block/machines/ev_aqueous_accumulator", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/ev_aqueous_accumulator", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/ev_food_oven.json b/kubejs/assets/tfg/blockstates/ev_food_oven.json new file mode 100644 index 000000000..0ac626818 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/ev_food_oven.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/ev_food_oven", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/ev_food_oven" + }, + "facing=south": { + "model": "tfg:block/machines/ev_food_oven", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/ev_food_oven", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/ev_food_processor.json b/kubejs/assets/tfg/blockstates/ev_food_processor.json new file mode 100644 index 000000000..f6f38f6c8 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/ev_food_processor.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/ev_food_processor", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/ev_food_processor" + }, + "facing=south": { + "model": "tfg:block/machines/ev_food_processor", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/ev_food_processor", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/ev_food_refrigerator.json b/kubejs/assets/tfg/blockstates/ev_food_refrigerator.json new file mode 100644 index 000000000..74525190a --- /dev/null +++ b/kubejs/assets/tfg/blockstates/ev_food_refrigerator.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/ev_food_refrigerator", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/ev_food_refrigerator" + }, + "facing=south": { + "model": "tfg:block/machines/ev_food_refrigerator", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/ev_food_refrigerator", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/ev_gas_pressurizer.json b/kubejs/assets/tfg/blockstates/ev_gas_pressurizer.json new file mode 100644 index 000000000..04d157733 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/ev_gas_pressurizer.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/ev_gas_pressurizer", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/ev_gas_pressurizer" + }, + "facing=south": { + "model": "tfg:block/machines/ev_gas_pressurizer", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/ev_gas_pressurizer", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/hv_aqueous_accumulator.json b/kubejs/assets/tfg/blockstates/hv_aqueous_accumulator.json new file mode 100644 index 000000000..4848b90e7 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/hv_aqueous_accumulator.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/hv_aqueous_accumulator", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/hv_aqueous_accumulator" + }, + "facing=south": { + "model": "tfg:block/machines/hv_aqueous_accumulator", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/hv_aqueous_accumulator", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/hv_food_oven.json b/kubejs/assets/tfg/blockstates/hv_food_oven.json new file mode 100644 index 000000000..9aab6a406 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/hv_food_oven.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/hv_food_oven", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/hv_food_oven" + }, + "facing=south": { + "model": "tfg:block/machines/hv_food_oven", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/hv_food_oven", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/hv_food_processor.json b/kubejs/assets/tfg/blockstates/hv_food_processor.json new file mode 100644 index 000000000..84b150a37 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/hv_food_processor.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/hv_food_processor", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/hv_food_processor" + }, + "facing=south": { + "model": "tfg:block/machines/hv_food_processor", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/hv_food_processor", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/hv_food_refrigerator.json b/kubejs/assets/tfg/blockstates/hv_food_refrigerator.json new file mode 100644 index 000000000..a76122225 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/hv_food_refrigerator.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/hv_food_refrigerator", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/hv_food_refrigerator" + }, + "facing=south": { + "model": "tfg:block/machines/hv_food_refrigerator", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/hv_food_refrigerator", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/hv_gas_pressurizer.json b/kubejs/assets/tfg/blockstates/hv_gas_pressurizer.json new file mode 100644 index 000000000..988e54c90 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/hv_gas_pressurizer.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/hv_gas_pressurizer", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/hv_gas_pressurizer" + }, + "facing=south": { + "model": "tfg:block/machines/hv_gas_pressurizer", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/hv_gas_pressurizer", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/lv_aqueous_accumulator.json b/kubejs/assets/tfg/blockstates/lv_aqueous_accumulator.json new file mode 100644 index 000000000..1f7bc22f3 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/lv_aqueous_accumulator.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/lv_aqueous_accumulator", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/lv_aqueous_accumulator" + }, + "facing=south": { + "model": "tfg:block/machines/lv_aqueous_accumulator", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/lv_aqueous_accumulator", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/lv_food_oven.json b/kubejs/assets/tfg/blockstates/lv_food_oven.json new file mode 100644 index 000000000..e6d5869cb --- /dev/null +++ b/kubejs/assets/tfg/blockstates/lv_food_oven.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/lv_food_oven", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/lv_food_oven" + }, + "facing=south": { + "model": "tfg:block/machines/lv_food_oven", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/lv_food_oven", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/lv_food_processor.json b/kubejs/assets/tfg/blockstates/lv_food_processor.json new file mode 100644 index 000000000..dbbe5aa1f --- /dev/null +++ b/kubejs/assets/tfg/blockstates/lv_food_processor.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/lv_food_processor", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/lv_food_processor" + }, + "facing=south": { + "model": "tfg:block/machines/lv_food_processor", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/lv_food_processor", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/lv_gas_pressurizer.json b/kubejs/assets/tfg/blockstates/lv_gas_pressurizer.json new file mode 100644 index 000000000..a83ecf548 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/lv_gas_pressurizer.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/lv_gas_pressurizer", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/lv_gas_pressurizer" + }, + "facing=south": { + "model": "tfg:block/machines/lv_gas_pressurizer", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/lv_gas_pressurizer", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/mv_aqueous_accumulator.json b/kubejs/assets/tfg/blockstates/mv_aqueous_accumulator.json new file mode 100644 index 000000000..414bd4ae8 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/mv_aqueous_accumulator.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/mv_aqueous_accumulator", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/mv_aqueous_accumulator" + }, + "facing=south": { + "model": "tfg:block/machines/mv_aqueous_accumulator", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/mv_aqueous_accumulator", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/mv_food_oven.json b/kubejs/assets/tfg/blockstates/mv_food_oven.json new file mode 100644 index 000000000..3b5f7b58f --- /dev/null +++ b/kubejs/assets/tfg/blockstates/mv_food_oven.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/mv_food_oven", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/mv_food_oven" + }, + "facing=south": { + "model": "tfg:block/machines/mv_food_oven", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/mv_food_oven", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/mv_food_processor.json b/kubejs/assets/tfg/blockstates/mv_food_processor.json new file mode 100644 index 000000000..82f5ecace --- /dev/null +++ b/kubejs/assets/tfg/blockstates/mv_food_processor.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/mv_food_processor", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/mv_food_processor" + }, + "facing=south": { + "model": "tfg:block/machines/mv_food_processor", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/mv_food_processor", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/mv_food_refrigerator.json b/kubejs/assets/tfg/blockstates/mv_food_refrigerator.json new file mode 100644 index 000000000..da4377c96 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/mv_food_refrigerator.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/mv_food_refrigerator", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/mv_food_refrigerator" + }, + "facing=south": { + "model": "tfg:block/machines/mv_food_refrigerator", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/mv_food_refrigerator", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/mv_gas_pressurizer.json b/kubejs/assets/tfg/blockstates/mv_gas_pressurizer.json new file mode 100644 index 000000000..d9aaa38c4 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/mv_gas_pressurizer.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/mv_gas_pressurizer", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/mv_gas_pressurizer" + }, + "facing=south": { + "model": "tfg:block/machines/mv_gas_pressurizer", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/mv_gas_pressurizer", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/ev_aqueous_accumulator.json b/kubejs/assets/tfg/models/block/machines/ev_aqueous_accumulator.json new file mode 100644 index 000000000..3a213a8f4 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/ev_aqueous_accumulator.json @@ -0,0 +1,51 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:ev_aqueous_accumulator", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/ev", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/ev", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/ev", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/ev", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/ev_food_oven.json b/kubejs/assets/tfg/models/block/machines/ev_food_oven.json new file mode 100644 index 000000000..46b38f201 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/ev_food_oven.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:ev_food_oven", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/ev", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/ev", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/ev", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/ev", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/ev_food_processor.json b/kubejs/assets/tfg/models/block/machines/ev_food_processor.json new file mode 100644 index 000000000..dc802782a --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/ev_food_processor.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:ev_food_processor", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/ev", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/ev", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/ev", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/ev", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/ev_food_refrigerator.json b/kubejs/assets/tfg/models/block/machines/ev_food_refrigerator.json new file mode 100644 index 000000000..f3c3970f4 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/ev_food_refrigerator.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:ev_food_refrigerator", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/ev", + "textures": { + "overlay_back": "tfg:block/machines/food_refrigerator/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_refrigerator/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_refrigerator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_refrigerator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_refrigerator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_refrigerator/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_refrigerator/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_refrigerator/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/ev", + "textures": { + "overlay_back": "tfg:block/machines/food_refrigerator/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_refrigerator/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_refrigerator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_refrigerator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_refrigerator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_refrigerator/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_refrigerator/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_refrigerator/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/ev", + "textures": { + "overlay_back": "tfg:block/machines/food_refrigerator/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_refrigerator/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_refrigerator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_refrigerator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_refrigerator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_refrigerator/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_refrigerator/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_refrigerator/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/ev", + "textures": { + "overlay_back": "tfg:block/machines/food_refrigerator/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_refrigerator/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_refrigerator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_refrigerator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_refrigerator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_refrigerator/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_refrigerator/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_refrigerator/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/ev_gas_pressurizer.json b/kubejs/assets/tfg/models/block/machines/ev_gas_pressurizer.json new file mode 100644 index 000000000..7bee75f92 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/ev_gas_pressurizer.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:ev_gas_pressurizer", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/ev", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/ev", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/ev", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/ev", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/hv_aqueous_accumulator.json b/kubejs/assets/tfg/models/block/machines/hv_aqueous_accumulator.json new file mode 100644 index 000000000..dcdbcf5e5 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/hv_aqueous_accumulator.json @@ -0,0 +1,51 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:hv_aqueous_accumulator", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/hv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/hv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "tfg:block/casings/voltage/hv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/hv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/hv_food_oven.json b/kubejs/assets/tfg/models/block/machines/hv_food_oven.json new file mode 100644 index 000000000..24b8a36a9 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/hv_food_oven.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:hv_food_oven", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/hv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/hv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/hv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/hv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/hv_food_processor.json b/kubejs/assets/tfg/models/block/machines/hv_food_processor.json new file mode 100644 index 000000000..a51bb3e34 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/hv_food_processor.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:hv_food_processor", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/hv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/hv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/hv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/hv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/hv_food_refrigerator.json b/kubejs/assets/tfg/models/block/machines/hv_food_refrigerator.json new file mode 100644 index 000000000..2e39e892b --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/hv_food_refrigerator.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:hv_food_refrigerator", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/hv", + "textures": { + "overlay_back": "tfg:block/machines/food_refrigerator/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_refrigerator/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_refrigerator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_refrigerator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_refrigerator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_refrigerator/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_refrigerator/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_refrigerator/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/hv", + "textures": { + "overlay_back": "tfg:block/machines/food_refrigerator/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_refrigerator/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_refrigerator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_refrigerator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_refrigerator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_refrigerator/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_refrigerator/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_refrigerator/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/hv", + "textures": { + "overlay_back": "tfg:block/machines/food_refrigerator/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_refrigerator/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_refrigerator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_refrigerator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_refrigerator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_refrigerator/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_refrigerator/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_refrigerator/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/hv", + "textures": { + "overlay_back": "tfg:block/machines/food_refrigerator/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_refrigerator/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_refrigerator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_refrigerator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_refrigerator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_refrigerator/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_refrigerator/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_refrigerator/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/hv_gas_pressurizer.json b/kubejs/assets/tfg/models/block/machines/hv_gas_pressurizer.json new file mode 100644 index 000000000..560b933fe --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/hv_gas_pressurizer.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:hv_gas_pressurizer", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/hv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/hv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/hv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/hv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/lv_aqueous_accumulator.json b/kubejs/assets/tfg/models/block/machines/lv_aqueous_accumulator.json new file mode 100644 index 000000000..a67a421af --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/lv_aqueous_accumulator.json @@ -0,0 +1,51 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:lv_aqueous_accumulator", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/lv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/lv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "tfg:block/casings/voltage/lv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/lv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/lv_food_oven.json b/kubejs/assets/tfg/models/block/machines/lv_food_oven.json new file mode 100644 index 000000000..24ac7eb72 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/lv_food_oven.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:lv_food_oven", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/lv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/lv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/lv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/lv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/lv_food_processor.json b/kubejs/assets/tfg/models/block/machines/lv_food_processor.json new file mode 100644 index 000000000..71d2f4e89 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/lv_food_processor.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:lv_food_processor", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/lv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/lv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/lv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/lv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/lv_gas_pressurizer.json b/kubejs/assets/tfg/models/block/machines/lv_gas_pressurizer.json new file mode 100644 index 000000000..04de2d89a --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/lv_gas_pressurizer.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:lv_gas_pressurizer", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/lv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/lv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/lv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/lv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/mv_aqueous_accumulator.json b/kubejs/assets/tfg/models/block/machines/mv_aqueous_accumulator.json new file mode 100644 index 000000000..4952580d1 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/mv_aqueous_accumulator.json @@ -0,0 +1,51 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:mv_aqueous_accumulator", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/mv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/mv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "tfg:block/casings/voltage/mv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/mv", + "textures": { + "overlay_front": "tfg:block/machines/aqueous_accumulator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/aqueous_accumulator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/aqueous_accumulator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/aqueous_accumulator/overlay_side_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/mv_food_oven.json b/kubejs/assets/tfg/models/block/machines/mv_food_oven.json new file mode 100644 index 000000000..02e8fae7d --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/mv_food_oven.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:mv_food_oven", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/mv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/mv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/mv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/mv", + "textures": { + "overlay_back": "tfg:block/machines/food_oven/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_oven/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_oven/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_oven/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_oven/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_oven/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_oven/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_oven/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/mv_food_processor.json b/kubejs/assets/tfg/models/block/machines/mv_food_processor.json new file mode 100644 index 000000000..46b2f6628 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/mv_food_processor.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:mv_food_processor", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/mv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/mv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/mv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/mv", + "textures": { + "overlay_back": "tfg:block/machines/food_processor/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_processor/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_processor/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_processor/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_processor/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_processor/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_processor/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_processor/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/mv_food_refrigerator.json b/kubejs/assets/tfg/models/block/machines/mv_food_refrigerator.json new file mode 100644 index 000000000..f612ca9a4 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/mv_food_refrigerator.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:mv_food_refrigerator", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/mv", + "textures": { + "overlay_back": "tfg:block/machines/food_refrigerator/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_refrigerator/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_refrigerator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_refrigerator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_refrigerator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_refrigerator/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_refrigerator/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_refrigerator/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/mv", + "textures": { + "overlay_back": "tfg:block/machines/food_refrigerator/overlay_back", + "overlay_back_emissive": "tfg:block/machines/food_refrigerator/overlay_back_emissive", + "overlay_front": "tfg:block/machines/food_refrigerator/overlay_front", + "overlay_front_emissive": "tfg:block/machines/food_refrigerator/overlay_front_emissive", + "overlay_side": "tfg:block/machines/food_refrigerator/overlay_side", + "overlay_side_emissive": "tfg:block/machines/food_refrigerator/overlay_side_emissive", + "overlay_top": "tfg:block/machines/food_refrigerator/overlay_top", + "overlay_top_emissive": "tfg:block/machines/food_refrigerator/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/mv", + "textures": { + "overlay_back": "tfg:block/machines/food_refrigerator/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_refrigerator/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_refrigerator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_refrigerator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_refrigerator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_refrigerator/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_refrigerator/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_refrigerator/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/mv", + "textures": { + "overlay_back": "tfg:block/machines/food_refrigerator/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/food_refrigerator/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/food_refrigerator/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/food_refrigerator/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/food_refrigerator/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/food_refrigerator/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/food_refrigerator/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/food_refrigerator/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/mv_gas_pressurizer.json b/kubejs/assets/tfg/models/block/machines/mv_gas_pressurizer.json new file mode 100644 index 000000000..a2e9e3370 --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/mv_gas_pressurizer.json @@ -0,0 +1,67 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:mv_gas_pressurizer", + "variants": { + "recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/casings/voltage/mv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/casings/voltage/mv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_emissive" + } + } + }, + "recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/casings/voltage/mv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + }, + "recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/casings/voltage/mv", + "textures": { + "overlay_back": "tfg:block/machines/gas_pressurizer/overlay_back_active", + "overlay_back_emissive": "tfg:block/machines/gas_pressurizer/overlay_back_active_emissive", + "overlay_front": "tfg:block/machines/gas_pressurizer/overlay_front_active", + "overlay_front_emissive": "tfg:block/machines/gas_pressurizer/overlay_front_active_emissive", + "overlay_side": "tfg:block/machines/gas_pressurizer/overlay_side_active", + "overlay_side_emissive": "tfg:block/machines/gas_pressurizer/overlay_side_active_emissive", + "overlay_top": "tfg:block/machines/gas_pressurizer/overlay_top_active", + "overlay_top_emissive": "tfg:block/machines/gas_pressurizer/overlay_top_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/ev_aqueous_accumulator.json b/kubejs/assets/tfg/models/item/ev_aqueous_accumulator.json new file mode 100644 index 000000000..5d6b40db8 --- /dev/null +++ b/kubejs/assets/tfg/models/item/ev_aqueous_accumulator.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/ev_aqueous_accumulator" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/ev_food_oven.json b/kubejs/assets/tfg/models/item/ev_food_oven.json new file mode 100644 index 000000000..ee84b41b6 --- /dev/null +++ b/kubejs/assets/tfg/models/item/ev_food_oven.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/ev_food_oven" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/ev_food_processor.json b/kubejs/assets/tfg/models/item/ev_food_processor.json new file mode 100644 index 000000000..264a0fd80 --- /dev/null +++ b/kubejs/assets/tfg/models/item/ev_food_processor.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/ev_food_processor" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/ev_food_refrigerator.json b/kubejs/assets/tfg/models/item/ev_food_refrigerator.json new file mode 100644 index 000000000..9565200e2 --- /dev/null +++ b/kubejs/assets/tfg/models/item/ev_food_refrigerator.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/ev_food_refrigerator" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/ev_gas_pressurizer.json b/kubejs/assets/tfg/models/item/ev_gas_pressurizer.json new file mode 100644 index 000000000..d11321cc6 --- /dev/null +++ b/kubejs/assets/tfg/models/item/ev_gas_pressurizer.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/ev_gas_pressurizer" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/hv_aqueous_accumulator.json b/kubejs/assets/tfg/models/item/hv_aqueous_accumulator.json new file mode 100644 index 000000000..dddbd12e5 --- /dev/null +++ b/kubejs/assets/tfg/models/item/hv_aqueous_accumulator.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/hv_aqueous_accumulator" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/hv_food_oven.json b/kubejs/assets/tfg/models/item/hv_food_oven.json new file mode 100644 index 000000000..77fc5f0b9 --- /dev/null +++ b/kubejs/assets/tfg/models/item/hv_food_oven.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/hv_food_oven" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/hv_food_processor.json b/kubejs/assets/tfg/models/item/hv_food_processor.json new file mode 100644 index 000000000..d4f8b72de --- /dev/null +++ b/kubejs/assets/tfg/models/item/hv_food_processor.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/hv_food_processor" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/hv_food_refrigerator.json b/kubejs/assets/tfg/models/item/hv_food_refrigerator.json new file mode 100644 index 000000000..87c44e81d --- /dev/null +++ b/kubejs/assets/tfg/models/item/hv_food_refrigerator.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/hv_food_refrigerator" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/hv_gas_pressurizer.json b/kubejs/assets/tfg/models/item/hv_gas_pressurizer.json new file mode 100644 index 000000000..b60f4cb00 --- /dev/null +++ b/kubejs/assets/tfg/models/item/hv_gas_pressurizer.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/hv_gas_pressurizer" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/lv_aqueous_accumulator.json b/kubejs/assets/tfg/models/item/lv_aqueous_accumulator.json new file mode 100644 index 000000000..c799a7611 --- /dev/null +++ b/kubejs/assets/tfg/models/item/lv_aqueous_accumulator.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/lv_aqueous_accumulator" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/lv_food_oven.json b/kubejs/assets/tfg/models/item/lv_food_oven.json new file mode 100644 index 000000000..e892a6cda --- /dev/null +++ b/kubejs/assets/tfg/models/item/lv_food_oven.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/lv_food_oven" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/lv_food_processor.json b/kubejs/assets/tfg/models/item/lv_food_processor.json new file mode 100644 index 000000000..9bb0c1721 --- /dev/null +++ b/kubejs/assets/tfg/models/item/lv_food_processor.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/lv_food_processor" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/lv_gas_pressurizer.json b/kubejs/assets/tfg/models/item/lv_gas_pressurizer.json new file mode 100644 index 000000000..ba74ba5ff --- /dev/null +++ b/kubejs/assets/tfg/models/item/lv_gas_pressurizer.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/lv_gas_pressurizer" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/mv_aqueous_accumulator.json b/kubejs/assets/tfg/models/item/mv_aqueous_accumulator.json new file mode 100644 index 000000000..79fe5ceb6 --- /dev/null +++ b/kubejs/assets/tfg/models/item/mv_aqueous_accumulator.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/mv_aqueous_accumulator" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/mv_food_oven.json b/kubejs/assets/tfg/models/item/mv_food_oven.json new file mode 100644 index 000000000..2918a1988 --- /dev/null +++ b/kubejs/assets/tfg/models/item/mv_food_oven.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/mv_food_oven" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/mv_food_processor.json b/kubejs/assets/tfg/models/item/mv_food_processor.json new file mode 100644 index 000000000..d5cf7ddf4 --- /dev/null +++ b/kubejs/assets/tfg/models/item/mv_food_processor.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/mv_food_processor" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/mv_food_refrigerator.json b/kubejs/assets/tfg/models/item/mv_food_refrigerator.json new file mode 100644 index 000000000..102270351 --- /dev/null +++ b/kubejs/assets/tfg/models/item/mv_food_refrigerator.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/mv_food_refrigerator" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/mv_gas_pressurizer.json b/kubejs/assets/tfg/models/item/mv_gas_pressurizer.json new file mode 100644 index 000000000..96749074d --- /dev/null +++ b/kubejs/assets/tfg/models/item/mv_gas_pressurizer.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/mv_gas_pressurizer" +} \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front.png b/kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_front.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front.png rename to kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_front.png diff --git a/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front_active.png b/kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_front_active.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front_active.png rename to kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_front_active.png diff --git a/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front_active.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_front_active.png.mcmeta similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front_active.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_front_active.png.mcmeta diff --git a/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front_active_emissive.png b/kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_front_active_emissive.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front_active_emissive.png rename to kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_front_active_emissive.png diff --git a/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front_active_emissive.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_front_active_emissive.png.mcmeta similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_front_active_emissive.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_front_active_emissive.png.mcmeta diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_emissive.png b/kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_front_emissive.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_emissive.png rename to kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_front_emissive.png diff --git a/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_side.png b/kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_side.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_side.png rename to kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_side.png diff --git a/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_side_active.png b/kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_side_active.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_side_active.png rename to kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_side_active.png diff --git a/kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_side_active.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_side_active.png.mcmeta similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/aqueous_accumulator/overlay_side_active.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_side_active.png.mcmeta diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_back_emissive.png b/kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_side_active_emissive.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_back_emissive.png rename to kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_side_active_emissive.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_side_emissive.png b/kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_side_emissive.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_side_emissive.png rename to kubejs/assets/tfg/textures/block/machines/aqueous_accumulator/overlay_side_emissive.png diff --git a/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_back.png b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_back.png new file mode 100644 index 000000000..144904dfa Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_back.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_back_active.png b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_back_active.png new file mode 100644 index 000000000..144904dfa Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_back_active.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_top_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_back_active_emissive.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_top_emissive.png rename to kubejs/assets/tfg/textures/block/machines/food_oven/overlay_back_active_emissive.png diff --git a/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_back_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_back_emissive.png new file mode 100644 index 000000000..c20a1c981 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_back_emissive.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_front.png b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_front.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_front.png rename to kubejs/assets/tfg/textures/block/machines/food_oven/overlay_front.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_front_active.png b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_front_active.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_front_active.png rename to kubejs/assets/tfg/textures/block/machines/food_oven/overlay_front_active.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_front_active.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_front_active.png.mcmeta similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_front_active.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/food_oven/overlay_front_active.png.mcmeta diff --git a/kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_front_active_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_front_active_emissive.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_front_active_emissive.png rename to kubejs/assets/tfg/textures/block/machines/food_oven/overlay_front_active_emissive.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_front_active_emissive.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_front_active_emissive.png.mcmeta similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_front_active_emissive.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/food_oven/overlay_front_active_emissive.png.mcmeta diff --git a/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_front_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_front_emissive.png new file mode 100644 index 000000000..c20a1c981 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_front_emissive.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_side.png b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_side.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_side.png rename to kubejs/assets/tfg/textures/block/machines/food_oven/overlay_side.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_side_active.png b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_side_active.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_side_active.png rename to kubejs/assets/tfg/textures/block/machines/food_oven/overlay_side_active.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_side_active.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_side_active.png.mcmeta similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_side_active.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/food_oven/overlay_side_active.png.mcmeta diff --git a/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_side_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_side_emissive.png new file mode 100644 index 000000000..c20a1c981 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_side_emissive.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_top.png b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_top.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_top.png rename to kubejs/assets/tfg/textures/block/machines/food_oven/overlay_top.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_top_active.png b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_top_active.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_top_active.png rename to kubejs/assets/tfg/textures/block/machines/food_oven/overlay_top_active.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_top_active.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_top_active.png.mcmeta similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_top_active.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/food_oven/overlay_top_active.png.mcmeta diff --git a/kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_top_active_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_top_active_emissive.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_top_active_emissive.png rename to kubejs/assets/tfg/textures/block/machines/food_oven/overlay_top_active_emissive.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_top_active_emissive.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_top_active_emissive.png.mcmeta similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_oven/overlay_top_active_emissive.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/food_oven/overlay_top_active_emissive.png.mcmeta diff --git a/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_top_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_top_emissive.png new file mode 100644 index 000000000..c20a1c981 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/food_oven/overlay_top_emissive.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_back.png b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_back.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_back.png rename to kubejs/assets/tfg/textures/block/machines/food_processor/overlay_back.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_back_active.png b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_back_active.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_back_active.png rename to kubejs/assets/tfg/textures/block/machines/food_processor/overlay_back_active.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_back_active.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_back_active.png.mcmeta similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_back_active.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/food_processor/overlay_back_active.png.mcmeta diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_back_active_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_back_active_emissive.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_back_active_emissive.png rename to kubejs/assets/tfg/textures/block/machines/food_processor/overlay_back_active_emissive.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_back_active_emissive.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_back_active_emissive.png.mcmeta similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_back_active_emissive.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/food_processor/overlay_back_active_emissive.png.mcmeta diff --git a/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_back_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_back_emissive.png new file mode 100644 index 000000000..c20a1c981 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_back_emissive.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front.png b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_front.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front.png rename to kubejs/assets/tfg/textures/block/machines/food_processor/overlay_front.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active.png b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_front_active.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active.png rename to kubejs/assets/tfg/textures/block/machines/food_processor/overlay_front_active.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_front_active.png.mcmeta similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/food_processor/overlay_front_active.png.mcmeta diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_front_active_emissive.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active_emissive.png rename to kubejs/assets/tfg/textures/block/machines/food_processor/overlay_front_active_emissive.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active_emissive.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_front_active_emissive.png.mcmeta similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_front_active_emissive.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/food_processor/overlay_front_active_emissive.png.mcmeta diff --git a/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_front_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_front_emissive.png new file mode 100644 index 000000000..c20a1c981 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_front_emissive.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_side.png b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_side.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_side.png rename to kubejs/assets/tfg/textures/block/machines/food_processor/overlay_side.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_side_active.png b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_side_active.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_side_active.png rename to kubejs/assets/tfg/textures/block/machines/food_processor/overlay_side_active.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_side_active.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_side_active.png.mcmeta similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_side_active.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/food_processor/overlay_side_active.png.mcmeta diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_side_active_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_side_active_emissive.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_side_active_emissive.png rename to kubejs/assets/tfg/textures/block/machines/food_processor/overlay_side_active_emissive.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_side_active_emissive.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_side_active_emissive.png.mcmeta similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_side_active_emissive.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/food_processor/overlay_side_active_emissive.png.mcmeta diff --git a/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_side_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_side_emissive.png new file mode 100644 index 000000000..c20a1c981 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_side_emissive.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_top.png b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_top.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_top.png rename to kubejs/assets/tfg/textures/block/machines/food_processor/overlay_top.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_top_active.png b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_top_active.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_top_active.png rename to kubejs/assets/tfg/textures/block/machines/food_processor/overlay_top_active.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_top_active.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_top_active.png.mcmeta similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_top_active.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/food_processor/overlay_top_active.png.mcmeta diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_top_active_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_top_active_emissive.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_top_active_emissive.png rename to kubejs/assets/tfg/textures/block/machines/food_processor/overlay_top_active_emissive.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_top_active_emissive.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_top_active_emissive.png.mcmeta similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_processor/overlay_top_active_emissive.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/food_processor/overlay_top_active_emissive.png.mcmeta diff --git a/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_top_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_top_emissive.png new file mode 100644 index 000000000..c20a1c981 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/food_processor/overlay_top_emissive.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back.png b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_back.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back.png rename to kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_back.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_back.png.mcmeta similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_back.png.mcmeta diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active.png b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_back_active.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active.png rename to kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_back_active.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_back_active.png.mcmeta similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_back_active.png.mcmeta diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_back_active_emissive.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_emissive.png rename to kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_back_active_emissive.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_emissive.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_back_active_emissive.png.mcmeta similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_active_emissive.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_back_active_emissive.png.mcmeta diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_back_emissive.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_emissive.png rename to kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_back_emissive.png diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_emissive.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_back_emissive.png.mcmeta similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_back_emissive.png.mcmeta rename to kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_back_emissive.png.mcmeta diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_front.png b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_front.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_front.png rename to kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_front.png diff --git a/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_front_active.png b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_front_active.png new file mode 100644 index 000000000..5b02c2583 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_front_active.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_bottom.png b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_front_active_emissive.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_bottom.png rename to kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_front_active_emissive.png diff --git a/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_front_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_front_emissive.png new file mode 100644 index 000000000..f02154247 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_front_emissive.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_side.png b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_side.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_side.png rename to kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_side.png diff --git a/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_side_active.png b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_side_active.png new file mode 100644 index 000000000..f02154247 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_side_active.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_side_active_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_side_active_emissive.png new file mode 100644 index 000000000..f02154247 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_side_active_emissive.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_side_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_side_emissive.png new file mode 100644 index 000000000..f02154247 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_side_emissive.png differ diff --git a/kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_top.png b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_top.png similarity index 100% rename from kubejs/assets/gtceu/textures/block/machines/food_refrigerator/overlay_top.png rename to kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_top.png diff --git a/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_top_active.png b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_top_active.png new file mode 100644 index 000000000..f02154247 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_top_active.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_top_active_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_top_active_emissive.png new file mode 100644 index 000000000..f02154247 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_top_active_emissive.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_top_emissive.png b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_top_emissive.png new file mode 100644 index 000000000..f02154247 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/food_refrigerator/overlay_top_emissive.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_back.png b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_back.png new file mode 100644 index 000000000..392333c10 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_back.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_back_active.png b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_back_active.png new file mode 100644 index 000000000..06d92b1bb Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_back_active.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_back_active.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_back_active.png.mcmeta new file mode 100644 index 000000000..92cc62352 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_back_active.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_back_active_emissive.png b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_back_active_emissive.png new file mode 100644 index 000000000..e20e42d8d Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_back_active_emissive.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_back_active_emissive.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_back_active_emissive.png.mcmeta new file mode 100644 index 000000000..92cc62352 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_back_active_emissive.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_back_emissive.png b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_back_emissive.png new file mode 100644 index 000000000..c20a1c981 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_back_emissive.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_front.png b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_front.png new file mode 100644 index 000000000..1760a37df Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_front.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_front_active.png b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_front_active.png new file mode 100644 index 000000000..1aa5799e8 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_front_active.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_front_active.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_front_active.png.mcmeta new file mode 100644 index 000000000..92cc62352 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_front_active.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_front_active_emissive.png b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_front_active_emissive.png new file mode 100644 index 000000000..57b2d0c22 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_front_active_emissive.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_front_active_emissive.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_front_active_emissive.png.mcmeta new file mode 100644 index 000000000..92cc62352 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_front_active_emissive.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_front_emissive.png b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_front_emissive.png new file mode 100644 index 000000000..c20a1c981 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_front_emissive.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_side.png b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_side.png new file mode 100644 index 000000000..5999dcaf7 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_side.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_side_active.png b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_side_active.png new file mode 100644 index 000000000..f2ce2ec57 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_side_active.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_side_active.png.mcmeta b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_side_active.png.mcmeta new file mode 100644 index 000000000..92cc62352 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_side_active.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime": 1 + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_side_active_emissive.png b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_side_active_emissive.png new file mode 100644 index 000000000..c20a1c981 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_side_active_emissive.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_side_emissive.png b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_side_emissive.png new file mode 100644 index 000000000..c20a1c981 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_side_emissive.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_top.png b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_top.png new file mode 100644 index 000000000..418a77a9a Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_top.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_top_active.png b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_top_active.png new file mode 100644 index 000000000..418a77a9a Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_top_active.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_top_active_emissive.png b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_top_active_emissive.png new file mode 100644 index 000000000..c20a1c981 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_top_active_emissive.png differ diff --git a/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_top_emissive.png b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_top_emissive.png new file mode 100644 index 000000000..c20a1c981 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/machines/gas_pressurizer/overlay_top_emissive.png differ diff --git a/kubejs/client_scripts/main_client_script.js b/kubejs/client_scripts/main_client_script.js index cb78244b9..e180ed8eb 100644 --- a/kubejs/client_scripts/main_client_script.js +++ b/kubejs/client_scripts/main_client_script.js @@ -1,4 +1,3 @@ -ItemEvents.tooltip(evt => -{ +ItemEvents.tooltip(evt => { registerTooltips(evt); }) diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index d504cbb9e..a328cc621 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -1,7 +1,6 @@ "use strict"; -const registerTooltips = (event) => -{ +const registerTooltips = (event) => { event.addAdvanced(['gtceu:lv_macerator', 'gtceu:mv_macerator', 'gtceu:hp_steam_macerator'], (item, advanced, text) => { text.add(1, [text.of('§7Only outputs the first slot shown in EMI/JEI until HV.')]) }) diff --git a/kubejs/server_scripts/ad_astra/recipes.js b/kubejs/server_scripts/ad_astra/recipes.js index 3cdc5c1af..52aebbdaf 100644 --- a/kubejs/server_scripts/ad_astra/recipes.js +++ b/kubejs/server_scripts/ad_astra/recipes.js @@ -1,6 +1,9 @@ // priority: 0 "use strict"; +/** + * @param {Internal.RecipesEventJS_} event + */ const registerAdAstraRecipes = (event) => { event.remove({ mod: 'ad_astra' }) @@ -413,7 +416,7 @@ const registerAdAstraRecipes = (event) => { .category(GTRecipeCategories.CHEM_DYES) global.MINECRAFT_DYE_NAMES.forEach(color => { - if (color != "white") { + if (color !== "white") { event.recipes.gtceu.chemical_bath(`tfg:ad_astra_${color}_flag`) .itemInputs('ad_astra:white_flag') .inputFluids(Fluid.of(`tfc:${color}_dye`, 36)) diff --git a/kubejs/server_scripts/ad_astra/tags.js b/kubejs/server_scripts/ad_astra/tags.js index 39889a138..40a2ed96a 100644 --- a/kubejs/server_scripts/ad_astra/tags.js +++ b/kubejs/server_scripts/ad_astra/tags.js @@ -105,7 +105,7 @@ const registerAdAstraItemTags = (event) => { event.add('minecraft:logs_that_burn', wood.stripped_log) } - if (wood.isHardwood == true) { + if (wood.isHardwood === true) { event.add('tfg:hardwood', wood.logs) } else { event.add('tfg:softwood', wood.logs) diff --git a/kubejs/server_scripts/advancedperipherals/recipes.recycling.js b/kubejs/server_scripts/advancedperipherals/recipes.recycling.js index 347860e2e..47d518af7 100644 --- a/kubejs/server_scripts/advancedperipherals/recipes.recycling.js +++ b/kubejs/server_scripts/advancedperipherals/recipes.recycling.js @@ -104,8 +104,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.dust, GTMaterials.Cupronickel, 24), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Aluminium, 14), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Copper, 11), - ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 8), - ) + ChemicalHelper.get(TagPrefix.dust, GTMaterials.StainlessSteel, 8)) .duration(GTMaterials.Cupronickel.getMass() * 24) .category(GTRecipeCategories.MACERATOR_RECYCLING) .EUt(GTValues.VA[GTValues.ULV]) @@ -116,8 +115,7 @@ function registerAdvancedPeripheralsRecyclingRecipes(event) { ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Cupronickel, 24), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Aluminium, 14), ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Copper, 11), - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 8), - ) + ChemicalHelper.get(TagPrefix.ingot, GTMaterials.StainlessSteel, 8)) .duration(GTMaterials.Cupronickel.getMass() * 24) .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) diff --git a/kubejs/server_scripts/ae2/recipes.js b/kubejs/server_scripts/ae2/recipes.js index c112b5fb9..051faba1b 100644 --- a/kubejs/server_scripts/ae2/recipes.js +++ b/kubejs/server_scripts/ae2/recipes.js @@ -523,7 +523,7 @@ const registerAE2Recipes = (event) => { '2x #forge:rods/steel', 'ae2:engineering_processor', '2x #forge:plates/steel', - '#tfc:workbenches',) + '#tfc:workbenches') .itemOutputs('ae2:crafting_terminal') .duration(100) .EUt(GTValues.VA[GTValues.LV]) @@ -1018,7 +1018,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '4x #gtceu:circuits/ev', '4x #forge:plates/titanium', '32x #forge:dusts/certus_quartz', - 'ae2:calculation_processor',) + 'ae2:calculation_processor') .inputFluids(Fluid.of('tfg:fluix', 144)) .itemOutputs('ae2:spatial_cell_component_2') .duration(200) @@ -1030,7 +1030,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '4x #gtceu:circuits/iv', '4x #forge:plates/tungsten_steel', '32x #forge:dusts/certus_quartz', - 'ae2:calculation_processor',) + 'ae2:calculation_processor') .inputFluids(Fluid.of('tfg:fluix', 144)) .itemOutputs('ae2:spatial_cell_component_16') .duration(200) @@ -1089,7 +1089,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .itemInputs( '2x ae2:formation_core', '2x ae2:annihilation_core', - 'ae2:storage_monitor',) + 'ae2:storage_monitor') .inputFluids(Fluid.of('gtceu:polyethylene', 144)) .itemOutputs('ae2:conversion_monitor') .duration(200) @@ -1705,8 +1705,8 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .EUt(480) // Cable Colorization - for (var i = 0; i < 16; i++) { - event.recipes.gtceu.chemical_bath(global.AE2_GLASS_CABLES[i] + '_dye') + for (let i = 0; i < 16; i++) { + event.recipes.gtceu.chemical_bath(`${global.AE2_GLASS_CABLES[i] }_dye`) .itemInputs('ae2:fluix_glass_cable') .inputFluids(Fluid.of(`tfc:${global.MINECRAFT_DYE_NAMES[i]}_dye`, 72)) .itemOutputs(global.AE2_GLASS_CABLES[i]) @@ -1714,7 +1714,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .EUt(7) .category(GTRecipeCategories.CHEM_DYES) - event.recipes.gtceu.chemical_bath(global.AE2_COVERED_CABLES[i] + '_dye') + event.recipes.gtceu.chemical_bath(`${global.AE2_COVERED_CABLES[i] }_dye`) .itemInputs('ae2:fluix_covered_cable') .inputFluids(Fluid.of(`tfc:${global.MINECRAFT_DYE_NAMES[i]}_dye`, 72)) .itemOutputs(global.AE2_COVERED_CABLES[i]) @@ -1722,7 +1722,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .EUt(7) .category(GTRecipeCategories.CHEM_DYES) - event.recipes.gtceu.chemical_bath(global.AE2_COVERED_DENSE_CABLES[i] + '_dye') + event.recipes.gtceu.chemical_bath(`${global.AE2_COVERED_DENSE_CABLES[i] }_dye`) .itemInputs('ae2:fluix_covered_dense_cable') .inputFluids(Fluid.of(`tfc:${global.MINECRAFT_DYE_NAMES[i]}_dye`, 72)) .itemOutputs(global.AE2_COVERED_DENSE_CABLES[i]) @@ -1730,7 +1730,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .EUt(7) .category(GTRecipeCategories.CHEM_DYES) - event.recipes.gtceu.chemical_bath(global.AE2_SMART_CABLES[i] + '_dye') + event.recipes.gtceu.chemical_bath(`${global.AE2_SMART_CABLES[i] }_dye`) .itemInputs('ae2:fluix_smart_cable') .inputFluids(Fluid.of(`tfc:${global.MINECRAFT_DYE_NAMES[i]}_dye`, 72)) .itemOutputs(global.AE2_SMART_CABLES[i]) @@ -1738,7 +1738,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .EUt(7) .category(GTRecipeCategories.CHEM_DYES) - event.recipes.gtceu.chemical_bath(global.AE2_SMART_DENSE_CABLES[i] + '_dye') + event.recipes.gtceu.chemical_bath(`${global.AE2_SMART_DENSE_CABLES[i] }_dye`) .itemInputs('ae2:fluix_smart_dense_cable') .inputFluids(Fluid.of(`tfc:${global.MINECRAFT_DYE_NAMES[i]}_dye`, 72)) .itemOutputs(global.AE2_SMART_DENSE_CABLES[i]) @@ -1747,7 +1747,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .category(GTRecipeCategories.CHEM_DYES) // Paint Balls - event.recipes.gtceu.chemical_bath(global.AE2_PAINTBALLS[i] + '_dye') + event.recipes.gtceu.chemical_bath(`${global.AE2_PAINTBALLS[i] }_dye`) .itemInputs('ae2:matter_ball') .inputFluids(Fluid.of(`tfc:${global.MINECRAFT_DYE_NAMES[i]}_dye`, 36)) .itemOutputs(global.AE2_PAINTBALLS[i]) @@ -1756,7 +1756,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { .category(GTRecipeCategories.CHEM_DYES) // Lumen Paint Ball - event.recipes.gtceu.chemical_bath(global.AE2_LUMEN_PAINTBALLS[i] + '_gtceu_dye') + event.recipes.gtceu.chemical_bath(`${global.AE2_LUMEN_PAINTBALLS[i] }_gtceu_dye`) .itemInputs(global.AE2_PAINTBALLS[i]) .inputFluids(Fluid.of('gtceu:glowstone', 125)) .itemOutputs(global.AE2_LUMEN_PAINTBALLS[i]) @@ -2149,7 +2149,7 @@ global.MINECRAFT_DYE_NAMES.forEach(dye => { '16x gtceu:iv_emitter', '8x ae2:engineering_processor', '14x gtceu:iv_sensor', - 'ae2:logic_processor',) + 'ae2:logic_processor') .inputFluids(Fluid.of('gtceu:titanium', 1440)) .itemOutputs('ae2:quantum_ring') .duration(900) diff --git a/kubejs/server_scripts/ae2wtlib/recipes.js b/kubejs/server_scripts/ae2wtlib/recipes.js index 3375a2851..1d3582d7c 100644 --- a/kubejs/server_scripts/ae2wtlib/recipes.js +++ b/kubejs/server_scripts/ae2wtlib/recipes.js @@ -56,7 +56,7 @@ const registerAE2WTLibRecipes = (event) => { 'gtceu:quantum_star', '2x gtceu:zpm_sensor', '4x ae2:wireless_booster', - '#gtceu:circuits/uv',) + '#gtceu:circuits/uv') .inputFluids( Fluid.of('gtceu:tritanium', 2304), Fluid.of('gtceu:titanium', 2160), diff --git a/kubejs/server_scripts/afc/data.js b/kubejs/server_scripts/afc/data.js index 56962ff7c..85bb92138 100644 --- a/kubejs/server_scripts/afc/data.js +++ b/kubejs/server_scripts/afc/data.js @@ -4,7 +4,6 @@ * * @param {Internal.TFCDataEventJS} event */ -const registerTFCDataForArborFirmaCraft = (event) => -{ +const registerTFCDataForArborFirmaCraft = (event) => { event.itemHeat('afc:tree_tap', 0.2345, null, null) } \ No newline at end of file diff --git a/kubejs/server_scripts/alekiships/tags.js b/kubejs/server_scripts/alekiships/tags.js index d7f4998a7..bbc6db3e6 100644 --- a/kubejs/server_scripts/alekiships/tags.js +++ b/kubejs/server_scripts/alekiships/tags.js @@ -4,8 +4,7 @@ * * @param {TagEvent.Item} event */ -const registerAlekishipsItemTags = (event) => -{ +const registerAlekishipsItemTags = (event) => { global.ALEKISHIPS_DISABLED_ITEMS.forEach(element => { event.removeAllTagsFrom(element); event.add("c:hidden_from_recipe_viewers", element) diff --git a/kubejs/server_scripts/betterend/recipes.js b/kubejs/server_scripts/betterend/recipes.js index d29228313..03fc1ad74 100644 --- a/kubejs/server_scripts/betterend/recipes.js +++ b/kubejs/server_scripts/betterend/recipes.js @@ -17,7 +17,7 @@ function registerBetterEndRecipes(event) { .EUt(GTValues.VA[GTValues.MV]) .dimension('ad_astra:moon') - event.recipes.gtceu.greenhouse(recipeId + "_helium") + event.recipes.gtceu.greenhouse(`${recipeId }_helium`) .notConsumable(element.id) .inputFluids(Fluid.of('gtceu:helium_3', 500)) .itemOutputs(`8x ${element.id}`) diff --git a/kubejs/server_scripts/chalk/data.js b/kubejs/server_scripts/chalk/data.js index f5f4ebb1c..c2eefba1c 100644 --- a/kubejs/server_scripts/chalk/data.js +++ b/kubejs/server_scripts/chalk/data.js @@ -4,10 +4,8 @@ * * @param {Internal.TFCDataEventJS} evt */ -const registerTFCDataForChalk = (evt) => -{ - global.MINECRAFT_DYE_NAMES.forEach(dyeName => - { +const registerTFCDataForChalk = (evt) => { + global.MINECRAFT_DYE_NAMES.forEach(dyeName => { evt.itemHeat(`tfg:wet_${dyeName}_chalk`, 1, null, null, `tfg:heating/wet_${dyeName}_chalk`) }) } \ No newline at end of file diff --git a/kubejs/server_scripts/chalk/tags.js b/kubejs/server_scripts/chalk/tags.js index 80a2aea22..8ac896f40 100644 --- a/kubejs/server_scripts/chalk/tags.js +++ b/kubejs/server_scripts/chalk/tags.js @@ -4,8 +4,7 @@ * * @param {TagEvent.Item} evt */ -const registerChalkItemTags = (evt) => -{ +const registerChalkItemTags = (evt) => { evt.add(`chalk:dusts_for_chalks`, `tfg:chalk_dust`) evt.add(`chalk:dusts_for_chalks`, `tfg:limestone_dust`) evt.add(`chalk:dusts_for_chalks`, `tfg:dripstone_dust`) diff --git a/kubejs/server_scripts/create/events.js b/kubejs/server_scripts/create/events.js index a5d25f3a2..10f4eda5d 100644 --- a/kubejs/server_scripts/create/events.js +++ b/kubejs/server_scripts/create/events.js @@ -2,12 +2,11 @@ PlayerEvents.tick((event) => { const { player } = event; - if (player.age % 100 == 0 - && player.headArmorItem == 'create:netherite_diving_helmet' - && player.chestArmorItem == 'create:netherite_backtank' - && player.legsArmorItem == 'minecraft:netherite_leggings' - && player.feetArmorItem == 'create:netherite_diving_boots') - { + if (player.age % 100 === 0 + && player.headArmorItem === 'create:netherite_diving_helmet' + && player.chestArmorItem === 'create:netherite_backtank' + && player.legsArmorItem === 'minecraft:netherite_leggings' + && player.feetArmorItem === 'create:netherite_diving_boots') { player.potionEffects.add("minecraft:fire_resistance", 350, 1, true, false); } }); diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 1a7ac3072..719bff4cc 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1394,7 +1394,7 @@ const registerCreateRecipes = (event) => { //#region Покраска тулбоксов global.MINECRAFT_DYE_NAMES.forEach(dye => { - if (dye != 'brown') { + if (dye !== 'brown') { event.remove({ id: `create:create.toolbox.color.block.create.${dye}_toolbox` }) event.recipes.tfc.barrel_sealed(1000) @@ -1421,7 +1421,7 @@ const registerCreateRecipes = (event) => { .id(`barrel/create/postbox_decolor`) global.MINECRAFT_DYE_NAMES.forEach(dye => { - if (dye != 'white') { + if (dye !== 'white') { event.recipes.tfc.barrel_sealed(1000) .inputs('create:white_postbox', Fluid.of(`tfc:${dye}_dye`, 288)) .outputItem(`create:${dye}_postbox`) @@ -1446,7 +1446,7 @@ const registerCreateRecipes = (event) => { .id(`barrel/create/table_cloth_decolor`) global.MINECRAFT_DYE_NAMES.forEach(dye => { - if (dye != 'white') { + if (dye !== 'white') { event.recipes.tfc.barrel_sealed(1000) .inputs('create:white_table_cloth', Fluid.of(`tfc:${dye}_dye`, 288)) .outputItem(`create:${dye}_table_cloth`) @@ -1472,7 +1472,7 @@ const registerCreateRecipes = (event) => { .id(`barrel/create/seat_decolor`) global.MINECRAFT_DYE_NAMES.forEach(dye => { - if (dye != "white") { + if (dye !== "white") { event.recipes.tfc.barrel_sealed(1000) .inputs(`create:white_seat`, Fluid.of(`tfc:${dye}_dye`, 288)) diff --git a/kubejs/server_scripts/create/tags.js b/kubejs/server_scripts/create/tags.js index 051366d6b..db6d7b3d5 100644 --- a/kubejs/server_scripts/create/tags.js +++ b/kubejs/server_scripts/create/tags.js @@ -25,7 +25,7 @@ const registerCreateItemTags = (event) => { global.MINECRAFT_DYE_NAMES.forEach(dye => { event.add('tfg:colored_valve_handles', `create:${dye}_valve_handle`) - if (dye != 'white') event.add('tfg:colored_seats', `create:${dye}_seat`) + if (dye !== 'white') event.add('tfg:colored_seats', `create:${dye}_seat`) }) event.add('minecraft:trimmable_armor', 'create:copper_diving_helmet') @@ -85,7 +85,7 @@ const registerCreateBlockTags = (event) => { global.MINECRAFT_DYE_NAMES.forEach(dye => { event.add('tfg:colored_valve_handles', `create:${dye}_valve_handle`) - if (dye != 'white') event.add('tfg:colored_seats', `create:${dye}_seat`) + if (dye !== 'white') event.add('tfg:colored_seats', `create:${dye}_seat`) }) // Disable bulk blasting diff --git a/kubejs/server_scripts/create_additions/events.js b/kubejs/server_scripts/create_additions/events.js index 312b8910d..591db3229 100644 --- a/kubejs/server_scripts/create_additions/events.js +++ b/kubejs/server_scripts/create_additions/events.js @@ -9,12 +9,8 @@ const cakeData = new $FoodData(6, 0, 2, 1, 0, 0, 0, 0.5, 0) BlockEvents.rightClicked(event => { const { block, server, player, player: { x, y, z, username } } = event; - if (block.id != 'createaddition:chocolate_cake' && block.id != 'createaddition:honey_cake') { - return - } + if (block.id !== 'createaddition:chocolate_cake' && block.id !== 'createaddition:honey_cake') return let foodData = player.getFoodData(); - if (foodData.needsFood()) { - foodData.eat(cakeData); - } + if (foodData.needsFood()) foodData.eat(cakeData); }); \ No newline at end of file diff --git a/kubejs/server_scripts/createdeco/recipes.js b/kubejs/server_scripts/createdeco/recipes.js index 70212ec2e..7694e779e 100644 --- a/kubejs/server_scripts/createdeco/recipes.js +++ b/kubejs/server_scripts/createdeco/recipes.js @@ -72,11 +72,11 @@ const registerCreatedecoRecipes = (event) => { function lampRecipe(output, lampType, lampColor) { - const replacementLampType = lampType; - if (lampType == 'industrial_iron') { + let replacementLampType = lampType; + if (lampType === 'industrial_iron') { replacementLampType = 'steel'; } - if (lampType == 'andesite') { + if (lampType === 'andesite') { replacementLampType = 'wrought_iron'; } @@ -233,7 +233,7 @@ const registerCreatedecoRecipes = (event) => { event.remove({ id: `createdeco:${bar.metal}_trapdoor` }) event.remove({ id: `createdeco:${bar.metal}_door` }) - if (bar.metal != 'iron') { + if (bar.metal !== 'iron') { event.remove({ type: 'minecraft:stonecutting', output: `createdeco:${bar.metal}_bars` }) event.recipes.tfc.anvil(`4x createdeco:${bar.metal}_bars`, `#forge:ingots/${bar.material}`, ['shrink_last', 'punch_second_last', 'punch_third_last']) @@ -350,49 +350,49 @@ const registerCreatedecoRecipes = (event) => { event.recipes.gtceu.forming_press('createdeco:gold_coin') .itemInputs('#forge:nuggets/gold') - .notConsumable('gtceu:credit_casting_mold') + .notConsumable('gtceu:cylinder_casting_mold') .itemOutputs('4x createdeco:gold_coin') .duration(50) .EUt(16) event.recipes.gtceu.forming_press('createdeco:netherite_coin') .itemInputs('#forge:nuggets/blue_steel') - .notConsumable('gtceu:credit_casting_mold') + .notConsumable('gtceu:cylinder_casting_mold') .itemOutputs('4x createdeco:netherite_coin') .duration(50) .EUt(16) event.recipes.gtceu.forming_press('createdeco:brass_coin') .itemInputs('#forge:nuggets/brass') - .notConsumable('gtceu:credit_casting_mold') + .notConsumable('gtceu:cylinder_casting_mold') .itemOutputs('4x createdeco:brass_coin') .duration(50) .EUt(16) event.recipes.gtceu.forming_press('createdeco:iron_coin') .itemInputs('#forge:nuggets/wrought_iron') - .notConsumable('gtceu:credit_casting_mold') + .notConsumable('gtceu:cylinder_casting_mold') .itemOutputs('4x createdeco:iron_coin') .duration(50) .EUt(16) event.recipes.gtceu.forming_press('createdeco:copper_coin') .itemInputs('#forge:nuggets/copper') - .notConsumable('gtceu:credit_casting_mold') + .notConsumable('gtceu:cylinder_casting_mold') .itemOutputs('4x createdeco:copper_coin') .duration(50) .EUt(16) event.recipes.gtceu.forming_press('createdeco:industrial_iron_coin') .itemInputs('#forge:nuggets/steel') - .notConsumable('gtceu:credit_casting_mold') + .notConsumable('gtceu:cylinder_casting_mold') .itemOutputs('createdeco:industrial_iron_coin') .duration(50) .EUt(16) event.recipes.gtceu.forming_press('createdeco:zinc_coin') .itemInputs('#forge:nuggets/zinc') - .notConsumable('gtceu:credit_casting_mold') + .notConsumable('gtceu:cylinder_casting_mold') .itemOutputs('createdeco:zinc_coin') .duration(50) .EUt(16) diff --git a/kubejs/server_scripts/every_compat/recipes.js b/kubejs/server_scripts/every_compat/recipes.js index 56c616969..951d05f69 100644 --- a/kubejs/server_scripts/every_compat/recipes.js +++ b/kubejs/server_scripts/every_compat/recipes.js @@ -3,8 +3,7 @@ const registerEveryCompatRecipes = (event) => { - global.TFC_WOOD_TYPES.forEach(wood => - { + global.TFC_WOOD_TYPES.forEach(wood => { event.remove({ id: `everycomp:c/tfc/${wood}_window_pane` }) event.shapeless(`2x everycomp:c/tfc/${wood}_window_pane`, @@ -21,8 +20,7 @@ const registerEveryCompatRecipes = (event) => { .EUt(7) }) - global.AFC_WOOD_TYPES.forEach(wood => - { + global.AFC_WOOD_TYPES.forEach(wood => { event.remove({ id: `everycomp:c/afc/${wood}_window_pane` }) event.shapeless(`2x everycomp:c/afc/${wood}_window_pane`, diff --git a/kubejs/server_scripts/exposure/tags.js b/kubejs/server_scripts/exposure/tags.js index ca1c00ef2..80690c1fb 100644 --- a/kubejs/server_scripts/exposure/tags.js +++ b/kubejs/server_scripts/exposure/tags.js @@ -4,8 +4,7 @@ * * @param {TagEvent.Item} evt */ -const registerExposureItemTags = (evt) => -{ +const registerExposureItemTags = (evt) => { evt.add('exposure:black_printing_dyes', '#forge:dyes/black') evt.add('exposure:yellow_printing_dyes', '#forge:dyes/yellow') evt.add('exposure:cyan_printing_dyes', '#forge:dyes/cyan') diff --git a/kubejs/server_scripts/extended_ae2/recipes.js b/kubejs/server_scripts/extended_ae2/recipes.js index 6c3077080..2b7119994 100644 --- a/kubejs/server_scripts/extended_ae2/recipes.js +++ b/kubejs/server_scripts/extended_ae2/recipes.js @@ -133,7 +133,7 @@ const registerExtendedAE2Recipes = (event) => { 'gtceu:iv_robot_arm', 'gtceu:iv_fluid_regulator', '4x #forge:dense_plates/tungsten_steel', - '#gtceu:circuits/iv',) + '#gtceu:circuits/iv') .inputFluids(Fluid.of('tfg:fluix', 144*9)) .itemOutputs("expatternprovider:oversize_interface") .duration(300) @@ -455,7 +455,7 @@ const registerExtendedAE2Recipes = (event) => { .itemInputs( 'ae2:pattern_access_terminal', '4x ae2:logic_processor', - '2x megacells:accumulation_processor',) + '2x megacells:accumulation_processor') .itemOutputs('expatternprovider:ex_pattern_access_part') .duration(100) .EUt(GTValues.VA[GTValues.EV]) @@ -539,7 +539,7 @@ const registerExtendedAE2Recipes = (event) => { '2x megacells:accumulation_processor', '4x ae2:logic_processor', '4x ae2:engineering_processor', - '4x ae2:speed_card',) + '4x ae2:speed_card') .itemOutputs('expatternprovider:ex_io_port') .duration(200) .EUt(1000) @@ -551,7 +551,7 @@ const registerExtendedAE2Recipes = (event) => { '2x megacells:accumulation_processor', '4x ae2:logic_processor', '4x ae2:engineering_processor', - '2x ae2:capacity_card',) + '2x ae2:capacity_card') .itemOutputs('expatternprovider:ex_drive') .duration(200) .EUt(1920) @@ -562,7 +562,7 @@ const registerExtendedAE2Recipes = (event) => { '2x megacells:accumulation_processor', '4x ae2:logic_processor', '4x ae2:engineering_processor', - '2x ae2:capacity_card',) + '2x ae2:capacity_card') .itemOutputs('expatternprovider:drive_upgrade') .duration(200) .circuit(2) @@ -575,7 +575,7 @@ const registerExtendedAE2Recipes = (event) => { 'gtceu:stainless_steel_drum', '2x ae2:cell_component_1k', 'gtceu:hv_robot_arm', - 'gtceu:hv_electric_pump',) + 'gtceu:hv_electric_pump') .itemOutputs('expatternprovider:ingredient_buffer') .duration(200) .EUt(1920) @@ -594,10 +594,10 @@ const registerExtendedAE2Recipes = (event) => { '4x ae2:logic_processor', '4x megacells:accumulation_processor', '16x #forge:rods/niobium_nitride', - '1x expatternprovider:ex_molecular_assembler',) + '1x expatternprovider:ex_molecular_assembler') .inputFluids( Fluid.of("gtceu:concrete", 144*8), - Fluid.of('tfg:fluix', 144*16),) + Fluid.of('tfg:fluix', 144*16)) .itemOutputs('expatternprovider:assembler_matrix_frame') .duration(2000) .EUt(GTValues.VA[GTValues.LuV]) @@ -611,10 +611,10 @@ const registerExtendedAE2Recipes = (event) => { '4x ae2:logic_processor', '4x megacells:accumulation_processor', '16x #forge:rods/niobium_nitride', - '4x expatternprovider:ex_molecular_assembler',) + '4x expatternprovider:ex_molecular_assembler') .inputFluids( Fluid.of('gtceu:concrete', 144*8), - Fluid.of('tfg:cryogenized_fluix', 144*16),) + Fluid.of('tfg:cryogenized_fluix', 144*16)) .itemOutputs('8x expatternprovider:assembler_matrix_frame') .duration(2000) .EUt(GTValues.VA[GTValues.IV]) @@ -626,7 +626,7 @@ const registerExtendedAE2Recipes = (event) => { .itemInputs( '#forge:frames/polytetrafluoroethylene', 'gtceu:plascrete', - '6x gtceu:polytetrafluoroethylene_plate',) + '6x gtceu:polytetrafluoroethylene_plate') .inputFluids( Fluid.of('gtceu:concrete', 144*4)) .itemOutputs('expatternprovider:assembler_matrix_wall') @@ -639,7 +639,7 @@ const registerExtendedAE2Recipes = (event) => { .itemInputs( '#forge:frames/polytetrafluoroethylene', 'gtceu:cleanroom_glass', - '6x gtceu:polytetrafluoroethylene_plate',) + '6x gtceu:polytetrafluoroethylene_plate') .inputFluids( Fluid.of('gtceu:concrete', 144*4)) .itemOutputs("expatternprovider:assembler_matrix_glass") @@ -655,10 +655,10 @@ const registerExtendedAE2Recipes = (event) => { '4x gtceu:luv_robot_arm', '2x #forge:dense_plates/rhodium_plated_palladium', '#gtceu:circuits/zpm', - '2x #gtceu:circuits/luv',) + '2x #gtceu:circuits/luv') .inputFluids( Fluid.of('tfg:fluix', 144*16), - Fluid.of('gtceu:polybenzimidazole', 1430),) + Fluid.of('gtceu:polybenzimidazole', 1430)) .itemOutputs('expatternprovider:assembler_matrix_pattern') .duration(20*30) .EUt(GTValues.VA[GTValues.LuV]) @@ -671,10 +671,10 @@ const registerExtendedAE2Recipes = (event) => { '4x gtceu:iv_robot_arm', '2x #forge:dense_plates/tungsten_steel', '#gtceu:circuits/luv', - '2x #gtceu:circuits/iv',) + '2x #gtceu:circuits/iv') .inputFluids( Fluid.of('tfg:cryogenized_fluix', 144*8), - Fluid.of('gtceu:polybenzimidazole', 1430),) + Fluid.of('gtceu:polybenzimidazole', 1430)) .itemOutputs('2x expatternprovider:assembler_matrix_pattern') .duration(20*30) .EUt(GTValues.VA[GTValues.IV]) @@ -689,10 +689,10 @@ const registerExtendedAE2Recipes = (event) => { '4x gtceu:luv_field_generator', '2x #forge:dense_plates/rhodium_plated_palladium', '#gtceu:circuits/zpm', - '2x #gtceu:circuits/luv',) + '2x #gtceu:circuits/luv') .inputFluids( Fluid.of('tfg:fluix', 144*16), - Fluid.of('gtceu:polybenzimidazole', 1430),) + Fluid.of('gtceu:polybenzimidazole', 1430)) .itemOutputs('expatternprovider:assembler_matrix_crafter') .duration(20*30) .EUt(GTValues.VA[GTValues.LuV]) @@ -705,10 +705,10 @@ const registerExtendedAE2Recipes = (event) => { '4x gtceu:iv_field_generator', '2x #forge:dense_plates/tungsten_steel', '#gtceu:circuits/luv', - '2x #gtceu:circuits/iv',) + '2x #gtceu:circuits/iv') .inputFluids( Fluid.of('tfg:cryogenized_fluix', 144*8), - Fluid.of('gtceu:polybenzimidazole', 1430),) + Fluid.of('gtceu:polybenzimidazole', 1430)) .itemOutputs('2x expatternprovider:assembler_matrix_crafter') .duration(20*30) .EUt(GTValues.VA[GTValues.IV]) @@ -723,10 +723,10 @@ const registerExtendedAE2Recipes = (event) => { '4x gtceu:luv_conveyor_module', '2x #forge:dense_plates/rhodium_plated_palladium', '#gtceu:circuits/zpm', - '2x #gtceu:circuits/luv',) + '2x #gtceu:circuits/luv') .inputFluids( Fluid.of('tfg:fluix', 144*16), - Fluid.of('gtceu:polybenzimidazole', 1430),) + Fluid.of('gtceu:polybenzimidazole', 1430)) .itemOutputs('expatternprovider:assembler_matrix_speed') .duration(20*30) .EUt(GTValues.VA[GTValues.LuV]) @@ -739,10 +739,10 @@ const registerExtendedAE2Recipes = (event) => { '4x gtceu:iv_conveyor_module', '2x #forge:dense_plates/tungsten_steel', '#gtceu:circuits/luv', - '2x #gtceu:circuits/iv',) + '2x #gtceu:circuits/iv') .inputFluids( Fluid.of('tfg:cryogenized_fluix', 144*8), - Fluid.of('gtceu:polybenzimidazole', 1430),) + Fluid.of('gtceu:polybenzimidazole', 1430)) .itemOutputs('2x expatternprovider:assembler_matrix_speed') .duration(20*30) .EUt(GTValues.VA[GTValues.IV]) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index d0877d564..e4a81bb74 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -1,6 +1,9 @@ // priority: 0 "use strict"; +/** + * @param {Internal.RecipesEventJS} event + */ const registerFirmaLifeRecipes = (event) => { global.FIRMALIFE_DISABLED_ITEMS.forEach(item => { @@ -465,12 +468,12 @@ const registerFirmaLifeRecipes = (event) => { // Семена фруктов global.FIRMALIFE_GREENHOUSE_FRUIT_RECIPE_COMPONENTS.forEach(element => { - generateGreenHouseRecipe(event, element.input, element.fluid_amount, element.output, element.name, 'minecraft:overworld', 1) + generateGreenHouseRecipe(event, element.input, element.fluid_amount, element.output, element.name, 'minecraft:overworld', 8, null, GTValues.VA[GTValues.LV]) }) // Семена ягод global.FIRMALIFE_GREENHOUSE_BERRY_RECIPE_COMPONENTS.forEach(element => { - generateGreenHouseRecipe(event, element.input, element.fluid_amount, element.output, element.name, null, 1) + generateGreenHouseRecipe(event, element.input, element.fluid_amount, element.output, element.name, null, 8, null, GTValues.VA[GTValues.LV]) }) //#endregion diff --git a/kubejs/server_scripts/firmalife/tags.js b/kubejs/server_scripts/firmalife/tags.js index 3ac8edf6e..be575eae0 100644 --- a/kubejs/server_scripts/firmalife/tags.js +++ b/kubejs/server_scripts/firmalife/tags.js @@ -59,8 +59,8 @@ const registerFirmaLifeBlockTags = (event) => { ] greenhouse_tiers.forEach(tier => { - event.add('firmalife:always_valid_greenhouse_wall', 'firmalife:' + tier + '_greenhouse_door') - event.add('firmalife:always_valid_greenhouse_wall', 'firmalife:' + tier + '_greenhouse_trapdoor') + event.add('firmalife:always_valid_greenhouse_wall', `firmalife:${ tier }_greenhouse_door`) + event.add('firmalife:always_valid_greenhouse_wall', `firmalife:${ tier }_greenhouse_trapdoor`) }) //Allows any block with the word "brick" in its id to be used as oven insulation. diff --git a/kubejs/server_scripts/ftb_quests/CustomQuests.js b/kubejs/server_scripts/ftb_quests/CustomQuests.js index d368d2f26..b666cb826 100644 --- a/kubejs/server_scripts/ftb_quests/CustomQuests.js +++ b/kubejs/server_scripts/ftb_quests/CustomQuests.js @@ -1,8 +1,7 @@ "use strict"; // Handles the quest for drinking water. The drinking water quest checks if the player has this stage. -ItemEvents.firstRightClicked(evt => -{ +ItemEvents.firstRightClicked(evt => { const FORGE_CAPS = "ForgeCaps"; const TFC_PLAYERDATA = "tfc:player_data"; const FOOD = "food"; @@ -11,7 +10,7 @@ ItemEvents.firstRightClicked(evt => const STAGE = "tfg.stages.quests.drank_fresh_water_with_hand"; const {player, level} = evt; - if(evt.target.block == null) + if (evt.target.block === null) return; //We reach for the "food" compound tag, that contains the tfc thirst. @@ -23,8 +22,7 @@ ItemEvents.firstRightClicked(evt => //Do we already keep track of the previous thirst value? if not, put it and then return. let customData = getTFGPersistentDataRoot(player); let containsPreviousThirst = customData.contains(PREVIOUS_THIRST); - if(!containsPreviousThirst) - { + if (!containsPreviousThirst) { customData.putFloat(PREVIOUS_THIRST, thirstValue); return; } @@ -33,9 +31,8 @@ ItemEvents.firstRightClicked(evt => //As long as our new thirst is greater than our previous, it means we hydrated ourselves. OFC we need to make sure the block clicked was potable. let blockID = evt.target.block.id; - let isFreshWater = blockID == "minecraft:water" || blockID == "tfc:fluid/river_water"; - if(isFreshWater && thirstValue > previousThirstValue && !player.stages.has(STAGE)) - { + let isFreshWater = blockID === "minecraft:water" || blockID === "tfc:fluid/river_water"; + if (isFreshWater && thirstValue > previousThirstValue && !player.stages.has(STAGE)) { player.stages.add(STAGE); } //Put it back in. diff --git a/kubejs/server_scripts/ftb_quests/filters.js b/kubejs/server_scripts/ftb_quests/filters.js index cc111860f..cff91f4de 100644 --- a/kubejs/server_scripts/ftb_quests/filters.js +++ b/kubejs/server_scripts/ftb_quests/filters.js @@ -1,26 +1,22 @@ "use strict"; //#region Preservation Filter -FTBFilterSystemEvents.customFilter("HasPreservation", evt => -{ +FTBFilterSystemEvents.customFilter("HasPreservation", evt => { let stack = evt.getStack() let data = evt.getData() let foof = TFC.misc.getFood(stack) - if(foof == null) - { + if (foof === null) { evt.cancel() return } let trait = TFC.misc.getFoodTrait(data) - if(trait == null) - { + if (trait === null) { evt.cancel() return } - if(!foof.hasTrait(trait)) - { + if (!foof.hasTrait(trait)) { evt.cancel() } evt.success() diff --git a/kubejs/server_scripts/grapplemod/recipes.js b/kubejs/server_scripts/grapplemod/recipes.js index 409de9be2..61eac85bc 100644 --- a/kubejs/server_scripts/grapplemod/recipes.js +++ b/kubejs/server_scripts/grapplemod/recipes.js @@ -50,8 +50,7 @@ let $GrappleCustomization = Java.loadClass('com.yyon.grapplinghook.utils.Grapple * * @param {Internal.RecipesEventJS} event */ -function registerGrapplingHookRecipes(event) -{ +function registerGrapplingHookRecipes(event) { const ADDITIVE_UPGRADES_MINMAX = { maxLen: { nbt: "maxlen", maxValue: 200, minValue: 20}, @@ -199,12 +198,10 @@ function registerGrapplingHookRecipes(event) * @param {string} localizationToken A token to display as the item's name, only used in JEI to tell the end user what the upgrade does * @returns {Special.Recipes.ShapelessKubejs} The Recipe Builder */ - function shapelessUpgradeRecipe(upgradeItems, grappleCustomizationCallback, localizationToken) - { + function shapelessUpgradeRecipe(upgradeItems, grappleCustomizationCallback, localizationToken) { let inputs = ['grapplemod:grapplinghook'].concat(upgradeItems); let recipeBuilder = event.recipes.kubejs.shapeless(Item.of('grapplemod:grapplinghook').withName(Text.translate(localizationToken)), inputs); - recipeBuilder.modifyResult((grid, result) => - { + recipeBuilder.modifyResult((grid, result) => { let fallbackItem = Item.of('minecraft:air'); let orig = grid.find(Ingredient.of("grapplemod:grapplinghook")); @@ -212,8 +209,7 @@ function registerGrapplingHookRecipes(event) customization.loadNBT(orig.nbt.getCompound("custom")); result = grappleCustomizationCallback(customization, orig, result); - if(result == null) - { + if (result === null) { result = fallbackItem; return result; } @@ -221,12 +217,9 @@ function registerGrapplingHookRecipes(event) result.nbt.put("custom", customization.writeNBT()); result.nbt.put("Damage", orig.nbt.getInt("Damage")); - if(orig.hasCustomHoverName()) - { + if (orig.hasCustomHoverName()) { result.setHoverName(orig.hoverName); - } - else - { + } else { result.resetHoverName(); } return result; @@ -242,11 +235,9 @@ function registerGrapplingHookRecipes(event) * @param {string} localizationToken A token to display as the item's name, only used in JEI to tell the end user what the upgrade does * @returns {Special.Recipes.ShapedKubejs} The Recipe Builder */ - function shapedUpgradeRecipe(pattern, keyMap, grappleCustomizationCallback, localizationToken) - { + function shapedUpgradeRecipe(pattern, keyMap, grappleCustomizationCallback, localizationToken) { let recipeBuilder = event.recipes.kubejs.shaped(Item.of('grapplemod:grapplinghook').withName(Text.translate(localizationToken)), pattern, keyMap) - recipeBuilder.modifyResult((grid, result) => - { + recipeBuilder.modifyResult((grid, result) => { let fallbackItem = Item.of('minecraft:air'); let orig = grid.find(Ingredient.of("grapplemod:grapplinghook")); @@ -254,20 +245,16 @@ function registerGrapplingHookRecipes(event) customization.loadNBT(orig.nbt.getCompound("custom")); result = grappleCustomizationCallback(customization, orig, result); - if(result == null) - { + if (result === null) { result = fallbackItem; return result; } result.nbt.put("custom", customization.writeNBT()); result.nbt.put("Damage", orig.nbt.getInt("Damage")); - if(orig.hasCustomHoverName()) - { + if (orig.hasCustomHoverName()) { result.setHoverName(orig.hoverName); - } - else - { + } else { result.resetHoverName(); } return result; @@ -285,8 +272,7 @@ function registerGrapplingHookRecipes(event) A: 'gtceu:wrought_iron_pickaxe_head', B: 'firmaciv:rope_coil' }) - .modifyResult((craftingGrid, result) => - { + .modifyResult((craftingGrid, result) => { let grappleCustomization = new $GrappleCustomization(); grappleCustomization.setDefaults(); @@ -300,16 +286,13 @@ function registerGrapplingHookRecipes(event) //Repair event.recipes.kubejs.shapeless(Item.of('grapplemod:grapplinghook').withName(Text.translate("tfg.grapplemod.repair")), ['grapplemod:grapplinghook', 'gtceu:wrought_iron_dust']) - .modifyResult((craftingGrid, result) => - { - try - { + .modifyResult((craftingGrid, result) => { + try { let fallbackItem = Item.of("minecraft:air"); let orig = craftingGrid.find(Ingredient.of('grapplemod:grapplinghook')); let damage = orig.nbt.getInt("Damage"); - if(damage <= 0) - { + if (damage <= 0) { return fallbackItem; } let maxDamage = result.maxDamage; @@ -322,38 +305,30 @@ function registerGrapplingHookRecipes(event) result.nbt.put("custom", customization.writeNBT()); - if(orig.hasCustomHoverName()) - { + if (orig.hasCustomHoverName()) { result.setHoverName(orig.hoverName); - } - else - { + } else { result.resetHoverName(); } return result; - } - catch (exception) - { - console.log(exception); + } catch (exception) { + console.error(exception); } }).id('tfg:grapplemod/shapeless/repair'); //Upgrade: Max Length - shapelessUpgradeRecipe(['firmaciv:rope_coil'], (customization, orig, result) => - { + shapelessUpgradeRecipe(['firmaciv:rope_coil'], (customization, orig, result) => { let maxLen = customization.maxlen; - if(maxLen >= ADDITIVE_UPGRADES_MINMAX.maxLen.maxValue) + if (maxLen >= ADDITIVE_UPGRADES_MINMAX.maxLen.maxValue) return null; maxLen = Math.min(ADDITIVE_UPGRADES_MINMAX.maxLen.maxValue, maxLen + 20); customization.maxlen = maxLen; return result; }, 'tfg.grapplemod.upgrades.maxlen').id('tfg:grapplemod/upgrades/maxlen'); - shapelessUpgradeRecipe(['#forge:tools/knives'], (customization, orig, result) => - { + shapelessUpgradeRecipe(['#forge:tools/knives'], (customization, orig, result) => { let maxLen = customization.maxlen; - if(maxLen <= ADDITIVE_UPGRADES_MINMAX.maxLen.minValue) - { + if (maxLen <= ADDITIVE_UPGRADES_MINMAX.maxLen.minValue) { return null; } @@ -363,14 +338,11 @@ function registerGrapplingHookRecipes(event) }, 'tfg.grapplemod.downgrades.maxlen').replaceIngredient('grapplemod:grapplinghook', 'firmaciv:rope_coil').id("tfg:grapplemod/downgrades/maxlen_decrease") //Upgrade: Motor - motorUpgrades.forEach(motorUpgradeType => - { + motorUpgrades.forEach(motorUpgradeType => { //Add motor - shapelessUpgradeRecipe([`gtceu:${motorUpgradeType.electricTier}_electric_motor`], (customization, orig, result) => - { + shapelessUpgradeRecipe([`gtceu:${motorUpgradeType.electricTier}_electric_motor`], (customization, orig, result) => { //If this already has a motor, disallow the recipe - if(customization.motor) - { + if (customization.motor) { return null; } @@ -381,24 +353,15 @@ function registerGrapplingHookRecipes(event) }, `tfg.grapplemod.upgrades.motor.${motorUpgradeType.electricTier}`).id(`tfg:grapplemod/upgrades/motor/${motorUpgradeType.electricTier}`); //Remove Motor - shapelessUpgradeRecipe([`gtceu:${motorUpgradeType.electricTier}_electric_motor`, '#forge:tools/hammers'], (customization, orig, result) => - { + shapelessUpgradeRecipe([`gtceu:${motorUpgradeType.electricTier}_electric_motor`, '#forge:tools/hammers'], (customization, orig, result) => { let motorMaxSpeed = motorUpgradeType.motorMaxSpeed; let motorAcceleration = motorUpgradeType.motorAcceleration; - if(!customization.motor) - { + if (!customization.motor) { return null; } - if(customization.motormaxspeed != motorMaxSpeed) - { - return null; - } - - if(customization.motoracceleration != motorAcceleration) - { - return null; - } + if (customization.motormaxspeed !== motorMaxSpeed) return null; + if (customization.motoracceleration !== motorAcceleration) return null; customization.motor = false; customization.motormaxspeed = 0; @@ -411,15 +374,12 @@ function registerGrapplingHookRecipes(event) }) //Enable Smart Motor - shapelessUpgradeRecipe(['gtceu:basic_electronic_circuit'], (customization, orig, result) => - { - if(!customization.motor) - { + shapelessUpgradeRecipe(['gtceu:basic_electronic_circuit'], (customization, orig, result) => { + if (!customization.motor) { return null; } - if(customization.smartmotor || customization.smartdoublemotor) - { + if (customization.smartmotor || customization.smartdoublemotor) { return null; } @@ -429,10 +389,8 @@ function registerGrapplingHookRecipes(event) }, 'tfg.grapplemod.upgrades.smart_motor').id('tfg:grapplemod/upgrades/smart_motor'); //Disable Smart Motor - shapelessUpgradeRecipe(['gtceu:basic_electronic_circuit', '#forge:tools/hammers'], (customization, orig, result) => - { - if(!customization.smartmotor || !customization.smartdoublemotor) - { + shapelessUpgradeRecipe(['gtceu:basic_electronic_circuit', '#forge:tools/hammers'], (customization, orig, result) => { + if (!customization.smartmotor || !customization.smartdoublemotor) { return null; } @@ -445,10 +403,8 @@ function registerGrapplingHookRecipes(event) .id('tfg:grapplemod/downgrades/smart_motor'); //Enable Sticky Rope - shapelessUpgradeRecipe(['gtceu:sticky_resin'], (customization, orig, result) => - { - if(customization.sticky) - { + shapelessUpgradeRecipe(['gtceu:sticky_resin'], (customization, orig, result) => { + if (customization.sticky) { return null; } @@ -458,10 +414,8 @@ function registerGrapplingHookRecipes(event) .id('tfg:grapplemod/upgrades/sticky') //Disable Sticky Rope - shapelessUpgradeRecipe(['gtceu:sticky_resin', '#forge:tools/hammers'], (customization, orig, result) => - { - if(!customization.sticky) - { + shapelessUpgradeRecipe(['gtceu:sticky_resin', '#forge:tools/hammers'], (customization, orig, result) => { + if (!customization.sticky) { return null; } @@ -473,13 +427,10 @@ function registerGrapplingHookRecipes(event) .id('tfg:grapplemod/downgrades/sticky') //Upgrade: Forcefield - forcefieldUpgrades.forEach(forcefieldUpgradeType => - { + forcefieldUpgrades.forEach(forcefieldUpgradeType => { //Add Forcefield - shapelessUpgradeRecipe([`gtceu:${forcefieldUpgradeType.electricTier}_field_generator`], (customization, orig, result) => - { - if(customization.repel) - { + shapelessUpgradeRecipe([`gtceu:${forcefieldUpgradeType.electricTier}_field_generator`], (customization, orig, result) => { + if (customization.repel) { return null; } @@ -489,14 +440,12 @@ function registerGrapplingHookRecipes(event) }, `tfg.grapplemod.upgrades.forcefield.${forcefieldUpgradeType.electricTier}`).id(`tfg:grapplemod/upgrades/forcefield/${forcefieldUpgradeType.electricTier}`); //Remove Forcefield - shapelessUpgradeRecipe([`gtceu:${forcefieldUpgradeType.electricTier}_field_generator`, '#forge:tools/hammers'], (customization, orig, result) => - { + shapelessUpgradeRecipe([`gtceu:${forcefieldUpgradeType.electricTier}_field_generator`, '#forge:tools/hammers'], (customization, orig, result) => { let repelForce = forcefieldUpgradeType.repelForce; - if(!customization.repel) + if (!customization.repel) return null; - if(customization.repelforce != repelForce) - { + if (customization.repelforce !== repelForce) { return null; } @@ -509,13 +458,10 @@ function registerGrapplingHookRecipes(event) .id(`tfg:grapplemod/downgrades/forcefield/${forcefieldUpgradeType.electricTier}`); }) //Upgrade: Magnet - magnetUpgrades.forEach(magnetUpgradeTier => - { + magnetUpgrades.forEach(magnetUpgradeTier => { //Add Magnet - shapelessUpgradeRecipe([`gtceu:${magnetUpgradeTier.ingotName}`], (customization, orig, result) => - { - if(customization.attract) - { + shapelessUpgradeRecipe([`gtceu:${magnetUpgradeTier.ingotName}`], (customization, orig, result) => { + if (customization.attract) { return null; } @@ -525,18 +471,11 @@ function registerGrapplingHookRecipes(event) }, `tfg.grapplemod.upgrades.magnet.${magnetUpgradeTier.ingotName}`).id(`tfg:grapplemod/upgrades/magnet/${magnetUpgradeTier.ingotName}`); //Remove Magnet - shapelessUpgradeRecipe([`gtceu:${magnetUpgradeTier.ingotName}`, '#forge:tools/hammers'], (customization, orig, result) => - { + shapelessUpgradeRecipe([`gtceu:${magnetUpgradeTier.ingotName}`, '#forge:tools/hammers'], (customization, orig, result) => { let attractionRadius = magnetUpgradeTier.attractionRadius; - if(!customization.attract) - { - return null; - } - - if(customization.attractradius != attractionRadius) - { - return null; - } + + if (!customization.attract) return null; + if (customization.attractradius !== attractionRadius) return null; customization.attract = false; customization.attractradius = attractionRadius; @@ -548,21 +487,14 @@ function registerGrapplingHookRecipes(event) }) //Set gravity to 0.5 - shapelessUpgradeRecipe(['gtceu:helium_bucket'], (customization, orig, result) => - { - if(customization.hookgravity != 1) - { - return null; - } - + shapelessUpgradeRecipe(['gtceu:helium_bucket'], (customization, orig, result) => { + if (customization.hookgravity !== 1) return null; customization.hookgravity = 0.5; return result; }, `tfg.grapplemod.upgrades.gravity.0.5`).id('tfg:grapplemod/upgrades/gravity/0.5'); //Set gravity to 1, from 0.5 - shapelessUpgradeRecipe(['minecraft:bucket', '#forge:tools/hammers'], (customization, orig, result) => - { - if(customization.hookgravity != 0.5) - { + shapelessUpgradeRecipe(['minecraft:bucket', '#forge:tools/hammers'], (customization, orig, result) => { + if (customization.hookgravity !== 0.5) { return null; } customization.hookgravity = 1; @@ -572,10 +504,8 @@ function registerGrapplingHookRecipes(event) .id('tfg:grapplemod/downgrades/gravity/0.5'); //Set gravity to 0 - shapelessUpgradeRecipe(['gtceu:gravitation_engine_unit'], (customization, orig, result) => - { - if(customization.hookgravity != 1) - { + shapelessUpgradeRecipe(['gtceu:gravitation_engine_unit'], (customization, orig, result) => { + if (customization.hookgravity !== 1) { return null; } @@ -583,10 +513,8 @@ function registerGrapplingHookRecipes(event) return result; }, 'tfg.grapplemod.upgrades.gravity.0').id('tfg:grapplemod/upgrades/gravity/0'); //Set gravity to 1, from 0 - shapelessUpgradeRecipe(['gtceu:tungsten_block', '#forge:tools/hammers'], (customization, orig, result) => - { - if(customization.hookgravity != 0) - { + shapelessUpgradeRecipe(['gtceu:tungsten_block', '#forge:tools/hammers'], (customization, orig, result) => { + if (customization.hookgravity !== 0) { return null; } @@ -598,13 +526,10 @@ function registerGrapplingHookRecipes(event) .id('tfg:grapplemod/downgrades/gravity/0') //Upgrade: Throw Speed - throwUpgrades.forEach(throwUpgradeType => - { + throwUpgrades.forEach(throwUpgradeType => { //Add Throwspeed - shapelessUpgradeRecipe([`gtceu:${throwUpgradeType.electricTier}_electric_piston`], (customization, orig, result) => - { - if(customization.throwspeed != 2) - { + shapelessUpgradeRecipe([`gtceu:${throwUpgradeType.electricTier}_electric_piston`], (customization, orig, result) => { + if (customization.throwspeed !== 2) { return null; } @@ -613,12 +538,10 @@ function registerGrapplingHookRecipes(event) }, `tfg.grapplemod.upgrades.throwspeed.${throwUpgradeType.electricTier}`).id(`tfg:grapplemod/upgrades/throwspeed/${throwUpgradeType.electricTier}`); //Remove Throwspeed - shapelessUpgradeRecipe([`gtceu:${throwUpgradeType.electricTier}_electric_piston`, '#forge:tools/hammers'], (customization, orig, result) => - { + shapelessUpgradeRecipe([`gtceu:${throwUpgradeType.electricTier}_electric_piston`, '#forge:tools/hammers'], (customization, orig, result) => { let throwSpeed = throwUpgradeType.throwSpeed; - if(customization.throwspeed != throwSpeed) - { + if (customization.throwspeed !== throwSpeed) { return null; } @@ -631,10 +554,8 @@ function registerGrapplingHookRecipes(event) }) //Add Double Hook - shapelessUpgradeRecipe(['gtceu:black_steel_pickaxe_head'], (customization, orig, result) => - { - if(customization.doublehook) - { + shapelessUpgradeRecipe(['gtceu:black_steel_pickaxe_head'], (customization, orig, result) => { + if (customization.doublehook) { return null; } @@ -645,10 +566,8 @@ function registerGrapplingHookRecipes(event) }, 'tfg.grapplemod.upgrades.doublehook').id('tfg:grapplemod/upgrades/doublehook') //Remove Double Hook - shapelessUpgradeRecipe(['gtceu:black_steel_pickaxe_head', '#forge:tools/hammers'], (customization, orig, result) => - { - if(!customization.doublehook) - { + shapelessUpgradeRecipe(['gtceu:black_steel_pickaxe_head', '#forge:tools/hammers'], (customization, orig, result) => { + if (!customization.doublehook) { return null; } @@ -668,10 +587,8 @@ function registerGrapplingHookRecipes(event) ],{ A: '#forge:tools/wrenches', B: 'grapplemod:grapplinghook' - }, (customization, orig, result) => - { - if(customization.verticalthrowangle >= ADDITIVE_UPGRADES_MINMAX.verticalThrowAngle.maxValue) - { + }, (customization, orig, result) => { + if (customization.verticalthrowangle >= ADDITIVE_UPGRADES_MINMAX.verticalThrowAngle.maxValue) { return null; } @@ -686,10 +603,8 @@ function registerGrapplingHookRecipes(event) ],{ A: 'grapplemod:grapplinghook', B: '#forge:tools/wrenches', - }, (customization, orig, result) => - { - if(customization.verticalthrowangle <= ADDITIVE_UPGRADES_MINMAX.verticalThrowAngle.minValue) - { + }, (customization, orig, result) => { + if (customization.verticalthrowangle <= ADDITIVE_UPGRADES_MINMAX.verticalThrowAngle.minValue) { return null; } @@ -704,15 +619,12 @@ function registerGrapplingHookRecipes(event) ],{ A: 'grapplemod:grapplinghook', B: '#forge:tools/screwdrivers' - }, (customization, orig, result) => - { - if(!customization.doublehook) - { + }, (customization, orig, result) => { + if (!customization.doublehook) { return null; } - if(customization.angle >= ADDITIVE_UPGRADES_MINMAX.angle.maxValue) - { + if (customization.angle >= ADDITIVE_UPGRADES_MINMAX.angle.maxValue) { return null; } @@ -726,15 +638,12 @@ function registerGrapplingHookRecipes(event) ],{ A: '#forge:tools/screwdrivers', B: 'grapplemod:grapplinghook', - }, (customization, orig, result) => - { - if(!customization.doublehook) - { + }, (customization, orig, result) => { + if (!customization.doublehook) { return null; } - if(customization.angle <= ADDITIVE_UPGRADES_MINMAX.angle.minValue) - { + if (customization.angle <= ADDITIVE_UPGRADES_MINMAX.angle.minValue) { return null; } diff --git a/kubejs/server_scripts/greate/recipes.js b/kubejs/server_scripts/greate/recipes.js index b77afdcb5..40229b54c 100644 --- a/kubejs/server_scripts/greate/recipes.js +++ b/kubejs/server_scripts/greate/recipes.js @@ -1,6 +1,9 @@ // priority: 0 "use strict"; +/** + * @param {Internal.RecipesEventJS} event + */ function registerGreateRecipes(event) { removeGreateRecipes(event) diff --git a/kubejs/server_scripts/greate/recipes.recycling.js b/kubejs/server_scripts/greate/recipes.recycling.js index d4d1d6dfd..5f5c66785 100644 --- a/kubejs/server_scripts/greate/recipes.recycling.js +++ b/kubejs/server_scripts/greate/recipes.recycling.js @@ -1,6 +1,9 @@ // priority: 0 "use strict"; +/** + * @param {Internal.RecipesEventJS} event + */ function registerGreateRecyclingRecipes(event) { // #region Shafts diff --git a/kubejs/server_scripts/greate/recipes.removes.js b/kubejs/server_scripts/greate/recipes.removes.js index 8885b73ab..14589029e 100644 --- a/kubejs/server_scripts/greate/recipes.removes.js +++ b/kubejs/server_scripts/greate/recipes.removes.js @@ -1,6 +1,9 @@ // priority: 0 "use strict"; +/** + * @param {Internal.RecipesEventJS} event + */ function removeGreateRecipes(event) { global.GREATE_DISABLED_ITEMS.forEach(item => { diff --git a/kubejs/server_scripts/gregtech/data.js b/kubejs/server_scripts/gregtech/data.js index bd339e5dc..054b75b0d 100644 --- a/kubejs/server_scripts/gregtech/data.js +++ b/kubejs/server_scripts/gregtech/data.js @@ -29,7 +29,7 @@ const registerGTCEUHeats = (event) => { forEachMaterial(material => { let tfcProperty = material.getProperty(TFGPropertyKey.TFC_PROPERTY) - if (tfcProperty != null) { + if (tfcProperty !== null) { makeItemHeatByTagPrefix(TagPrefix.dustTiny, material, tfcProperty, 0.357) makeItemHeatByTagPrefix(TagPrefix.dustSmall, material, tfcProperty, 0.714) makeItemHeatByTagPrefix(TagPrefix.dust, material, tfcProperty, 1.429) diff --git a/kubejs/server_scripts/gregtech/events.js b/kubejs/server_scripts/gregtech/events.js index d3b5d31ad..fb3458f0f 100644 --- a/kubejs/server_scripts/gregtech/events.js +++ b/kubejs/server_scripts/gregtech/events.js @@ -2,7 +2,7 @@ PlayerEvents.tick((event) => { const { player } = event; - if (player.age % 100 == 0 && player.legsArmorItem == 'gtceu:nanomuscle_leggings') { + if (player.age % 100 === 0 && player.legsArmorItem === 'gtceu:nanomuscle_leggings') { player.potionEffects.add("minecraft:speed", 350, 1, true, false); } }); diff --git a/kubejs/server_scripts/gregtech/loot.js b/kubejs/server_scripts/gregtech/loot.js index afed21c16..4769360d6 100644 --- a/kubejs/server_scripts/gregtech/loot.js +++ b/kubejs/server_scripts/gregtech/loot.js @@ -168,19 +168,14 @@ const registerGTCEULoots = (event) => { // I LOVE LOOTJS I LOVE LOOTJS I LOVE LOOTJS let rawOreBlock = `:${ChemicalHelper.get(TagPrefix.rawOreBlock, material, 1).getItem()}`; - if (material == GTMaterials.Copper || material == GTMaterials.Gold || material == GTMaterials.Iron) - { - rawOreBlock = "minecraft" + rawOreBlock; - } - else if (material == TFGHelpers.getMaterial('desh') - || material == TFGHelpers.getMaterial('ostrum') - || material == TFGHelpers.getMaterial('calorite')) - { - rawOreBlock = "ad_astra" + rawOreBlock; - } - else - { - rawOreBlock = "gtceu" + rawOreBlock; + if (material === GTMaterials.Copper || material === GTMaterials.Gold || material === GTMaterials.Iron) { + rawOreBlock = `minecraft${ rawOreBlock}`; + } else if (material === TFGHelpers.getMaterial('desh') + || material === TFGHelpers.getMaterial('ostrum') + || material === TFGHelpers.getMaterial('calorite')) { + rawOreBlock = `ad_astra${ rawOreBlock}`; + } else { + rawOreBlock = `gtceu${ rawOreBlock}`; } event.addBlockLootModifier(rawOreBlock) @@ -198,10 +193,10 @@ const registerGTCEULoots = (event) => { let stoneTypeMaterial = TFGHelpers.getMaterial(stoneType) // Material doesn't work here because of reasons - if (stoneTypeMaterial == null) { - if (stoneType == "pyroxenite") + if (stoneTypeMaterial === null) { + if (stoneType === "pyroxenite") stoneTypeMaterial = GTMaterials.Blackstone; - else if (stoneType == "deepslate") + else if (stoneType === "deepslate") stoneTypeMaterial = GTMaterials.Deepslate; } diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index be5fc7682..66b495d7a 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1010,11 +1010,11 @@ const registerGTCEURecipes = (event) => { forEachMaterial(material => { const tfcProperty = material.getProperty(TFGPropertyKey.TFC_PROPERTY) - if (tfcProperty == null) + if (tfcProperty === null) return; - const outputMaterial = tfcProperty.getOutputMaterial() == null ? material : tfcProperty.getOutputMaterial() - if (outputMaterial == GTMaterials.Iron) { + const outputMaterial = tfcProperty.getOutputMaterial() === null ? material : tfcProperty.getOutputMaterial() + if (outputMaterial === GTMaterials.Iron) { event.recipes.gtceu.steam_bloomery(`steam_raw_iron_bloom_coal_${material.getName()}`) .itemInputs(ChemicalHelper.get(TagPrefix.dust, material, 1), '#tfc:steam_bloomery_basic_fuels') .itemOutputs('tfc:raw_iron_bloom') @@ -1131,48 +1131,12 @@ const registerGTCEURecipes = (event) => { //#endregion - //#region Credits - - event.remove({ id: 'gtceu:forming_press/credit_cupronickel' }) - - event.recipes.gtceu.forming_press('gtceu:copper_credit') - .itemInputs('#forge:ingots/copper') - .notConsumable('gtceu:credit_casting_mold') - .itemOutputs('8x gtceu:copper_credit') - .duration(50) - .EUt(2) - - event.recipes.tfc.anvil('8x gtceu:copper_credit', '#forge:ingots/copper', ['bend_last', 'punch_not_last', 'draw_not_last']) - .tier(1) - .id(`tfc:anvil/copper_credit`) - - event.recipes.tfc.heating('gtceu:copper_credit', GTMaterials.Copper.getProperty(TFGPropertyKey.TFC_PROPERTY).getMeltTemp()) - .resultFluid(Fluid.of(GTMaterials.Copper.getFluid(), 144 / 8)) - .id(`tfc:heating/copper_credit`) - - event.custom({ - type: 'vintageimprovements:curving', - ingredients: [{ tag: 'forge:ingots/copper' }], - itemAsHead: 'gtceu:credit_casting_mold', - results: [{ item: 'gtceu:copper_credit', count: 8 }], - processingTime: 50 - }).id(`tfg:vi/curving/copper_credit`) - - event.recipes.gtceu.extractor('gtceu:copper_credit') - .itemInputs('gtceu:copper_credit') - .outputFluids(Fluid.of(GTMaterials.Copper.getFluid(), 144 / 8)) - .category(GTRecipeCategories.EXTRACTOR_RECYCLING) - .duration(10) - .EUt(2) - - //#endregion - //#region GT Facades event.shapeless(Item.of('gtceu:facade_cover', 8, '{Facade: {Count:1b,id:"minecraft:stone"}}'), ['3x #forge:plates/iron', "#tfg:whitelisted/facades"]) .modifyResult((craftingGrid, result) => { let blockID = craftingGrid.find(Ingredient.of("#tfg:whitelisted/facades")).id - let facadeNBT = "{Facade: {Count:1b,id:" + "'" + blockID + "'" + "}}" + let facadeNBT = `{Facade: {Count:1b,id:` + `'${ blockID }'` + `}}` result.nbt = facadeNBT return result; }).id('gtceu:facade_cover'); @@ -1181,7 +1145,7 @@ const registerGTCEURecipes = (event) => { .modifyResult((craftingGrid, result) => { let blockID = craftingGrid.find(Ingredient.of("#tfg:whitelisted/facades")).id - let facadeNBT = "{Facade: {Count:1b,id:" + "'" + blockID + "'" + "}}" + let facadeNBT = `{Facade: {Count:1b,id:` + `'${ blockID }'` + `}}` result.nbt = facadeNBT return result; }).id('gtceu:facade_cover32'); diff --git a/kubejs/server_scripts/gregtech/recipes.machines.js b/kubejs/server_scripts/gregtech/recipes.machines.js index 20dd50645..fcaa32d7f 100644 --- a/kubejs/server_scripts/gregtech/recipes.machines.js +++ b/kubejs/server_scripts/gregtech/recipes.machines.js @@ -1,6 +1,9 @@ // priority: 0 "use strict"; +/** + * @param {Internal.RecipesEventJS} event + */ function registerGTCEuMachineRecipes(event) { //#region Выход: Filter Casing diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index 670ffd3bb..bc9b8a375 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -1,22 +1,32 @@ // priority: 0 "use strict"; +/** + * @param {Internal.RecipesEventJS} event + */ function registerGTCEUMetalRecipes(event) { - const makeToolRecipe = (toolType, headTagPrefix, extruderMold, cirucitMeta, material) => { + /** + * @param {GTToolType} toolType + * @param {TagPrefix} headTagPrefix + * @param {Internal.ItemStack} extruderMold + * @param {number} circuitMeta + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + * @returns + */ + function makeToolRecipe(toolType, headTagPrefix, extruderMold, circuitMeta, material) { const toolItem = ToolHelper.get(toolType, material) - if (toolItem.isEmpty()) - return + + if (toolItem.isEmpty()) return const toolHeadItem = ChemicalHelper.get(headTagPrefix, material, 1) - if (toolHeadItem.isEmpty()) - return + + if (toolHeadItem.isEmpty()) return // Skip this one because it has a duping bug, and you can't remove the macerator/arc furnace iron pick recipes - if (material == GTMaterials.Iron) - return; + if (material === GTMaterials.Iron) return; - if (toolType == GTToolType.WRENCH) { + if (toolType === GTToolType.WRENCH) { event.recipes.tfc.advanced_shaped_crafting( TFC.itemStackProvider.of(toolItem).copyForgingBonus().copyHeat(), [ 'ABC', @@ -28,8 +38,7 @@ function registerGTCEUMetalRecipes(event) { D: `#forge:bolts/${material.getName()}` }, 0, 0) .id(`gtceu:shaped/${toolType.name}_${material.getName()}`) - } - else if (toolType == GTToolType.WIRE_CUTTER) { + } else if (toolType === GTToolType.WIRE_CUTTER) { event.recipes.tfc.advanced_shaped_crafting( TFC.itemStackProvider.of(toolItem).copyForgingBonus().copyHeat(), [ ' AD', @@ -41,18 +50,24 @@ function registerGTCEUMetalRecipes(event) { D: '#forge:tools/screwdrivers' }, 0, 1) .id(`gtceu:shaped/${toolType.name}_${material.getName()}`) - } - else { + } else { event.recipes.tfc.advanced_shapeless_crafting( TFC.itemStackProvider.of(toolItem).copyForgingBonus().copyHeat(), [toolHeadItem, '#forge:rods/wooden'], toolHeadItem) .id(`gtceu:shaped/${toolType.name}_${material.getName()}`) } - processToolHead(headTagPrefix, extruderMold, cirucitMeta, material) + processToolHead(headTagPrefix, extruderMold, circuitMeta, material) } - const processToolHead = (headTagPrefix, extruderMold, cirucitMeta, material) => { + /** + * @param {TagPrefix} headTagPrefix + * @param {Internal.ItemStack} extruderMold + * @param {number} circuitMeta + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ + function processToolHead(headTagPrefix, extruderMold, circuitMeta, material) { + const toolHeadItem = ChemicalHelper.get(headTagPrefix, material, 1) if (toolHeadItem.isEmpty()) return @@ -61,10 +76,10 @@ function registerGTCEUMetalRecipes(event) { if (material.hasProperty(PropertyKey.INGOT)) { const ingotItem = ChemicalHelper.get(TagPrefix.ingot, material, 1) - if (ingotItem.isEmpty() || ingotItem.hasTag('c:hidden_from_recipe_viewers')) + if (ingotItem.isEmpty() || ingotItem.hasTag('c:hidden_from_recipe_viewers')) return - const materialAmount = Math.floor(headTagPrefix.materialAmount() / GTValues.M) == 1 ? 1 : 2; + const materialAmount = Math.floor(headTagPrefix.materialAmount() / GTValues.M) === 1 ? 1 : 2; event.recipes.gtceu.extruder(`tfg:extrude_${material.getName()}_ingot_to_${new String(headTagPrefix.name).toLowerCase()}_head`) .itemInputs(ingotItem.copyWithCount(materialAmount)) @@ -74,7 +89,7 @@ function registerGTCEUMetalRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) let ingotArray = []; - for (var i = 0; i < materialAmount; i++) + for (let i = 0; i < materialAmount; i++) ingotArray.push(ingotItem) event.custom({ @@ -99,7 +114,7 @@ function registerGTCEUMetalRecipes(event) { .category(GTRecipeCategories.ARC_FURNACE_RECYCLING) .EUt(GTValues.VA[GTValues.LV]) - if (GTMaterials.Stone != material) { + if (GTMaterials.Stone !== material) { event.recipes.gtceu.extractor(`tfg:extract_${material.getName()}_${new String(headTagPrefix.name).toLowerCase()}_head`) .itemInputs(toolHeadItem) .outputFluids(Fluid.of(material.getFluid(), materialAmount * 144)) @@ -117,7 +132,7 @@ function registerGTCEUMetalRecipes(event) { event.recipes.gtceu.laser_engraver(`tfg:engrave_${material.getName()}_gem_to_${new String(headTagPrefix.name).toLowerCase()}_head`) .itemInputs(gemItem.copyWithCount(Math.floor(headTagPrefix.materialAmount() / GTValues.M))) .notConsumable(ChemicalHelper.get(TagPrefix.lens, GTMaterials.Glass, 1)) - .circuit(cirucitMeta) + .circuit(circuitMeta) .itemOutputs(toolHeadItem) .duration(material.getMass() * 6) .EUt(GTValues.VA[GTValues.LV]) @@ -132,7 +147,11 @@ function registerGTCEUMetalRecipes(event) { // else: ignore :3 } - const processToolMortar = (toolType, material) => { + /** + * @param {GTToolType} toolType + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ + function processToolMortar(toolType, material) { const toolItem = ToolHelper.get(toolType, material) if (toolItem.isEmpty()) return @@ -155,14 +174,16 @@ function registerGTCEUMetalRecipes(event) { ).id(`gtceu:shaped/mortar_${material.getName()}`) } - const processIngot = (material) => { + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ + function processIngot(material) { const ingotStack = ChemicalHelper.get(TagPrefix.ingot, material, 1) if (material.hasFlag(MaterialFlags.GENERATE_PLATE) - && material != GTMaterials.Wood - && material != GTMaterials.TreatedWood - && !material.hasProperty(PropertyKey.POLYMER)) - { + && material !== GTMaterials.Wood + && material !== GTMaterials.TreatedWood + && !material.hasProperty(PropertyKey.POLYMER)) { const plateStack = ChemicalHelper.get(TagPrefix.plate, material, 1) const blockStack = ChemicalHelper.get(TagPrefix.block, material, 1) @@ -177,9 +198,9 @@ function registerGTCEUMetalRecipes(event) { //processingTime: material.getMass() // TODO - controlled by a global config argh }).id(`tfg:rolling/${material.getName()}_plate`) - if (!blockStack.isEmpty() && GTMaterials.Stone != material) { + if (!blockStack.isEmpty() && GTMaterials.Stone !== material) { let ingotArray = []; - for (var i = 0; i < matAmount; i++) + for (let i = 0; i < matAmount; i++) ingotArray.push(ingotStack) // 9х Слиток -> Блок @@ -189,8 +210,7 @@ function registerGTCEUMetalRecipes(event) { .heated() .id(`greate:compacting/${material.getName()}_block`) } - } - else { + } else { if (!blockStack.isEmpty() && !blockStack.hasTag('c:hidden_from_recipe_viewers')) { // Блок из гемов -> 9 Пластин event.recipes.greate.cutting(plateStack.withCount(matAmount), blockStack) @@ -201,23 +221,27 @@ function registerGTCEUMetalRecipes(event) { } } - const processPlate = (material) => { + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ + function processPlate(material) { const item = ChemicalHelper.get(TagPrefix.plate, material, 1) - if (item.isEmpty()) - return + if (item.isEmpty()) return event.remove({ id: `gtceu:shaped/plate_${material.getName()}` }) } - const processPlateDouble = (material) => { + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ + function processPlateDouble(material) { const doublePlateItem = ChemicalHelper.get(TagPrefix.plateDouble, material, 1) - if (doublePlateItem.isEmpty() || doublePlateItem.hasTag('c:hidden_from_recipe_viewers')) - return + if (doublePlateItem.isEmpty() || doublePlateItem.hasTag('c:hidden_from_recipe_viewers')) return const plateItem = ChemicalHelper.get(TagPrefix.plate, material, 1) event.remove({ id: `gtceu:shaped/plate_double_${material.getName()}` }) - if (material == GTMaterials.CobaltBrass) { + if (material === GTMaterials.CobaltBrass) { event.recipes.greate.compacting(doublePlateItem, [plateItem, plateItem, 'tfc:powder/flux']) .heated() .recipeTier(1) @@ -229,8 +253,7 @@ function registerGTCEUMetalRecipes(event) { .circuit(2) .duration(20 * 5.8) .EUt(24) - } - else if (material.getProperty(TFGPropertyKey.TFC_PROPERTY) == null) { + } else if (material.getProperty(TFGPropertyKey.TFC_PROPERTY) === null) { event.recipes.greate.compacting(doublePlateItem, [plateItem, plateItem, 'tfc:powder/flux']) .heated() .recipeTier(2) @@ -238,7 +261,10 @@ function registerGTCEUMetalRecipes(event) { } } - const processBlock = (material) => { + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ + function processBlock(material) { const item = ChemicalHelper.get(TagPrefix.block, material, 1) if (item.isEmpty()) return @@ -246,11 +272,14 @@ function registerGTCEUMetalRecipes(event) { event.remove({ id: `gtceu:compressor/compress_${material.getName()}_to_block` }) } - const processFoil = (material) => { + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ + function processFoil(material) { const foilItem = ChemicalHelper.get(TagPrefix.foil, material, 4) const plateItem = ChemicalHelper.get(TagPrefix.plate, material, 1) - if (plateItem != null && foilItem != null && !plateItem.hasTag('c:hidden_from_recipe_viewers')) { + if (plateItem !== null && foilItem !== null && !plateItem.hasTag('c:hidden_from_recipe_viewers')) { event.custom({ type: "createaddition:rolling", input: plateItem, @@ -261,9 +290,12 @@ function registerGTCEUMetalRecipes(event) { } } - const processRodLong = (material) => { + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ + function processRodLong(material) { const longRodItem = ChemicalHelper.get(TagPrefix.rodLong, material, 1) - if (longRodItem.isEmpty() || longRodItem.hasTag('c:hidden_from_recipe_viewers')) + if (longRodItem.isEmpty() || longRodItem.hasTag('c:hidden_from_recipe_viewers')) return const shortRodItem = ChemicalHelper.get(TagPrefix.rod, material, 1) if (shortRodItem.isEmpty() || shortRodItem.hasTag('c:hidden_from_recipe_viewers')) @@ -272,7 +304,7 @@ function registerGTCEUMetalRecipes(event) { event.remove({ id: `gtceu:shaped/stick_long_stick_${material.getName()}` }) // Rod welding recipes for all of the other non-tfc materials, since those were handled in tfc/recipes.materials.js - if (material.getProperty(TFGPropertyKey.TFC_PROPERTY) == null) { + if (material.getProperty(TFGPropertyKey.TFC_PROPERTY) === null) { event.recipes.greate.compacting(longRodItem, [shortRodItem, shortRodItem, 'tfc:powder/flux']) .heated() .recipeTier(1) @@ -280,7 +312,10 @@ function registerGTCEUMetalRecipes(event) { } } - const processIngotDouble = (material) => { + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ + function processIngotDouble(material) { if (!material.hasFlag(TFGMaterialFlags.GENERATE_DOUBLE_INGOTS)) return; @@ -321,7 +356,10 @@ function registerGTCEUMetalRecipes(event) { .circuit(3) } - const processSmallOre = (material) => { + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ + function processSmallOre(material) { if (!material.hasFlag(TFGMaterialFlags.HAS_SMALL_TFC_ORE)) return; const smallOre = ChemicalHelper.get(TFGTagPrefix.oreSmall, material, 1); @@ -335,6 +373,9 @@ function registerGTCEUMetalRecipes(event) { .EUt(GTValues.VA[GTValues.ULV]) } + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ const processSmallNativeOre = (material) => { if (!material.hasFlag(TFGMaterialFlags.HAS_SMALL_NATIVE_TFC_ORE)) return; @@ -349,24 +390,23 @@ function registerGTCEUMetalRecipes(event) { .EUt(GTValues.VA[GTValues.ULV]) } + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ const processPoorRawOre = (material) => { const poorOreItem = ChemicalHelper.get(TFGTagPrefix.poorRawOre, material, 1) const crushedOreItem = ChemicalHelper.get(TagPrefix.crushed, material, 1) - if (poorOreItem == null || crushedOreItem == null) - return; + if (poorOreItem === null || crushedOreItem === null) return; const oreProperty = material.getProperty(PropertyKey.ORE) - const smeltingMaterial = oreProperty.getDirectSmeltResult() == null ? material : oreProperty.getDirectSmeltResult(); + const smeltingMaterial = oreProperty.getDirectSmeltResult() === null ? material : oreProperty.getDirectSmeltResult(); const multiplier = oreProperty.getOreMultiplier(); - let ingotItem = null; - if (smeltingMaterial.hasProperty(PropertyKey.INGOT)) - ingotItem = ChemicalHelper.get(TagPrefix.nugget, smeltingMaterial, 5) - else if (smeltingMaterial.hasProperty(PropertyKey.GEM)) - ingotItem = ChemicalHelper.get(TagPrefix.gemFlawed, smeltingMaterial, 1) - else - ingotItem = ChemicalHelper.get(TagPrefix.dustSmall, smeltingMaterial, 1) + let ingotItem; + if (smeltingMaterial.hasProperty(PropertyKey.INGOT)) ingotItem = ChemicalHelper.get(TagPrefix.nugget, smeltingMaterial, 5) + else if (smeltingMaterial.hasProperty(PropertyKey.GEM)) ingotItem = ChemicalHelper.get(TagPrefix.gemFlawed, smeltingMaterial, 1) + else ingotItem = ChemicalHelper.get(TagPrefix.dustSmall, smeltingMaterial, 1) ingotItem.setCount(ingotItem.getCount() * multiplier) crushedOreItem.setCount(crushedOreItem.getCount() * multiplier) @@ -382,18 +422,17 @@ function registerGTCEUMetalRecipes(event) { const gemItem = ChemicalHelper.get(TagPrefix.gem, material, crushedOreItem.getCount()); hammerRecipe.chancedOutput(gemItem, 7500, 950) - event.recipes.greate.pressing(TieredOutputItem.of(gemItem).withChance(0.75).withExtraTierChance(0.095), poorOreItem) + event.recipes.greate.pressing(Item.of(gemItem).withChance(0.75), poorOreItem) .recipeTier(1) .id(`greate:pressing/poor_raw_${material.getName()}_to_gem`) let polishingCount = Math.max(crushedOreItem.getCount() / 2, 1); event.recipes.create.sandpaper_polishing(gemItem.copyWithCount(polishingCount), poorOreItem) .id(`tfg:polishing/poor_raw_${material.getName()}_to_gem`) - } - else { + } else { hammerRecipe.chancedOutput(crushedOreItem, 7500, 950) - event.recipes.greate.pressing(TieredOutputItem.of(crushedOreItem).withChance(0.75).withExtraTierChance(0.095), poorOreItem) + event.recipes.greate.pressing(Item.of(crushedOreItem).withChance(0.75), poorOreItem) .recipeTier(1) .id(`greate:pressing/poor_raw_${material.getName()}_to_crushed_ore`) } @@ -407,8 +446,7 @@ function registerGTCEUMetalRecipes(event) { if (multiplier > 1) { maceratorRecipe.itemOutputs(crushedOreItem.copyWithCount(multiplier / 2)) - } - else { + } else { maceratorRecipe.chancedOutput(crushedOreItem, 5000, 750) } maceratorRecipe.chancedOutput(crushedOreItem.copyWithCount(1), 2500, 500) @@ -420,8 +458,7 @@ function registerGTCEUMetalRecipes(event) { crushedOreItem.copyWithCount(multiplier / 2), poorOreItem ).id(`tfg:quern/${material.getName()}_crushed_ore_from_poor_raw_ore`) - } - else { + } else { event.recipes.tfc.quern( ChemicalHelper.get(TagPrefix.dustSmall, material, 2), poorOreItem @@ -429,23 +466,26 @@ function registerGTCEUMetalRecipes(event) { } // Smelting - if (!material.hasProperty(PropertyKey.BLAST)) { + if (!material.hasProperty(PropertyKey.BLAST) && !ingotItem.isEmpty()) { event.smelting(ingotItem, poorOreItem).id(`gtceu:smelting/smelt_poor_raw_${material.getName()}_ore_to_ingot`) } } + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ const processNormalRawOre = (material) => { const oreProperty = material.getProperty(PropertyKey.ORE) const multiplier = oreProperty.getOreMultiplier(); const normalOreItem = ChemicalHelper.get(TagPrefix.rawOre, material, 1) const crushedOreItem = ChemicalHelper.get(TagPrefix.crushed, material, multiplier) - if (normalOreItem == null || crushedOreItem == null) + if (normalOreItem === null || crushedOreItem === null) return; - const smeltingMaterial = oreProperty.getDirectSmeltResult() == null ? material : oreProperty.getDirectSmeltResult(); + const smeltingMaterial = oreProperty.getDirectSmeltResult() === null ? material : oreProperty.getDirectSmeltResult(); - let ingotItem = null; + let ingotItem; if (smeltingMaterial.hasProperty(PropertyKey.INGOT)) ingotItem = ChemicalHelper.get(TagPrefix.ingot, smeltingMaterial, multiplier) else if (smeltingMaterial.hasProperty(PropertyKey.GEM)) @@ -470,8 +510,7 @@ function registerGTCEUMetalRecipes(event) { event.recipes.create.sandpaper_polishing(gemItem, normalOreItem) .id(`tfg:polishing/raw_${material.getName()}_to_gem`) - } - else { + } else { hammerRecipe.itemOutputs(crushedOreItem) event.recipes.greate.pressing(crushedOreItem, normalOreItem) @@ -497,7 +536,7 @@ function registerGTCEUMetalRecipes(event) { .id(`tfg:quern/${material.getName()}_crushed_ore_from_normal_raw_ore`) // Smelting - if (!material.hasProperty(PropertyKey.BLAST)) { + if (!material.hasProperty(PropertyKey.BLAST) && !ingotItem.isEmpty()) { event.smelting(ingotItem, normalOreItem).id(`gtceu:smelting/smelt_raw_${material.getName()}_ore_to_ingot`) } @@ -506,18 +545,21 @@ function registerGTCEUMetalRecipes(event) { event.remove({ id: `gtceu:forge_hammer/decompress_${material.getName()}_to_raw_ore` }) } + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ const processRichRawOre = (material) => { const oreProperty = material.getProperty(PropertyKey.ORE) const multiplier = oreProperty.getOreMultiplier() * 2; const richOreItem = ChemicalHelper.get(TFGTagPrefix.richRawOre, material, 1) const crushedOreItem = ChemicalHelper.get(TagPrefix.crushed, material, multiplier) - if (richOreItem == null || crushedOreItem == null) + if (richOreItem === null || crushedOreItem === null) return; - const smeltingMaterial = oreProperty.getDirectSmeltResult() == null ? material : oreProperty.getDirectSmeltResult(); + const smeltingMaterial = oreProperty.getDirectSmeltResult() === null ? material : oreProperty.getDirectSmeltResult(); - let ingotItem = null; + let ingotItem; if (smeltingMaterial.hasProperty(PropertyKey.INGOT)) ingotItem = ChemicalHelper.get(TagPrefix.ingot, smeltingMaterial, multiplier) else if (smeltingMaterial.hasProperty(PropertyKey.GEM)) @@ -542,8 +584,7 @@ function registerGTCEUMetalRecipes(event) { event.recipes.create.sandpaper_polishing(gemItem, richOreItem) .id(`tfg:polishing/rich_raw_${material.getName()}_to_gem`) - } - else { + } else { hammerRecipe.itemOutputs(crushedOreItem) event.recipes.greate.pressing(crushedOreItem, richOreItem) @@ -567,23 +608,26 @@ function registerGTCEUMetalRecipes(event) { .id(`tfg:quern/${material.getName()}_crushed_ore_from_rich_raw_ore`) // Smelting - if (!material.hasProperty(PropertyKey.BLAST)) { + if (!material.hasProperty(PropertyKey.BLAST) && !ingotItem.isEmpty()) { event.smelting(ingotItem, richOreItem).id(`gtceu:smelting/smelt_rich_raw_${material.getName()}_ore_to_ingot`) } } + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ const processCrushedOre = (material) => { const crushedOreItem = ChemicalHelper.get(TagPrefix.crushed, material, 1) const impureDustItem = ChemicalHelper.get(TagPrefix.dustImpure, material, 1) const pureOreItem = ChemicalHelper.get(TagPrefix.crushedPurified, material, 1) - if (crushedOreItem != null && pureOreItem != null) { + if (crushedOreItem !== null && pureOreItem !== null) { // Bulk washing let byproductMaterial = material.getProperty(PropertyKey.ORE).getOreByProduct(0, material); const byproductItem = ChemicalHelper.get(TagPrefix.dust, byproductMaterial, 1) - event.recipes.greate.splashing([pureOreItem, TieredOutputItem.of(byproductItem).withChance(0.333), 'gtceu:stone_dust'], crushedOreItem) + event.recipes.greate.splashing([pureOreItem, Item.of(byproductItem).withChance(0.333), 'gtceu:stone_dust'], crushedOreItem) .id(`tfg:splashing/${material.getName()}_purified_ore`) // Dropping in water @@ -600,40 +644,49 @@ function registerGTCEUMetalRecipes(event) { }).id(`tfg:ae_transform/${material.getName()}_purified_ore`) } - if (crushedOreItem != null && impureDustItem != null) { + if (crushedOreItem !== null && impureDustItem !== null) { event.recipes.greate.pressing(impureDustItem, crushedOreItem) .recipeTier(1) .id(`greate:pressing/crushed_${material.getName()}_to_impure_dust`) } } + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ const processPurifiedOre = (material) => { const pureOreItem = ChemicalHelper.get(TagPrefix.crushedPurified, material, 1) const pureDustItem = ChemicalHelper.get(TagPrefix.dustPure, material, 1) - if (pureOreItem != null && pureDustItem != null) { + if (pureOreItem !== null && pureDustItem !== null) { event.recipes.greate.pressing(pureDustItem, pureOreItem) .recipeTier(1) .id(`greate:pressing/pure_crushed_${material.getName()}_to_pure_dust`) } } + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ const processRefinedOre = (material) => { const refinedOreItem = ChemicalHelper.get(TagPrefix.crushedRefined, material, 1) const dustItem = ChemicalHelper.get(TagPrefix.dust, material, 1) - if (refinedOreItem != null && dustItem != null) { + if (refinedOreItem !== null && dustItem !== null) { event.recipes.greate.pressing(dustItem, refinedOreItem) .recipeTier(1) .id(`greate:pressing/refined_${material.getName()}_to_dust`) } } + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ const processImpureDust = (material) => { const impureDustItem = ChemicalHelper.get(TagPrefix.dustImpure, material, 1) const dustItem = ChemicalHelper.get(TagPrefix.dust, material, 1) - if (impureDustItem != null && dustItem != null) { + if (impureDustItem !== null && dustItem !== null) { // Bulk washing event.recipes.greate.splashing(dustItem, impureDustItem) @@ -666,11 +719,14 @@ function registerGTCEUMetalRecipes(event) { } } + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ const processPureDust = (material) => { const pureDust = ChemicalHelper.get(TagPrefix.dustPure, material, 1) const dustItem = ChemicalHelper.get(TagPrefix.dust, material, 1) - if (pureDust != null && dustItem != null) { + if (pureDust !== null && dustItem !== null) { // Bulk washing event.recipes.greate.splashing(dustItem, pureDust) @@ -703,6 +759,9 @@ function registerGTCEUMetalRecipes(event) { } } + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ const processGems = (material) => { let gem = ChemicalHelper.get(TagPrefix.gem, material, 1); if (gem.hasTag('c:hidden_from_recipe_viewers')) @@ -721,7 +780,7 @@ function registerGTCEUMetalRecipes(event) { .id(`shapeless/mortar_chipped_${material.getName()}`) let amount = 9; - if (material == GTMaterials.NetherQuartz || material == GTMaterials.Amethyst) + if (material === GTMaterials.NetherQuartz || material === GTMaterials.Amethyst) amount = 4; event.recipes.greate.pressing(ChemicalHelper.get(TagPrefix.gem, material, amount), ChemicalHelper.get(TagPrefix.block, material, 1)) @@ -729,10 +788,12 @@ function registerGTCEUMetalRecipes(event) { .id(`greate:pressing/unpacking_${material.getName()}_block`) } + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ const processAnvil = (material) => { const anvilStack = ChemicalHelper.get(TFGTagPrefix.anvil, material, 1) - if (anvilStack == null) - return; + if (anvilStack === null) return; event.recipes.gtceu.macerator(`tfg:macerate_${material.getName()}_anvil`) .itemInputs(anvilStack) @@ -771,10 +832,12 @@ function registerGTCEUMetalRecipes(event) { .EUt(GTValues.VA[GTValues.ULV]) } + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ const processLamp = (material) => { const finishedLampStack = ChemicalHelper.get(TFGTagPrefix.lamp, material, 1) - if (finishedLampStack == null) - return; + if (finishedLampStack === null) return; const materialDustStack = ChemicalHelper.get(TagPrefix.dust, material, 1) const materialIngotStack = ChemicalHelper.get(TagPrefix.ingot, material, 1) @@ -847,10 +910,12 @@ function registerGTCEUMetalRecipes(event) { .EUt(GTValues.VA[GTValues.ULV]) } + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ const processTrapdoor = (material) => { const trapdoorStack = ChemicalHelper.get(TFGTagPrefix.trapdoor, material, 1) - if (trapdoorStack == null) - return; + if (trapdoorStack === null) return; const materialDustStack = ChemicalHelper.get(TagPrefix.dust, material, 1) const materialIngotStack = ChemicalHelper.get(TagPrefix.ingot, material, 1) @@ -892,10 +957,12 @@ function registerGTCEUMetalRecipes(event) { .EUt(GTValues.VA[GTValues.ULV]) } + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ const processChain = (material) => { const chainStack = ChemicalHelper.get(TFGTagPrefix.chain, material, 1) - if (chainStack == null) - return; + if (chainStack === null) return; const chain2Stack = ChemicalHelper.get(TFGTagPrefix.chain, material, 2) @@ -940,10 +1007,12 @@ function registerGTCEUMetalRecipes(event) { .EUt(GTValues.VA[GTValues.ULV]) } + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ const processBell = (material) => { const bellStack = ChemicalHelper.get(TFGTagPrefix.bell, material, 1) - if (bellStack == null) - return; + if (bellStack === null) return; const materialDustStack = ChemicalHelper.get(TagPrefix.dust, material, 1) const materialIngotStack = ChemicalHelper.get(TagPrefix.ingot, material, 1) @@ -985,11 +1054,13 @@ function registerGTCEUMetalRecipes(event) { .EUt(GTValues.VA[GTValues.ULV]) } + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ const processBars = (material) => { const barsStack = ChemicalHelper.get(TFGTagPrefix.bars, material, 4) const ingotStack = ChemicalHelper.get(TagPrefix.ingot, material, 1) - if (barsStack == null) - return; + if (barsStack === null) return; event.recipes.gtceu.cutter(`tfg:${material.getName()}_bars`) .itemInputs(ingotStack) @@ -998,13 +1069,15 @@ function registerGTCEUMetalRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) } + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ const processBuzzsawBlade = (material) => { const buzzsawBladeItem = ChemicalHelper.get(TagPrefix.toolHeadBuzzSaw, material, 1) const doublePlateItem = ChemicalHelper.get(TagPrefix.plateDouble, material, 1) - if (buzzsawBladeItem == null || doublePlateItem == null) - return; + if (buzzsawBladeItem === null || doublePlateItem === null) return; - var isLowTier = material == GTMaterials.CobaltBrass || material.hasProperty(TFGPropertyKey.TFC_PROPERTY) + let isLowTier = material === GTMaterials.CobaltBrass || material.hasProperty(TFGPropertyKey.TFC_PROPERTY) event.recipes.gtceu.lathe(`buzzsaw_gear_${material.getName()}`) .itemInputs(doublePlateItem) @@ -1024,6 +1097,9 @@ function registerGTCEUMetalRecipes(event) { event.remove({ id: `gtceu:shaped/buzzsaw_blade_${material.getName()}` }) } + /** + * @param {com.gregtechceu.gtceu.api.data.chemical.material.Material_} material + */ const removePowerToolRecycling = (material) => { removeMaceratorRecipe(event, `macerate_lv_${material.getName()}_wrench`) event.remove({ id: `gtceu:arc_furnace/arc_lv_${material.getName()}_wrench` }) @@ -1059,8 +1135,7 @@ function registerGTCEUMetalRecipes(event) { const toolProperty = material.getProperty(PropertyKey.TOOL) const ingotProperty = material.getProperty(PropertyKey.INGOT) const oreProperty = material.getProperty(PropertyKey.ORE) - - if (toolProperty != null) { + if (toolProperty !== null) { let circuit = 1; makeToolRecipe(GTToolType.SWORD, TFGTagPrefix.toolHeadSword, 'tfg:sword_head_extruder_mold', circuit++, material) makeToolRecipe(GTToolType.PICKAXE, TFGTagPrefix.toolHeadPickaxe, 'tfg:pickaxe_head_extruder_mold', circuit++, material) @@ -1086,12 +1161,12 @@ function registerGTCEUMetalRecipes(event) { processToolHead(TFGTagPrefix.toolHeadChisel, 'tfg:chisel_head_extruder_mold', circuit++, material) processToolHead(TFGTagPrefix.toolHeadMace, 'tfg:mace_head_extruder_mold', circuit++, material) processToolHead(TFGTagPrefix.toolHeadMattock, 'tfg:mattock_head_extruder_mold', circuit++, material) - processToolHead(TFGTagPrefix.toolHeadHook, 'tfg:fish_hook_extruder_mold', circuit++, material) + processToolHead(TFGTagPrefix.toolHeadHook, 'tfg:fish_hook_extruder_mold', circuit, material) removePowerToolRecycling(material) } - if (ingotProperty != null) { + if (ingotProperty !== null) { processIngot(material) processPlate(material) processPlateDouble(material) @@ -1112,7 +1187,7 @@ function registerGTCEUMetalRecipes(event) { event.remove({ id: `gtceu:shaped/spring_small_${material.getName()}` }) } - if (oreProperty != null) { + if (oreProperty !== null) { processSmallOre(material) processSmallNativeOre(material) processPoorRawOre(material) diff --git a/kubejs/server_scripts/gregtech/recipes.recycling.js b/kubejs/server_scripts/gregtech/recipes.recycling.js index 4f7392ca3..543ba3668 100644 --- a/kubejs/server_scripts/gregtech/recipes.recycling.js +++ b/kubejs/server_scripts/gregtech/recipes.recycling.js @@ -1,6 +1,9 @@ // priority: 0 "use strict"; +/** + * @param {Internal.RecipesEventJS} event + */ function registerGTCEURecyclingRecipes(event) { // Tantalum Capacitor diff --git a/kubejs/server_scripts/gregtech/recipes.removes.js b/kubejs/server_scripts/gregtech/recipes.removes.js index 8d6ed0cb2..e6907ad7f 100644 --- a/kubejs/server_scripts/gregtech/recipes.removes.js +++ b/kubejs/server_scripts/gregtech/recipes.removes.js @@ -1,6 +1,9 @@ // priority: 0 "use strict"; +/** + * @param {Internal.RecipesEventJS} event + */ function removeGTCEURecipes(event) { event.replaceInput({ input: 'gtceu:wood_drum' }, 'gtceu:wood_drum', 'minecraft:glass') diff --git a/kubejs/server_scripts/gregtech/recipes.tfcmetals.js b/kubejs/server_scripts/gregtech/recipes.tfcmetals.js index 2e32e7bfb..f88e860e2 100644 --- a/kubejs/server_scripts/gregtech/recipes.tfcmetals.js +++ b/kubejs/server_scripts/gregtech/recipes.tfcmetals.js @@ -1,8 +1,10 @@ // priority: 0 "use strict"; -function registerGTCEuTFCMetalsRecipes(event) -{ +/** + * @param {Internal.RecipesEventJS} event + */ +function registerGTCEuTFCMetalsRecipes(event) { //#region LV hull event.replaceInput('gtceu:shaped/lv_machine_hull', '#forge:plates/wrought_iron', '#forge:plates/red_steel') diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index c6a39339a..f62501506 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -60,8 +60,7 @@ const registerGTCEUItemTags = (event) => { event.add('tfg:sugars', 'afc:birch_sugar') event.add('tfg:sugars', 'afc:maple_sugar') - global.MINECRAFT_DYE_NAMES.forEach(dyeName => - { + global.MINECRAFT_DYE_NAMES.forEach(dyeName => { event.remove('ae2:p2p_attunements/fluid_p2p_tunnel', `gtceu:${dyeName}_dye_bucket`) }) diff --git a/kubejs/server_scripts/gregtech/utility.js b/kubejs/server_scripts/gregtech/utility.js index b3b387b99..0fc4ec6f4 100644 --- a/kubejs/server_scripts/gregtech/utility.js +++ b/kubejs/server_scripts/gregtech/utility.js @@ -29,7 +29,7 @@ const generateMixerRecipe = (event, input, fluid_input, output, circuit, fluid_o /** * Applies if circuit param is not empty */ - if (circuit != null) { + if (circuit !== null) { recipe.circuit(circuit) } } @@ -47,13 +47,13 @@ const generateMixerRecipe = (event, input, fluid_input, output, circuit, fluid_o * @param {string} id -Recipe ID */ const generateCutterRecipe = (event, input, output, duration, EUt, id) => { - event.recipes.gtceu.cutter(`tfg:${id}`) .itemInputs(input) .itemOutputs(output) .duration(duration) .EUt(EUt) } + //#endregion //#region Green House @@ -67,12 +67,13 @@ const generateCutterRecipe = (event, input, output, duration, EUt, id) => { * @param {string} id -Recipe ID * @param {string} dimension -Dimension ID * @param {number} fertiliser_count - * @param {string} output_seconday -Item (Optional, if there should be a third output) - * @param {string} tier - GTValues.VA[] (Optional, defaults to LV) + * @param {string|null} output_seconday -Item (Optional, if there should be a third output) + * @param {number} EUt */ -const generateGreenHouseRecipe = (event, input, fluid_amount, output, id, dimension, fertiliser_count, output_secondary, tier) => { - - // Без удобрения (Without fertilizer) +function generateGreenHouseRecipe(event, input, fluid_amount, output, id, dimension, fertiliser_count, output_secondary, EUt) { + if (EUt === undefined || output_secondary === undefined || fertiliser_count === undefined || dimension === undefined) { + throw new TypeError(`Call to generateGreenHouseRecipe for id ${id} is missing args`); + } let r = event.recipes.gtceu.greenhouse(id) .notConsumable(input) .circuit(1) @@ -82,17 +83,11 @@ const generateGreenHouseRecipe = (event, input, fluid_amount, output, id, dimens .chancedOutput(input, 500, 0) .duration(36000) // 30 mins - if (dimension != null){ - r.dimension(dimension) - } - if (output_secondary != null){ - r.chancedOutput(output_secondary, 750, 0) - } - if (tier != null){ - r.EUt(tier) - } else { - r.EUt(GTValues.VA[GTValues.LV]) - } + + if (dimension !== null)r.dimension(dimension) + if (output_secondary !== null) r.chancedOutput(output_secondary, 750, 0) + + r.EUt(EUt) // С удобрением (With fertilizer) r = event.recipes.gtceu.greenhouse(`${id}_fertilized`) @@ -105,17 +100,9 @@ const generateGreenHouseRecipe = (event, input, fluid_amount, output, id, dimens .chancedOutput(input, 3000, 0) .duration(12000) // 10 mins - if (dimension != null){ - r.dimension(dimension) - } - if (output_secondary != null){ - r.chancedOutput(output_secondary, 4000, 0) - } - if (tier != null){ - r.EUt(tier) - } else { - r.EUt(GTValues.VA[GTValues.LV]) - } + if (dimension !== null) r.dimension(dimension) + if (output_secondary !== null) r.chancedOutput(output_secondary, 4000, 0) + r.EUt(EUt) } //#endregion @@ -142,12 +129,12 @@ const getFillingNBT = (material, amount) => { * Function for generating plated block recipes. * * @param {*} event - * @param {GTMaterials} material + * @param {GTMaterial} material */ function generatePlatedBlockRecipe(event, material) { // firmaciv plated blocks don't have this property let tfcProperty = material.getProperty(TFGPropertyKey.TFC_PROPERTY) - let outputMaterial = (tfcProperty == null || tfcProperty.getOutputMaterial() == null) ? material : tfcProperty.getOutputMaterial() + let outputMaterial = (tfcProperty === null || tfcProperty.getOutputMaterial() === null) ? material : tfcProperty.getOutputMaterial() let plateItem = ChemicalHelper.get(TagPrefix.plate, material, 1); @@ -155,11 +142,11 @@ function generatePlatedBlockRecipe(event, material) { let platedSlab = ChemicalHelper.get(TFGTagPrefix.slabPlated, material, 1); let platedStair = ChemicalHelper.get(TFGTagPrefix.stairPlated, material, 1); - if (platedBlock == null) + if (platedBlock === null) return let tfcMetalName = material.getName(); - if (tfcMetalName == "iron") + if (tfcMetalName === "iron") tfcMetalName = "cast_iron"; event.recipes.create.item_application(platedBlock, ['#forge:stone_bricks', plateItem]) @@ -173,7 +160,7 @@ function generatePlatedBlockRecipe(event, material) { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - if (tfcProperty != null) { + if (tfcProperty !== null) { event.recipes.tfc.heating(platedBlock, tfcProperty.getMeltTemp()) .resultFluid(Fluid.of(outputMaterial.getFluid(), 144)) .id(`tfc:heating/metal/${tfcMetalName}_block`) @@ -203,7 +190,7 @@ function generatePlatedBlockRecipe(event, material) { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - if (tfcProperty != null) { + if (tfcProperty !== null) { // Slabs are lossy because it's possible to plate a double slab block with one metal plate event.recipes.tfc.heating(platedSlab, tfcProperty.getMeltTemp()) .resultFluid(Fluid.of(outputMaterial.getFluid(), 72)) @@ -234,7 +221,7 @@ function generatePlatedBlockRecipe(event, material) { .duration(50) .EUt(GTValues.VA[GTValues.ULV]) - if (tfcProperty != null) { + if (tfcProperty !== null) { event.recipes.tfc.heating(platedStair, tfcProperty.getMeltTemp()) .resultFluid(Fluid.of(outputMaterial.getFluid(), 144)) .id(`tfc:heating/metal/${tfcMetalName}_block_stairs`) @@ -259,10 +246,10 @@ function generatePlatedBlockRecipe(event, material) { * Function for iterating through registered materials * {@link https://github.com/GregTechCEu/GregTech-Modern/blob/1.20.1/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java} * - * @param {GTCEuAPI.materialManager.getRegisteredMaterials} iterator -Material + * @param {(material: com.gregtechceu.gtceu.api.data.chemical.material.Material_) => void} iterator */ function forEachMaterial(iterator) { - for (var material of GTCEuAPI.materialManager.getRegisteredMaterials()) { + for (let material of GTCEuAPI.materialManager.getRegisteredMaterials()) { iterator(material) } } diff --git a/kubejs/server_scripts/immersive_aircraft/data.js b/kubejs/server_scripts/immersive_aircraft/data.js index bb888fb33..37c117716 100644 --- a/kubejs/server_scripts/immersive_aircraft/data.js +++ b/kubejs/server_scripts/immersive_aircraft/data.js @@ -5,8 +5,7 @@ * @param {Internal.TFCDataEventJS} evt */ -const registerTFCDataForImmersiveAircraft = (evt) => -{ +const registerTFCDataForImmersiveAircraft = (evt) => { evt.itemSize('immersive_aircraft:quadrocopter', 'large', 'heavy'); evt.itemSize('immersive_aircraft:airship', 'very_large', 'heavy'); evt.itemSize('immersive_aircraft:gyrodyne', 'very_large', 'very_heavy'); diff --git a/kubejs/server_scripts/immersive_aircraft/recipes.js b/kubejs/server_scripts/immersive_aircraft/recipes.js index 84377b668..923c39b7b 100644 --- a/kubejs/server_scripts/immersive_aircraft/recipes.js +++ b/kubejs/server_scripts/immersive_aircraft/recipes.js @@ -14,8 +14,7 @@ function registerImmersiveAircraftRecipes(event) { * @param {string} id * @param {{input: string, duration: number, outputsMacerator: Internal.ItemStack[], outputsArcFurnace: Internal.ItemStack[]}} args */ - let generateRecyclingRecipe = (id, args) => - { + let generateRecyclingRecipe = (id, args) => { event.recipes.gtceu.macerator(id) .itemInputs(args.input) // macerator only has 6 output slots @@ -39,17 +38,14 @@ function registerImmersiveAircraftRecipes(event) { * @param {{tagPrefixMacerator: TagPrefix, tagPrefixArcFurnace: TagPrefix, count: number}[]} materialToResults * @returns {input: string, duration: number, outputsMacerator: Internal.ItemStack[], outputsArcFurnace: Internal.ItemStack[]} */ - let createRecyclingRecipeArgs = (inputItem, outputMaterialsArray, materialToResults) => - { + let createRecyclingRecipeArgs = (inputItem, outputMaterialsArray, materialToResults) => { let outputsMacerator = [] let outputsArcFurnace = [] let duration = 0; - for(let i = 0; i < outputMaterialsArray.length; i++) - { - if(i > 9) - { + for (let i = 0; i < outputMaterialsArray.length; i++) { + if (i > 9) { break; } @@ -85,8 +81,7 @@ function registerImmersiveAircraftRecipes(event) { * @param {number} count * @returns {tagPrefixMacerator: TagPrefix, tagPrefixArcFurnace: TagPrefix, count: number} */ - let createMaterialsToResults = (tagPrefixMacerator, tagPrefixArcFurnace, count) => - { + let createMaterialsToResults = (tagPrefixMacerator, tagPrefixArcFurnace, count) => { let result = { tagPrefixMacerator: tagPrefixMacerator, diff --git a/kubejs/server_scripts/immersive_aircraft/tags.js b/kubejs/server_scripts/immersive_aircraft/tags.js index 1824e8fd4..6ea391132 100644 --- a/kubejs/server_scripts/immersive_aircraft/tags.js +++ b/kubejs/server_scripts/immersive_aircraft/tags.js @@ -4,8 +4,7 @@ * * @param {TagEvent.Item} evt */ -const registerImmersiveAircraftItemTags = (evt) => -{ +const registerImmersiveAircraftItemTags = (evt) => { evt.add('c:hidden_from_recipe_viewers', 'immersive_aircraft:propeller'); evt.add('c:hidden_from_recipe_viewers', 'immersive_aircraft:boiler') } \ No newline at end of file diff --git a/kubejs/server_scripts/minecraft/recipes.dyes.js b/kubejs/server_scripts/minecraft/recipes.dyes.js index a7950c2b5..4a7c41962 100644 --- a/kubejs/server_scripts/minecraft/recipes.dyes.js +++ b/kubejs/server_scripts/minecraft/recipes.dyes.js @@ -17,7 +17,7 @@ function registerMinecraftDyeRecipes(event) { `minecraft:${dye}_wool` ]).id(`minecraft:${dye}_carpet`) - if (dye != 'white') { + if (dye !== 'white') { event.recipes.gtceu.chemical_bath(`tfg:${dye}_carpet`) .itemInputs(`minecraft:white_carpet`) .inputFluids(Fluid.of(`tfc:${dye}_dye`, 72)) diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 559ce2df0..78885c39c 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -105,7 +105,7 @@ const registerMinecraftRecipes = (event) => { // Обрезанный блок event.recipes.tfc.damage_inputs_shapeless_crafting( - event.shapeless('4x ' + element.cutted, [element.block, '#tfc:chisels']) + event.shapeless(`4x ${ element.cutted}`, [element.block, '#tfc:chisels']) ).id(`tfg:shapeless/cutted_${element.name}`) } diff --git a/kubejs/server_scripts/railways/recipes.js b/kubejs/server_scripts/railways/recipes.js index 966a3f9c9..2312bce42 100644 --- a/kubejs/server_scripts/railways/recipes.js +++ b/kubejs/server_scripts/railways/recipes.js @@ -116,7 +116,7 @@ const registerRailWaysRecipes = (event) => { .duration(200) .EUt(4) .category(GTRecipeCategories.CHEM_DYES) - if (dye != "white") { + if (dye !== "white") { event.recipes.tfc.barrel_sealed(1000) .inputs(`railways:white_conductor_cap`, Fluid.of(`tfc:${dye}_dye`, 288)) .outputItem(`railways:${dye}_conductor_cap`) diff --git a/kubejs/server_scripts/railways/recipes.locometal.js b/kubejs/server_scripts/railways/recipes.locometal.js index e47d71976..1dcf3dfda 100644 --- a/kubejs/server_scripts/railways/recipes.locometal.js +++ b/kubejs/server_scripts/railways/recipes.locometal.js @@ -21,7 +21,7 @@ const locometalBase = { } const registerRailwaysLocometalRecipes = (event) => { - for (var locometal in locometalBase) { + for (let locometal in locometalBase) { event.recipes.create.cutting(`8x railways:${locometal}`, '#forge:storage_blocks/iron').processingTime(200); event.recipes.create.cutting(`16x railways:${locometal}`, '#forge:storage_blocks/wrought_iron').processingTime(200); event.recipes.create.cutting(`24x railways:${locometal}`, '#forge:storage_blocks/steel').processingTime(200); @@ -90,7 +90,7 @@ const registerRailwaysLocometalRecipes = (event) => { .category(GTRecipeCategories.CHEM_DYES) global.MINECRAFT_DYE_NAMES.forEach(dye => { - for (var locometal in locometalBase) { + for (let locometal in locometalBase) { event.recipes.gtceu.chemical_bath(`tfg:chemical_dying_locometal/${locometal}/${dye}`) .itemInputs(Item.of(locometalDyeGroups[`${locometal}`], 1)) .inputFluids(Fluid.of(`tfc:${dye}_dye`, 18)) diff --git a/kubejs/server_scripts/railways/tags.js b/kubejs/server_scripts/railways/tags.js index 9150a1a53..8bcfd6a53 100644 --- a/kubejs/server_scripts/railways/tags.js +++ b/kubejs/server_scripts/railways/tags.js @@ -10,7 +10,7 @@ const registerRailWaysItemTags = (event) => { }) // Adding Conductor tags global.MINECRAFT_DYE_NAMES.forEach(dye => { - if (dye != 'white') event.add('tfg:colored_caps', `railways:${dye}_conductor_cap`) + if (dye !== 'white') event.add('tfg:colored_caps', `railways:${dye}_conductor_cap`) event.remove('c:hidden_from_recipe_viewers',`railways:${dye}_conductor_cap`) }) } diff --git a/kubejs/server_scripts/simplylight/recipes.js b/kubejs/server_scripts/simplylight/recipes.js index ee8858e9f..186c841e7 100644 --- a/kubejs/server_scripts/simplylight/recipes.js +++ b/kubejs/server_scripts/simplylight/recipes.js @@ -23,7 +23,7 @@ const registerSimplylightRecipes = (event) => { global.MINECRAFT_DYE_NAMES.forEach(color => { //exeption for white lamps because who needs consistency? - if (color != 'white') { + if (color !== 'white') { event.recipes.gtceu.chemical_bath(`simplylight:chemical_bath/dyeing/illuminant_${color}_block_on`) .itemInputs('#simplylight:any_lamp_on') .inputFluids(Fluid.of(`tfc:${color}_dye`, 25)) diff --git a/kubejs/server_scripts/tfc/data.js b/kubejs/server_scripts/tfc/data.js index e5da61c11..540e44c93 100644 --- a/kubejs/server_scripts/tfc/data.js +++ b/kubejs/server_scripts/tfc/data.js @@ -83,11 +83,6 @@ const registerTFCItemSize = (event) => { const registerTFCFoodData = (event) => { - event.foodItem('gtceu:chocolate_coin', food => { - food.hunger(1) - food.dairy(0.5) - }) - event.foodItem('firmalife:ice_shavings', food => { food.water(5) food.decayModifier(0) diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index d1bb9ef04..2757f069e 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -57,26 +57,26 @@ const registerTFCRecipes = (event) => { // Дерево global.TFC_WOOD_TYPES.forEach(wood => { - generateGreenHouseRecipe(event, `8x tfc:wood/sapling/${wood}`, 16000, `64x tfc:wood/log/${wood}`, `tfg:greenhouse/${wood}`, 'minecraft:overworld', 8) + generateGreenHouseRecipe(event, `8x tfc:wood/sapling/${wood}`, 16000, `64x tfc:wood/log/${wood}`, `tfg:greenhouse/${wood}`, 'minecraft:overworld', 16, null, GTValues.VA[GTValues.MV]) }) global.AFC_SAPLINGS.forEach(x => { - generateGreenHouseRecipe(event, `8x afc:wood/sapling/${x.sapling}`, 16000, `64x ${x.log}`, `tfg:greenhouse/${x.sapling}`, 'minecraft:overworld', 8) + generateGreenHouseRecipe(event, `8x afc:wood/sapling/${x.sapling}`, 16000, `64x ${x.log}`, `tfg:greenhouse/${x.sapling}`, 'minecraft:overworld', 16, null, GTValues.VA[GTValues.MV]) }) // Семена фруктов global.TFC_GREENHOUSE_FRUIT_RECIPE_COMPONENTS.forEach(element => { - generateGreenHouseRecipe(event, element.input, element.fluid_amount, element.output, element.name, 'minecraft:overworld', 1) + generateGreenHouseRecipe(event, element.input, element.fluid_amount, element.output, element.name, 'minecraft:overworld', 8, null, GTValues.VA[GTValues.LV]) }) // Семена овощей global.TFC_GREENHOUSE_VEGETABLE_RECIPE_COMPONENTS.forEach(element => { - generateGreenHouseRecipe(event, element.input, element.fluid_amount, element.output, element.name, null, 1) + generateGreenHouseRecipe(event, element.input, element.fluid_amount, element.output, element.name, null, 8, null, GTValues.VA[GTValues.LV]) }) // Семена ягод global.TFC_GREENHOUSE_BERRY_RECIPE_COMPONENTS.forEach(element => { - generateGreenHouseRecipe(event, element.input, element.fluid_amount, element.output, element.name, null, 1) + generateGreenHouseRecipe(event, element.input, element.fluid_amount, element.output, element.name, null, 8, null, GTValues.VA[GTValues.LV]) }) // Растения @@ -84,7 +84,7 @@ const registerTFCRecipes = (event) => { const itemId = element.id; const recipeId = `greenhouse_${itemId.replace(':', '_')}`; - generateGreenHouseRecipe(event, itemId, 8000, `8x ${itemId}`, recipeId, null, 1); + generateGreenHouseRecipe(event, itemId, 8000, `8x ${itemId}`, recipeId, null, 8, null, GTValues.VA[GTValues.LV]); }); //#endregion diff --git a/kubejs/server_scripts/tfc/recipes.materials.js b/kubejs/server_scripts/tfc/recipes.materials.js index 37fb037eb..b12bcd55a 100644 --- a/kubejs/server_scripts/tfc/recipes.materials.js +++ b/kubejs/server_scripts/tfc/recipes.materials.js @@ -6,11 +6,11 @@ function registerTFCMaterialsRecipes(event) { forEachMaterial(material => { let tfcProperty = material.getProperty(TFGPropertyKey.TFC_PROPERTY) - if (tfcProperty == null) { + if (tfcProperty === null) { return; } - let outputMaterial = (tfcProperty.getOutputMaterial() == null) ? material : tfcProperty.getOutputMaterial() + let outputMaterial = (tfcProperty.getOutputMaterial() === null) ? material : tfcProperty.getOutputMaterial() // Ingots let ingotItem = ChemicalHelper.get(TagPrefix.ingot, material, 1) @@ -21,7 +21,7 @@ function registerTFCMaterialsRecipes(event) { .resultFluid(Fluid.of(outputMaterial.getFluid(), 144)) .id(`tfc:heating/metal/${material.getName()}_ingot`) - if (material != GTMaterials.WroughtIron) { + if (material !== GTMaterials.WroughtIron) { // Отливка слитка в обычной форме event.recipes.tfc.casting(ingotItem, 'tfc:ceramic/ingot_mold', Fluid.of(outputMaterial.getFluid(), 144), 0.1) @@ -1244,7 +1244,7 @@ function registerTFCMaterialsRecipes(event) { let tongsStack = Item.of(`tfchotornot:tongs/${material.getName()}`) let tongPartStack = Item.of(`tfchotornot:tong_part/${material.getName()}`) - if (!tongsStack.isEmpty() && !tongPartStack.isEmpty() && material != GTMaterials.Iron) { + if (!tongsStack.isEmpty() && !tongPartStack.isEmpty() && material !== GTMaterials.Iron) { event.recipes.tfc.advanced_shaped_crafting( TFC.isp.of(tongsStack).copyForgingBonus(), [ 'AA', @@ -1273,10 +1273,9 @@ function registerTFCMaterialsRecipes(event) { // Workaround for limonite/bismuth let materialName = material.getName(); - if (materialName == "yellow_limonite") { + if (materialName === "yellow_limonite") { materialName = "limonite"; - } - else if (materialName == "bismuth") { + } else if (materialName === "bismuth") { materialName = "bismuthinite"; } diff --git a/kubejs/server_scripts/tfc/recipes.metals.js b/kubejs/server_scripts/tfc/recipes.metals.js index 39396a510..b8e87417d 100644 --- a/kubejs/server_scripts/tfc/recipes.metals.js +++ b/kubejs/server_scripts/tfc/recipes.metals.js @@ -340,6 +340,7 @@ function registerTFCMetalsRecipes(event) { .itemOutputs(`1x tfc:ore/normal_${ore}`) .duration(200) .EUt(GTValues.VA[GTValues.LV]) - })}) + }) +}) //#endregion } diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 1d84b8815..f6e7df5bc 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -7,7 +7,7 @@ const registerTFCItemTags = (event) => { forEachMaterial(material => { if (material.hasProperty(PropertyKey.TOOL)) { for (let [key, value] of Object.entries(global.GTCEU_TOOLTYPES_WHICH_HAS_TFC_DUPS)) { - var tool = ToolHelper.get(value, material) + let tool = ToolHelper.get(value, material) if (!tool.isEmpty()) { event.add(key, tool.getId()) } diff --git a/kubejs/server_scripts/tfcbetterbf/recipes.js b/kubejs/server_scripts/tfcbetterbf/recipes.js index 2c451ddd3..12cc0d3db 100644 --- a/kubejs/server_scripts/tfcbetterbf/recipes.js +++ b/kubejs/server_scripts/tfcbetterbf/recipes.js @@ -4,8 +4,7 @@ * * @param {Internal.RecipesEventJS} event */ -const registerTFCBetterBFRecipes = (event) => -{ +const registerTFCBetterBFRecipes = (event) => { event.remove("tfcbetterbf:heating/metal/insulation") event.recipes.tfc.heating('tfcbetterbf:insulation', 1535) diff --git a/kubejs/server_scripts/tfclunchbox/recipes.js b/kubejs/server_scripts/tfclunchbox/recipes.js index 1976010b1..d96eef2ea 100644 --- a/kubejs/server_scripts/tfclunchbox/recipes.js +++ b/kubejs/server_scripts/tfclunchbox/recipes.js @@ -25,7 +25,7 @@ function registerTFCLunchBoxRecipes(event) { event.recipes.gtceu.canner(`tfclunchbox:fill_${cell.name}_cell_with_liquid_ice`) .itemInputs(cell.id) .inputFluids(Fluid.of('gtceu:ice', cell.capacity)) - .itemOutputs(Item.of(cell.id, '{Fluid:{Amount:' + cell.capacity + ',FluidName:"gtceu:ice"}}')) + .itemOutputs(Item.of(cell.id, `{Fluid:{Amount:${ cell.capacity },FluidName:"gtceu:ice"}}`)) .duration(Math.max(16, Math.floor(cell.capacity / 64))) .EUt(GTValues.VA[GTValues.LV]); }); diff --git a/kubejs/server_scripts/tfg/events.chunks.js b/kubejs/server_scripts/tfg/events.chunks.js index 3a748dfed..4cb83a835 100644 --- a/kubejs/server_scripts/tfg/events.chunks.js +++ b/kubejs/server_scripts/tfg/events.chunks.js @@ -15,13 +15,13 @@ TFCEvents.createChunkDataProvider('mars', event => { .scaled(6, 18, 0, 1) // Precompute the surface & aquifer heights as constants as this is nether and does not realistically change - var heights = []; - var i = 0; + let heights = []; + let i = 0; while (i < 256) { heights.push(127); i++; } - var aquifer = []; + let aquifer = []; i = 0; while (i < 16) { aquifer.push(32); @@ -29,10 +29,10 @@ TFCEvents.createChunkDataProvider('mars', event => { } event.partial((data, chunk) => { - var x = chunk.pos.minBlockX; - var z = chunk.pos.minBlockZ; + let x = chunk.pos.minBlockX; + let z = chunk.pos.minBlockZ; - var temp = TFC.misc.lerpFloatLayer( + let temp = TFC.misc.lerpFloatLayer( tempLayer.noise(x, z), tempLayer.noise(x, z + 15), tempLayer.noise(x + 15, z), diff --git a/kubejs/server_scripts/tfg/events.js b/kubejs/server_scripts/tfg/events.js index fec1c8e1f..cc193ed06 100644 --- a/kubejs/server_scripts/tfg/events.js +++ b/kubejs/server_scripts/tfg/events.js @@ -19,7 +19,7 @@ ItemEvents.rightClicked(event => { const {item,server,player,player:{x,y,z}} = event - if (item.id != `tfg:${pill_event}_pill`) return + if (item.id !== `tfg:${pill_event}_pill`) return item.count-- player.addItemCooldown(item, 100) server.runCommandSilent(`effect give ${player.username} minecraft:${pill_event} 480 0 true`) @@ -28,7 +28,7 @@ ItemEvents.rightClicked(event => { const {item,server,player,player:{x,y,z}} = event - if (item.id != `tfg:${pill_event}_tablet`) return + if (item.id !== `tfg:${pill_event}_tablet`) return item.count-- player.addItemCooldown(item, 100) server.runCommandSilent(`effect give ${player.username} minecraft:${pill_event} 1800 0 true`) @@ -38,7 +38,7 @@ ItemEvents.rightClicked(event => { const {item,server,player,player:{x,y,z}} = event - if (item.id != `tfg:antipoison_pill`) return + if (item.id !== `tfg:antipoison_pill`) return item.count-- player.addItemCooldown(item, 50) event.player.removeEffect('minecraft:poison') @@ -47,7 +47,7 @@ ItemEvents.rightClicked(event => { const {item,server,player,player:{x,y,z}} = event - if (item.id != `tfg:antipoison_tablet`) return + if (item.id !== `tfg:antipoison_tablet`) return item.count-- player.addItemCooldown(item, 50) event.player.removeEffect('minecraft:poison') @@ -76,7 +76,7 @@ ItemEvents.rightClicked(event => { const {item,server,player,player:{x,y,z}} = event - if (item.id != `tfg:${salvo_event}_salvo`) return + if (item.id !== `tfg:${salvo_event}_salvo`) return item.count-- player.addItemCooldown(item, 100) server.runCommandSilent(`effect give ${player.username} minecraft:${salvo_event} 480 0 true`) @@ -86,7 +86,7 @@ ItemEvents.rightClicked(event => { const {item,server,player,player:{x,y,z}} = event - if (item.id != `tfg:absorption_salvo`) return + if (item.id !== `tfg:absorption_salvo`) return item.count-- player.addItemCooldown(item, 200) server.runCommandSilent(`effect give ${player.username} minecraft:absorption 480 4 true`) @@ -95,7 +95,7 @@ ItemEvents.rightClicked(event => { ItemEvents.rightClicked(event => { const {item,server,player,player:{x,y,z}} = event - if (item.id != `tfg:instant_health_salvo`) return + if (item.id !== `tfg:instant_health_salvo`) return item.count-- player.addItemCooldown(item, 100) server.runCommandSilent(`effect give ${player.username} minecraft:instant_health 1 1 true`) @@ -108,28 +108,29 @@ ItemEvents.rightClicked(event => { global.MINECRAFT_DYE_NAMES.forEach(color => { BlockEvents.rightClicked(event => { const {block,server,player} = event - if (block.id != `tfg:decorative_vase/${color}`) {return}{ + if (block.id !== `tfg:decorative_vase/${color}`) return server.runCommandSilent(`playsound tfc:block.quern.drag block ${player.username} ${block.x} ${block.y} ${block.z} 0.3 2.0 0.1`) - }}) + +}) }); BlockEvents.rightClicked(event => { const {block,server,player} = event - if (block.id != 'tfg:decorative_vase') {return}{ + if (block.id !== 'tfg:decorative_vase') return server.runCommandSilent(`playsound tfc:block.quern.drag block ${player.username} ${block.x} ${block.y} ${block.z} 0.3 2.0 0.1`) -}}); +}); //#endregion -BlockEvents.rightClicked(event=>{ +BlockEvents.rightClicked(event => { let item = event.item - if(item.id != 'tfg:armor_stand_arms') return + if (item.id !== 'tfg:armor_stand_arms') return let mob = event.block[event.facing].createEntity('minecraft:armor_stand') mob.mergeNbt('{ShowArms:1b}') mob.setPos(mob.x + 0.5, mob.y, mob.z + 0.5) mob.setYaw(event.player.yaw + 180) mob.spawn() - if (event.player.isCreative() == false){ + if (event.player.isCreative() === false){ item.shrink(1) } }) @@ -139,10 +140,8 @@ BlockEvents.rightClicked(event=>{ * @param {Internal.Player} player * @returns {Internal.CompoundTag} */ -function getTFGPersistentDataRoot(player) -{ - if(!player.persistentData.contains("tfg:custom_data")) - { +function getTFGPersistentDataRoot(player) { + if (!player.persistentData.contains("tfg:custom_data")) { player.persistentData.put("tfg:custom_data", {}); } return player.persistentData.getCompound("tfg:custom_data") @@ -186,13 +185,13 @@ function getTFGPersistentDataRoot(player) ItemEvents.entityInteracted(`tfg:fishing_net/${tier}`, (event) => { const {item, player, server, target} = event; - if (target.type != `tfc:${fish}`) return + if (target.type !== `tfc:${fish}`) return server.runCommandSilent(`particle minecraft:bubble_pop ${target.x} ${target.y} ${target.z} 0.5 0.5 0.5 0.00001 10`) server.runCommandSilent(`playsound minecraft:entity.player.splash player ${player.username} ${target.x} ${target.y} ${target.z} 2 2 1`) server.runCommandSilent(`tp ${target.uuid} ${target.x} ${target.y - 382} ${target.z}`) event.player.give(`tfc:food/${fish}`) player.swing() - if (player.isCreative() == false){ + if (player.isCreative() === false){ item.damageValue++ if (item.damageValue >= item.maxDamage) { server.runCommandSilent(`playsound minecraft:item.shield.break player ${player.username} ${player.x} ${player.y} ${player.z} 1 1 1`) @@ -207,13 +206,13 @@ function getTFGPersistentDataRoot(player) ItemEvents.entityInteracted(`tfg:fishing_net/${tier}`, (event) => { const {item, player, server, target} = event; - if (target.type != `tfc:${shellfish}`) return + if (target.type !== `tfc:${shellfish}`) return server.runCommandSilent(`particle minecraft:bubble_pop ${target.x} ${target.y} ${target.z} 0.5 0.5 0.5 0.00001 10`) server.runCommandSilent(`playsound minecraft:entity.player.splash player ${player.username} ${target.x} ${target.y} ${target.z} 2 2 1`) server.runCommandSilent(`tp ${target.uuid} ${target.x} ${target.y - 382} ${target.z}`) event.player.give('tfc:food/shellfish') player.swing() - if (player.isCreative() == false){ + if (player.isCreative() === false){ item.damageValue++ if (item.damageValue >= item.maxDamage) { server.runCommandSilent(`playsound minecraft:item.shield.break player ${player.username} ${player.x} ${player.y} ${player.z} 1 1 1`) @@ -227,13 +226,13 @@ function getTFGPersistentDataRoot(player) ItemEvents.entityInteracted(`tfg:fishing_net/${tier}`, (event) => { const {item, player, server, target} = event; - if (target.type != 'tfc:pufferfish') return + if (target.type !== 'tfc:pufferfish') return server.runCommandSilent(`particle minecraft:bubble_pop ${target.x} ${target.y} ${target.z} 0.5 0.5 0.5 0.00001 10`) server.runCommandSilent(`playsound minecraft:entity.player.splash player ${player.username} ${target.x} ${target.y} ${target.z} 2 2 1`) server.runCommandSilent(`tp ${target.uuid} ${target.x} ${target.y - 382} ${target.z}`) event.player.give('minecraft:pufferfish') player.swing() - if (player.isCreative() == false){ + if (player.isCreative() === false){ item.damageValue++ if (item.damageValue >= item.maxDamage) { server.runCommandSilent(`playsound minecraft:item.shield.break player ${player.username} ${player.x} ${player.y} ${player.z} 1 1 1`) @@ -269,7 +268,7 @@ function getTFGPersistentDataRoot(player) */ /** @type {BrickVariant[]} */ -global.BRICK_INDEX = (global.TFC_STONE_TYPES ?? []).map(tfc_stone => ({ +global.BRICK_INDEX = (global.TFC_STONE_TYPES ? global.TFC_STONE_TYPES : []).map(tfc_stone => ({ brick_type: tfc_stone, brick: `tfc:rock/bricks/${tfc_stone}`, brick_stairs: `tfc:rock/bricks/${tfc_stone}_stairs`, brick_slab: `tfc:rock/bricks/${tfc_stone}_slab`, brick_wall: `tfc:rock/bricks/${tfc_stone}_wall`, cracked_brick: `tfc:rock/cracked_bricks/${tfc_stone}`, cracked_stairs: `tfc:rock/cracked_bricks/${tfc_stone}_stairs`, cracked_slab: `tfc:rock/cracked_bricks/${tfc_stone}_slab`, cracked_wall: `tfc:rock/cracked_bricks/${tfc_stone}_wall`, @@ -277,7 +276,7 @@ global.BRICK_INDEX = (global.TFC_STONE_TYPES ?? []).map(tfc_stone => ({ smooth_brick: `tfc:rock/smooth/${tfc_stone}`, smooth_stairs: `tfc:rock/smooth/${tfc_stone}_stairs`, smooth_slab: `tfc:rock/smooth/${tfc_stone}_slab`, smooth_wall: `tfc:rock/smooth/${tfc_stone}_wall`, chiseled_brick: `tfc:rock/chiseled/${tfc_stone}` })); -(global.CREATE_DECO_BRICK_TYPES ?? []).slice(0, -1).forEach(create_brick => { +(global.CREATE_DECO_BRICK_TYPES ? global.CREATE_DECO_BRICK_TYPES : []).slice(0, -1).forEach(create_brick => { global.BRICK_INDEX.push({ brick_type: create_brick, brick: `createdeco:${create_brick}_bricks`, brick_stairs: `createdeco:${create_brick}_brick_stairs`, brick_slab: `createdeco:${create_brick}_brick_slab`, brick_wall: `createdeco:${create_brick}_brick_wall`, @@ -347,7 +346,7 @@ global.BRICK_INDEX = global.BRICK_INDEX.concat([ function transformBlockWithTool(event, inputBlock, outputBlock, toolId, damageTool, soundId, particleId, copyBlockstate) { const { server, item, player, block } = event; - if (!inputBlock || !outputBlock) {return}; + if (!inputBlock || !outputBlock) return; if (inputBlock.startsWith('#')) { if (!block.hasTag(inputBlock.substring(1))) return; @@ -356,15 +355,15 @@ function transformBlockWithTool(event, inputBlock, outputBlock, toolId, damageTo } if (toolId.startsWith('#')) { - if (item.isEmpty() || !player.mainHandItem.hasTag(toolId.substring(1))) {return}; + if (item.isEmpty() || !player.mainHandItem.hasTag(toolId.substring(1))) return; } else { - if (item.isEmpty() || player.mainHandItem.id !== toolId) {return}; + if (item.isEmpty() || player.mainHandItem.id !== toolId) return; } - if (!player.crouching) {return}; + if (!player.crouching) return; let state = block.getBlockState().toString(); - if (state.includes('[') && copyBlockstate == true) { + if (state.includes('[') && copyBlockstate === true) { state = state.substring(state.indexOf('[')); } else { state = ''; @@ -409,7 +408,7 @@ function transformBlockWithTool(event, inputBlock, outputBlock, toolId, damageTo function transformBlockWithItem(event, inputBlock, outputBlock, itemId, consumeItem, consumeAmount, soundId, particleId, copyBlockstate) { const { server, item, player, block } = event; - if (!inputBlock || !outputBlock) {return}; + if (!inputBlock || !outputBlock) return; if (inputBlock.startsWith('#')) { if (!block.hasTag(inputBlock.substring(1))) return; @@ -418,14 +417,14 @@ function transformBlockWithItem(event, inputBlock, outputBlock, itemId, consumeI } if (itemId.startsWith('#')) { - if (item.isEmpty() || !player.mainHandItem.hasTag(itemId.substring(1))) {return}; + if (item.isEmpty() || !player.mainHandItem.hasTag(itemId.substring(1))) return; } else { - if (item.isEmpty() || player.mainHandItem.id != itemId) {return}; + if (item.isEmpty() || player.mainHandItem.id !== itemId) return; } - if (!player.crouching) {return}; + if (!player.crouching) return; - var state = block.getBlockState().toString() - if (state.includes('[') && copyBlockstate == true){ + let state = block.getBlockState().toString() + if (state.includes('[') && copyBlockstate === true){ state = state.substring(block.getBlockState().toString().indexOf('[')); } else { state = '' diff --git a/kubejs/server_scripts/tfg/loot_tables.js b/kubejs/server_scripts/tfg/loot_tables.js index 8b2b532a0..f377a8868 100644 --- a/kubejs/server_scripts/tfg/loot_tables.js +++ b/kubejs/server_scripts/tfg/loot_tables.js @@ -34,7 +34,7 @@ function registerTFGLoots(event) { LootEntry.of('gtceu:rich_raw_rock_salt').when((c) => c.randomChance(0.1)), LootEntry.of('gtceu:rich_raw_salt').when((c) => c.randomChance(0.1)), - LootEntry.of('gtceu:rich_raw_saltpeter').when((c) => c.randomChance(0.1)), + LootEntry.of('gtceu:rich_raw_saltpeter').when((c) => c.randomChance(0.1)) ); }) //seeds @@ -48,8 +48,7 @@ function registerTFGLoots(event) { LootEntry.of('tfc:seeds/sugarcane').when((c) => c.randomChance(0.1)), LootEntry.of('firmalife:plant/pineapple_bush').when((c) => c.randomChance(0.1)), LootEntry.of('tfc:plant/peach_sapling').when((c) => c.randomChance(0.1)), - LootEntry.of('tfc:plant/red_apple_sapling').when((c) => c.randomChance(0.1)), - ); + LootEntry.of('tfc:plant/red_apple_sapling').when((c) => c.randomChance(0.1))); }) //loot .pool((pool) => { @@ -79,8 +78,7 @@ function registerTFGLoots(event) { LootEntry.of('gtceu:bismuth_bronze_pickaxe_head').when((c) => c.randomChance(0.1)), LootEntry.of('gtceu:bismuth_bronze_axe_head').when((c) => c.randomChance(0.1)), LootEntry.of('gtceu:bismuth_bronze_shovel_head').when((c) => c.randomChance(0.1)), - LootEntry.of('gtceu:bismuth_bronze_knife_head').when((c) => c.randomChance(0.1)), - ); + LootEntry.of('gtceu:bismuth_bronze_knife_head').when((c) => c.randomChance(0.1))); }) }); @@ -120,9 +118,9 @@ function registerTFGLoots(event) { STRONG_GLASSES.forEach(glass => { event.addBlockLootModifier(glass[0]) .addLoot(glass[0]) - if(glass[1]){ - event.addBlockLootModifier(glass[0] + "_pane") - .addLoot(glass[0] + "_pane") + if (glass[1]) { + event.addBlockLootModifier(`${glass[0] }_pane`) + .addLoot(`${glass[0] }_pane`) } }); @@ -131,25 +129,25 @@ function registerTFGLoots(event) { event.addBlockLootModifier(glass) .matchMainHand(Item.of('tfc:gem_saw')) .addLoot(glass) - event.addBlockLootModifier(glass + "_pane") + event.addBlockLootModifier(`${glass }_pane`) .matchMainHand(Item.of('tfc:gem_saw')) - .addLoot(glass + "_pane") + .addLoot(`${glass }_pane`) }) global.TFC_WOOD_TYPES.forEach(wood => { - const id = 'everycomp:c/tfc/' + wood + "_window_pane" + const id = `everycomp:c/tfc/${ wood }_window_pane` event.addBlockLootModifier(id) .addLoot(id) }) global.AFC_WOOD_TYPES.forEach(wood => { - const id = 'everycomp:c/afc/' + wood + "_window_pane" + const id = `everycomp:c/afc/${ wood }_window_pane` event.addBlockLootModifier(id) .addLoot(id) }) global.AD_ASTRA_WOOD.forEach(wood => { - const id = 'everycomp:c/ad_astra/' + wood.name + "_window_pane" + const id = `everycomp:c/ad_astra/${ wood.name }_window_pane` event.addBlockLootModifier(id) .addLoot(id) }) diff --git a/kubejs/server_scripts/tfg/recipes.collapse.js b/kubejs/server_scripts/tfg/recipes.collapse.js index 48501107c..570a5055c 100644 --- a/kubejs/server_scripts/tfg/recipes.collapse.js +++ b/kubejs/server_scripts/tfg/recipes.collapse.js @@ -1,6 +1,9 @@ // priority: 0 "use strict"; +/** + * @param {Internal.RecipesEventJS} event + */ function registerTFGCollapseRecipes(event) { // #region Nether diff --git a/kubejs/server_scripts/tfg/recipes.converting.js b/kubejs/server_scripts/tfg/recipes.converting.js index 505880a2a..f29da9fe2 100644 --- a/kubejs/server_scripts/tfg/recipes.converting.js +++ b/kubejs/server_scripts/tfg/recipes.converting.js @@ -1,6 +1,9 @@ // priority: 0 "use strict"; +/** + * @param {Internal.RecipesEventJS} event + */ function registerTFGConvertingRecipes(event) { event.shapeless("afc:tree_tap", "treetap:tap") diff --git a/kubejs/server_scripts/tfg/recipes.fishing_nets.js b/kubejs/server_scripts/tfg/recipes.fishing_nets.js index d074b6268..32968ed7d 100644 --- a/kubejs/server_scripts/tfg/recipes.fishing_nets.js +++ b/kubejs/server_scripts/tfg/recipes.fishing_nets.js @@ -1,6 +1,9 @@ // priority: 0 "use strict"; +/** + * @param {Internal.RecipesEventJS} event + */ function registerTFGFishingNetsRecipes(event) { //wood diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index 8fcb8b342..9460eec77 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -56,7 +56,7 @@ function registerTFGFoodRecipes(event) { } }) - $ISPRecipeLogic.RegisterRecipeData(type + "/" + id, inputs, (data.itemOutputProvider === undefined) ? null : data.itemOutputProvider.asCanonClass(), data.itemOutputs.slice(outputFirstIndex).map(i => Item.of(i))) + $ISPRecipeLogic.RegisterRecipeData(`${type }/${ id}`, inputs, (data.itemOutputProvider === undefined) ? null : data.itemOutputProvider.asCanonClass(), data.itemOutputs.slice(outputFirstIndex).map(i => Item.of(i))) let r = event.recipes.gtceu[type](id) .duration(duration) @@ -67,7 +67,7 @@ function registerTFGFoodRecipes(event) { if (data.itemInputs.length > 0) r.itemInputs(data.itemInputs) if (data.fluidInputs.length > 0) r.inputFluids(data.fluidInputs); if (data.fluidOutputs.length > 0) r.outputFluids(data.fluidOutputs); - if (text != "") r.addDataString("action", text); + if (text !== "") r.addDataString("action", text); return r; } @@ -101,7 +101,6 @@ function registerTFGFoodRecipes(event) { itemInputs: [input], itemOutputs: [out], fluidInputs: (fluid === undefined) ? [] : [fluid], - itemInputs: [input], itemOutputProvider: (isFirmaDynamic) ? TFC.isp.of(out).firmaLifeCopyDynamicFood() : TFC.isp.of(out).copyFood().addTrait("firmalife:oven_baked") }) } diff --git a/kubejs/server_scripts/tfg/recipes.medicine.js b/kubejs/server_scripts/tfg/recipes.medicine.js index e82b12aa7..72bb7e4fc 100644 --- a/kubejs/server_scripts/tfg/recipes.medicine.js +++ b/kubejs/server_scripts/tfg/recipes.medicine.js @@ -1,6 +1,9 @@ // priority: 0 "use strict"; +/** + * @param {Internal.RecipesEventJS} event + */ function registerTFGMedicineRecipes(event) { //#region Antipoison diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 92fcda5e9..8b8cd7408 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -931,7 +931,7 @@ function registerTFGMiscellaneousRecipes(event) { ChemicalHelper.get(TagPrefix.plate, GTMaterials.HSLASteel, 4), ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 2), ChemicalHelper.get(TagPrefix.rod, GTMaterials.SteelMagnetic, 1), - ChemicalHelper.get(TagPrefix.wireFine, GTMaterials[type.materialId], 4), + ChemicalHelper.get(TagPrefix.wireFine, GTMaterials[type.materialId], 4) ) .inputFluids(Fluid.of('gtceu:silicone_rubber', 144)) .itemOutputs(Item.of('tfg:superconductor_coil_small', 4 * multiplier)) @@ -944,8 +944,7 @@ function registerTFGMiscellaneousRecipes(event) { ChemicalHelper.get(TagPrefix.plate, GTMaterials.HSLASteel, 4), ChemicalHelper.get(TagPrefix.rod, GTMaterials.Steel, 2), ChemicalHelper.get(TagPrefix.rod, GTMaterials.SteelMagnetic, 1), - ChemicalHelper.get(TagPrefix.wireGtSingle, GTMaterials[type.materialId], 4), - ) + ChemicalHelper.get(TagPrefix.wireGtSingle, GTMaterials[type.materialId], 4)) .inputFluids(Fluid.of('gtceu:silicone_rubber', 144)) .itemOutputs(Item.of('tfg:superconductor_coil_large', 4 * multiplier)) .circuit(7) diff --git a/kubejs/server_scripts/tfg/recipes.molds.js b/kubejs/server_scripts/tfg/recipes.molds.js index e6513e943..0496f86d4 100644 --- a/kubejs/server_scripts/tfg/recipes.molds.js +++ b/kubejs/server_scripts/tfg/recipes.molds.js @@ -1,6 +1,9 @@ // priority: 0 "use strict"; +/** + * @param {Internal.RecipesEventJS} event + */ function registerTFGMoldRecipes(event) { event.shaped('tfg:mining_hammer_head_extruder_mold', [ diff --git a/kubejs/server_scripts/tfg/recipes.paper.js b/kubejs/server_scripts/tfg/recipes.paper.js index 22c1981ee..39ce77bba 100644 --- a/kubejs/server_scripts/tfg/recipes.paper.js +++ b/kubejs/server_scripts/tfg/recipes.paper.js @@ -1,9 +1,12 @@ // priority: 0 "use strict"; +/** + * @param {Internal.RecipesEventJS} event + */ function registerTFGPapermakingRecipes(event) { - var generateVatRecipe = (id, inputItem, fluid, fluidAmount, output) => { + const generateVatRecipe = (id, inputItem, fluid, fluidAmount, output) => { event.custom({ "type": "firmalife:vat", "input_item": { @@ -21,9 +24,9 @@ function registerTFGPapermakingRecipes(event) { }).id(id) } - var generatePotRecipe = (id, maxAmountOfInputItems, inputItem, inputFluid, inputFluidAmount, outputItem, ticks, temperature) => { + const generatePotRecipe = (id, maxAmountOfInputItems, inputItem, inputFluid, inputFluidAmount, outputItem, ticks, temperature) => { for (let i = 0; i < maxAmountOfInputItems; i++) { - var iPlusOne = i + 1 + let iPlusOne = i + 1 let inputsArray = new Array(iPlusOne) for (let j = 0; j < iPlusOne; j++) { inputsArray[j] = inputItem diff --git a/kubejs/server_scripts/tfg/recipes.recycling.js b/kubejs/server_scripts/tfg/recipes.recycling.js index a8fad83d0..e268a0478 100644 --- a/kubejs/server_scripts/tfg/recipes.recycling.js +++ b/kubejs/server_scripts/tfg/recipes.recycling.js @@ -1,6 +1,9 @@ // priority: 0 "use strict"; +/** + * @param {Internal.RecipesEventJS} event + */ function registerTFGRecyclingRecipes(event) { //MV Refrigerator diff --git a/kubejs/server_scripts/tfg/recipes.rocks.js b/kubejs/server_scripts/tfg/recipes.rocks.js index 9cd0483ad..678242b8b 100644 --- a/kubejs/server_scripts/tfg/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/recipes.rocks.js @@ -1,6 +1,9 @@ // priority: 0 "use strict"; +/** + * @param {Internal.RecipesEventJS} event + */ function registerTFGRockRecipes(event) { // #region Nether rock recipes @@ -171,7 +174,7 @@ function registerTFGRockRecipes(event) { { raw: 'ad_astra:mars_cobblestone', hammered: 'ad_astra:mars_sand' }, { raw: 'ad_astra:venus_stone', hammered: 'ad_astra:venus_cobblestone' }, { raw: 'tfg:rock/hardened_venus_stone', hammered: 'ad_astra:venus_cobblestone' }, - { raw: 'ad_astra:venus_cobblestone', hammered: 'ad_astra:venus_sand' },, + { raw: 'ad_astra:venus_cobblestone', hammered: 'ad_astra:venus_sand' }, { raw: 'ad_astra:mercury_stone', hammered: 'ad_astra:mercury_cobblestone' }, { raw: 'tfg:rock/hardened_mercury_stone', hammered: 'ad_astra:mercury_cobblestone' }, { raw: 'ad_astra:mercury_cobblestone', hammered: 'tfc:sand/red' }, @@ -530,7 +533,7 @@ function registerTFGRockRecipes(event) { event.stonecutting(x.stair, x.raw).id(`${x.raw}_to_${x.stair}`.replace(/:/g, '_')) } - if (x.dust != null) { + if (x.dust !== null) { event.recipes.gtceu.macerator(`macerate_${x.stair}`.replace(/:/g, '_')) .itemInputs(x.stair) .itemOutputs(x.dust) @@ -550,7 +553,7 @@ function registerTFGRockRecipes(event) { event.stonecutting(`2x ${x.slab}`, x.raw).id(`${x.raw}_to_${x.slab}`.replace(/:/g, '_')) } - if (x.dust != null) { + if (x.dust !== null) { event.recipes.gtceu.macerator(`macerate_${x.slab}`.replace(/:/g, '_')) .itemInputs(`2x ${x.slab}`) .itemOutputs(x.dust) @@ -570,7 +573,7 @@ function registerTFGRockRecipes(event) { event.stonecutting(x.wall, x.raw).id(`${x.raw}_to_${x.wall}`.replace(/:/g, '_')) } - if (x.dust != null) { + if (x.dust !== null) { event.recipes.gtceu.macerator(`macerate_${x.wall}`.replace(/:/g, '_')) .itemInputs(x.wall) .itemOutputs(x.dust) diff --git a/kubejs/server_scripts/tfg/recipes.space.js b/kubejs/server_scripts/tfg/recipes.space.js index d7bf846f3..99069b8b2 100644 --- a/kubejs/server_scripts/tfg/recipes.space.js +++ b/kubejs/server_scripts/tfg/recipes.space.js @@ -1,6 +1,9 @@ // priority: 0 "use strict"; +/** + * @param {Internal.RecipesEventJS} event + */ function registerTFGSpaceRecipes(event) { // TODO: Change these to work on any dim as long as they're in an oxygenated area? @@ -126,7 +129,7 @@ function registerTFGSpaceRecipes(event) { .outputFluids(Fluid.of("minecraft:water", 1000)) event.recipes.gtceu.aqueous_accumulator('sea_water_orbit') - .circuit(aaCircuit++) + .circuit(aaCircuit) .dimension('ad_astra:earth_orbit') .dimension('ad_astra:moon_orbit') .dimension('ad_astra:mars_orbit') diff --git a/kubejs/server_scripts/tfg/recipes.stone_dusts.js b/kubejs/server_scripts/tfg/recipes.stone_dusts.js index 660797008..d63e44a26 100644 --- a/kubejs/server_scripts/tfg/recipes.stone_dusts.js +++ b/kubejs/server_scripts/tfg/recipes.stone_dusts.js @@ -1,6 +1,9 @@ // priority: 0 "use strict"; +/** + * @param {Internal.RecipesEventJS} event + */ function registerTFGStoneDustRecipes(event) { event.remove({ id: 'gtceu:electrolyzer/decomposition_electrolyzing_blackstone' }) diff --git a/kubejs/server_scripts/tfg/recipes.supports.js b/kubejs/server_scripts/tfg/recipes.supports.js index 26ae7a657..86dd3b6a4 100644 --- a/kubejs/server_scripts/tfg/recipes.supports.js +++ b/kubejs/server_scripts/tfg/recipes.supports.js @@ -1,6 +1,9 @@ // priority: 0 "use strict"; +/** + * @param {Internal.RecipesEventJS} event + */ function registerTFGSupportRecipes(event) { // Concrete Supports diff --git a/kubejs/server_scripts/tfg/recipes.terrariums.js b/kubejs/server_scripts/tfg/recipes.terrariums.js index 62a2aeaff..68c5e64fe 100644 --- a/kubejs/server_scripts/tfg/recipes.terrariums.js +++ b/kubejs/server_scripts/tfg/recipes.terrariums.js @@ -1,6 +1,9 @@ // priority: 0 "use strict"; +/** + * @param {Internal.RecipesEventJS} event + */ function registerTFGTerrariumRecipes(event) { event.remove({ id: 'gtceu:gas_collector/nether_air' }) diff --git a/kubejs/server_scripts/tfg/tags.facades.js b/kubejs/server_scripts/tfg/tags.facades.js index 46545f290..50ee5df9c 100644 --- a/kubejs/server_scripts/tfg/tags.facades.js +++ b/kubejs/server_scripts/tfg/tags.facades.js @@ -198,80 +198,77 @@ function registerFacadeWhitelistTags(event) { //gtceu stonelike stuff gtceu_stonelike_fm.forEach(facade_material => { - if(facade_material != 'marble') - { - event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_cobblestone') - event.add('tfg:whitelisted/facades', 'gtceu:mossy_' + facade_material + '_cobblestone') - event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_bricks') - event.add('tfg:whitelisted/facades', 'gtceu:cracked_' + facade_material + '_bricks') - event.add('tfg:whitelisted/facades', 'gtceu:mossy_' + facade_material + '_bricks') + if (facade_material !== 'marble') { + event.add('tfg:whitelisted/facades', `gtceu:${ facade_material }_cobblestone`) + event.add('tfg:whitelisted/facades', `gtceu:mossy_${ facade_material }_cobblestone`) + event.add('tfg:whitelisted/facades', `gtceu:${ facade_material }_bricks`) + event.add('tfg:whitelisted/facades', `gtceu:cracked_${ facade_material }_bricks`) + event.add('tfg:whitelisted/facades', `gtceu:mossy_${ facade_material }_bricks`) } - event.add('tfg:whitelisted/facades', 'gtceu:polished_' + facade_material) - event.add('tfg:whitelisted/facades', 'gtceu:chiseled' + facade_material) + event.add('tfg:whitelisted/facades', `gtceu:polished_${ facade_material}`) + event.add('tfg:whitelisted/facades', `gtceu:chiseled${ facade_material}`) - event.add('tfg:whitelisted/facades', 'gtceu:small_' + facade_material + '_bricks') - event.add('tfg:whitelisted/facades', 'gtceu:square_' + facade_material + '_bricks') + event.add('tfg:whitelisted/facades', `gtceu:small_${ facade_material }_bricks`) + event.add('tfg:whitelisted/facades', `gtceu:square_${ facade_material }_bricks`) - event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_tile') - event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_small_tile') - event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_windmill_a') - event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_windmill_b') + event.add('tfg:whitelisted/facades', `gtceu:${ facade_material }_tile`) + event.add('tfg:whitelisted/facades', `gtceu:${ facade_material }_small_tile`) + event.add('tfg:whitelisted/facades', `gtceu:${ facade_material }_windmill_a`) + event.add('tfg:whitelisted/facades', `gtceu:${ facade_material }_windmill_b`) }); //gtceu misc colored blocks global.MINECRAFT_DYE_NAMES.forEach(facade_material => { - event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_metal_sheet') - event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_large_metal_sheet') - event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_studs') + event.add('tfg:whitelisted/facades', `gtceu:${ facade_material }_metal_sheet`) + event.add('tfg:whitelisted/facades', `gtceu:${ facade_material }_large_metal_sheet`) + event.add('tfg:whitelisted/facades', `gtceu:${ facade_material }_studs`) }); //create copper create_copper_fm.forEach(facade_material => { - event.add('tfg:whitelisted/facades', 'create:' + facade_material + '_shingles') - event.add('tfg:whitelisted/facades', 'create:' + facade_material + '_tiles') + event.add('tfg:whitelisted/facades', `create:${ facade_material }_shingles`) + event.add('tfg:whitelisted/facades', `create:${ facade_material }_tiles`) }); //create rocks create_rock_types_fm.forEach(facade_material => { - if(facade_material == 'limestone') - { - event.add('tfg:whitelisted/facades', 'create:' + facade_material) + if (facade_material === 'limestone') { + event.add('tfg:whitelisted/facades', `create:${ facade_material}`) } - event.add('tfg:whitelisted/facades', 'create:cut_' + facade_material) - event.add('tfg:whitelisted/facades', 'create:polished_cut_' + facade_material) - event.add('tfg:whitelisted/facades', 'create:cut_' + facade_material + '_bricks') - event.add('tfg:whitelisted/facades', 'create:small_' + facade_material + '_bricks') - event.add('tfg:whitelisted/facades', 'create:layered_' + facade_material) - event.add('tfg:whitelisted/facades', 'create:' + facade_material + '_pillar') + event.add('tfg:whitelisted/facades', `create:cut_${ facade_material}`) + event.add('tfg:whitelisted/facades', `create:polished_cut_${ facade_material}`) + event.add('tfg:whitelisted/facades', `create:cut_${ facade_material }_bricks`) + event.add('tfg:whitelisted/facades', `create:small_${ facade_material }_bricks`) + event.add('tfg:whitelisted/facades', `create:layered_${ facade_material}`) + event.add('tfg:whitelisted/facades', `create:${ facade_material }_pillar`) }); //rnr shingles global.TFC_WOOD_TYPES.concat(global.AFC_WOOD_TYPES).forEach(facade_material => { - event.add('tfg:whitelisted/facades', 'rnr:wood/shingles/' + facade_material) + event.add('tfg:whitelisted/facades', `rnr:wood/shingles/${ facade_material}`) }); //createdeco bricks createdeco_bricks_fm.forEach(facade_material => { - if (facade_material != 'red_bricks') - { - event.add('tfg:whitelisted/facades', 'createdeco:' + facade_material) + if (facade_material !== 'red_bricks') { + event.add('tfg:whitelisted/facades', `createdeco:${ facade_material}`) } - event.add('tfg:whitelisted/facades', 'createdeco:short_' + facade_material) - event.add('tfg:whitelisted/facades', 'createdeco:long_' + facade_material) - event.add('tfg:whitelisted/facades', 'createdeco:tiled_' + facade_material) - event.add('tfg:whitelisted/facades', 'createdeco:corner_' + facade_material) - event.add('tfg:whitelisted/facades', 'createdeco:cracked_' + facade_material) - event.add('tfg:whitelisted/facades', 'createdeco:mossy_' + facade_material) + event.add('tfg:whitelisted/facades', `createdeco:short_${ facade_material}`) + event.add('tfg:whitelisted/facades', `createdeco:long_${ facade_material}`) + event.add('tfg:whitelisted/facades', `createdeco:tiled_${ facade_material}`) + event.add('tfg:whitelisted/facades', `createdeco:corner_${ facade_material}`) + event.add('tfg:whitelisted/facades', `createdeco:cracked_${ facade_material}`) + event.add('tfg:whitelisted/facades', `createdeco:mossy_${ facade_material}`) }); //everycomp windows global.TFC_WOOD_TYPES.forEach(facade_material => { - event.add('tfg:whitelisted/facades', 'everycomp:c/tfc/' + facade_material + '_window') + event.add('tfg:whitelisted/facades', `everycomp:c/tfc/${ facade_material }_window`) }); global.AFC_WOOD_TYPES.forEach(facade_material => { - event.add('tfg:whitelisted/facades', 'everycomp:c/afc/' + facade_material + '_window') + event.add('tfg:whitelisted/facades', `everycomp:c/afc/${ facade_material }_window`) }); } diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 178f30613..6979a7bee 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -148,7 +148,9 @@ const registerTFGItemTags = (event) => { }) // Universal Circuits - global.UNIVERSAL_CIRCUIT_TIERS.forEach(tier => { event.add(`gtceu:circuits/${tier}`, `tfg:${tier}_universal_circuit`); }) + global.UNIVERSAL_CIRCUIT_TIERS.forEach(tier => { + event.add(`gtceu:circuits/${tier}`, `tfg:${tier}_universal_circuit`); +}) // Brick Index const BRICK_KEYS = [ diff --git a/kubejs/server_scripts/toolbelt/recipes.js b/kubejs/server_scripts/toolbelt/recipes.js index 5631ea870..edeaf6c45 100644 --- a/kubejs/server_scripts/toolbelt/recipes.js +++ b/kubejs/server_scripts/toolbelt/recipes.js @@ -26,13 +26,13 @@ const registerToolBeltRecipes = (event) => { A: '#forge:string', B: '#forge:leather', C: '#forge:plates/wrought_iron' - }).id('tfg:toolbelt/shaped/belt_' + 2) + }).id(`tfg:toolbelt/shaped/belt_${ 2}`) // ToolBelt с размером 3 - 9 for (let i = 3; i < 10; i++) { event.shapeless(Item.of('toolbelt:belt', {Size:i}), [ Ingredient.of(Item.of('toolbelt:belt', {Size:i-1}).strongNBT()).or(Ingredient.of(Item.of('toolbelt:belt', {Size:i-1,Items:[]}).strongNBT())), 'toolbelt:pouch' - ]).id('tfg:toolbelt/shaped/belt_' + i) + ]).id(`tfg:toolbelt/shaped/belt_${ i}`) } } diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 8b7d62533..f124340d5 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -269,14 +269,14 @@ function registerVintageImprovementsRecipes(event) { forEachMaterial(material => { const ingotItem = ChemicalHelper.get(TagPrefix.ingot, material, 1); - if (ingotItem != null && ingotItem.hasTag('c:hidden_from_recipe_viewers')) + if (ingotItem !== null && ingotItem.hasTag('c:hidden_from_recipe_viewers')) return; const gemItem = ChemicalHelper.get(TagPrefix.gem, material, 1); - if (gemItem != null && gemItem.hasTag('c:hidden_from_recipe_viewers')) + if (gemItem !== null && gemItem.hasTag('c:hidden_from_recipe_viewers')) return; - if (ingotItem == null && gemItem == null) + if (ingotItem === null && gemItem === null) return; // #region Coiling @@ -300,7 +300,7 @@ function registerVintageImprovementsRecipes(event) { } const singleWire = ChemicalHelper.get(TagPrefix.wireGtSingle, material, 2) - if (singleWire != null) { + if (singleWire !== null) { event.custom({ type: 'vintageimprovements:coiling', ingredients: [ChemicalHelper.get(TagPrefix.ingot, material, 1)], @@ -310,15 +310,14 @@ function registerVintageImprovementsRecipes(event) { } if (material.hasFlag(MaterialFlags.GENERATE_FINE_WIRE)) { - if (singleWire != null) { + if (singleWire !== null) { event.custom({ type: 'vintageimprovements:coiling', ingredients: [ChemicalHelper.get(TagPrefix.wireGtSingle, material, 1)], results: [ChemicalHelper.get(TagPrefix.wireFine, material, 4)], processingTime: material.getMass() * 3 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER }).id(`tfg:vi/coiling/${material.getName()}_fine_wire`) - } - else { + } else { event.custom({ type: 'vintageimprovements:coiling', ingredients: [ChemicalHelper.get(TagPrefix.ingot, material, 1)], @@ -338,21 +337,21 @@ function registerVintageImprovementsRecipes(event) { // aaaaargh I hate these custom type recipes let gem = `gtceu:${material.getName()}_gem`; - if (material == GTMaterials.Coal) + if (material === GTMaterials.Coal) gem = 'minecraft:coal' - else if (material == GTMaterials.Diamond) + else if (material === GTMaterials.Diamond) gem = 'minecraft:diamond' - else if (material == GTMaterials.Emerald) + else if (material === GTMaterials.Emerald) gem = 'minecraft:emerald' - else if (material == GTMaterials.Lapis) + else if (material === GTMaterials.Lapis) gem = 'minecraft:lapis_lazuli' - else if (material == GTMaterials.NetherQuartz) + else if (material === GTMaterials.NetherQuartz) gem = 'minecraft:quartz' - else if (material == GTMaterials.Amethyst) + else if (material === GTMaterials.Amethyst) gem = 'minecraft:amethyst_shard' - else if (material == GTMaterials.CertusQuartz) + else if (material === GTMaterials.CertusQuartz) gem = 'ae2:certus_quartz_crystal' - else if (material == TFGHelpers.getMaterial('rose_quartz')) + else if (material === TFGHelpers.getMaterial('rose_quartz')) gem = 'create:rose_quartz' event.custom({ @@ -379,7 +378,7 @@ function registerVintageImprovementsRecipes(event) { ? ChemicalHelper.get(TagPrefix.gem, material, 1) : ChemicalHelper.get(TagPrefix.ingot, material, 1) - if (latheInput != null) { + if (latheInput !== null) { event.custom({ type: 'vintageimprovements:turning', ingredients: [latheInput], @@ -512,13 +511,14 @@ function registerVintageImprovementsRecipes(event) { // LV recipes only let EUt = (r.tickInputs && r.tickInputs.eu) ? r.tickInputs.eu[0].content : null; - if (!(EUt <= 32)) { return } + + if (!(EUt <= 32)) return // Skip this one - if (r.outputs.item[0].content.ingredient.item == "gtceu:nan_certificate") { return } + if (r.outputs.item[0].content.ingredient.item === "gtceu:nan_certificate") return // Skip glass too - if (r.inputs.item[0].content.ingredient.item == "gtceu:glass_dust") { return } + if (r.inputs.item[0].content.ingredient.item === "gtceu:glass_dust") return // And this - if (r.inputs.item[0].content.ingredient.item == "gtceu:damascus_steel_ingot") { return } + if (r.inputs.item[0].content.ingredient.item === "gtceu:damascus_steel_ingot") return let input = r.inputs.item[0].content.ingredient; input.count = r.inputs.item[0].content.count; diff --git a/kubejs/server_scripts/vintage_improvements/tags.js b/kubejs/server_scripts/vintage_improvements/tags.js index 74bb29da7..d83ebd999 100644 --- a/kubejs/server_scripts/vintage_improvements/tags.js +++ b/kubejs/server_scripts/vintage_improvements/tags.js @@ -43,7 +43,7 @@ function registerVintageImprovementsItemTags(event) { event.add('vintageimprovements:curving_heads', 'gtceu:ingot_extruder_mold') event.add('vintageimprovements:curving_heads', 'gtceu:bottle_extruder_mold') event.add('vintageimprovements:curving_heads', 'gtceu:foil_extruder_mold') - event.add('vintageimprovements:curving_heads', 'gtceu:credit_casting_mold') + event.add('vintageimprovements:curving_heads', 'gtceu:cylinder_casting_mold') } diff --git a/kubejs/startup_scripts/gtceu/blocks.js b/kubejs/startup_scripts/gtceu/blocks.js deleted file mode 100644 index c89fe12c0..000000000 --- a/kubejs/startup_scripts/gtceu/blocks.js +++ /dev/null @@ -1,6 +0,0 @@ -// priority: 0 -"use strict"; - -const registerGTCEuBlocks = (event) => { - -} \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/items.js b/kubejs/startup_scripts/gtceu/items.js index 473ace5ee..b595c4f20 100644 --- a/kubejs/startup_scripts/gtceu/items.js +++ b/kubejs/startup_scripts/gtceu/items.js @@ -35,4 +35,5 @@ const registerGTCEuItems = (event) => { event.create('tfg:chipboard_composite') .translationKey('item.chipboard_composite') + } diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index 659116325..8c04f9e2b 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -1,13 +1,7 @@ // priority: 0 -"use strict"; const registerGTCEuMachines = (event) => { - GTMachineUtils.registerCrate(GTMaterials.BismuthBronze, 54, "Bismuth Bronze Crate"); - GTMachineUtils.registerCrate(GTMaterials.BlackBronze, 54, "Black Bronze Crate"); - GTMachineUtils.registerDrum(GTMaterials.BismuthBronze, 32000, "Bismuth Bronze Drum"); - GTMachineUtils.registerDrum(GTMaterials.BlackBronze, 32000, "Black Bronze Drum"); - const $SteamMulti = Java.loadClass('com.gregtechceu.gtceu.common.machine.multiblock.steam.SteamParallelMultiblockMachine'); const $Tags = Java.loadClass("dev.latvian.mods.kubejs.util.Tags") @@ -81,10 +75,9 @@ const registerGTCEuMachines = (event) => { .where('e', GTMachines.ENERGY_INPUT_HATCH[GTValues.MV], Direction.NORTH) .build() ) - .workableCasingRenderer( + .workableCasingModel( "gtceu:block/casings/solid/machine_casing_inert_ptfe", - "gtceu:block/machines/gas_collector", false - ) + "gtceu:block/machines/gas_collector") //#endregion @@ -171,10 +164,9 @@ const registerGTCEuMachines = (event) => { .where('e', GTMachines.ENERGY_INPUT_HATCH[GTValues.HV], Direction.NORTH) .build() ) - .workableCasingRenderer( + .workableCasingModel( "gtceu:block/casings/solid/machine_casing_stable_titanium", - "gtceu:block/machines/gas_collector", false - ) + "gtceu:block/machines/gas_collector") //#endregion @@ -213,15 +205,12 @@ const registerGTCEuMachines = (event) => { .where('I', GTMachines.STEAM_IMPORT_BUS, Direction.SOUTH) .build() ) - .workableCasingRenderer( + .workableCasingModel( "gtceu:block/casings/solid/machine_casing_bronze_plated_bricks", - "tfg:block/steam_bloomery", false - ) + "tfg:block/steam_bloomery") //#endregion - //#region Large Solar Pannel - From Sky of Grind for the code thanks a lot - - event.create('large_solar_panel', 'multiblock') + event.create('large_solar_panel', 'multiblock') .rotationState(RotationState.NON_Y_AXIS) .generator(true) .recipeType('large_solar_panel') @@ -252,8 +241,6 @@ const registerGTCEuMachines = (event) => { .where(' ', Predicates.any()) .build() ) - .workableCasingRenderer( - 'tfg:block/casings/machine_casing_iron_desh', - 'gtceu:block/multiblock/hpca', true) + .workableCasingModel('tfg:block/casings/machine_casing_iron_desh', 'gtceu:block/multiblock/hpca') -} +} \ No newline at end of file diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index d7a23d192..81d8b8e1f 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -46,7 +46,7 @@ const registerGTCEuMaterialModification = (event) => { GENERATE_FINE_WIRE, } = $MATERIAL_FLAGS - var metalTooling = [ + const metalTooling = [ GTToolType.AXE, GTToolType.PICKAXE, GTToolType.HARD_HAMMER, @@ -260,9 +260,9 @@ const registerGTCEuMaterialModification = (event) => { // Hide netherite too GTMaterials.Netherite.getProperty(PropertyKey.TOOL).removeTypes(metalTooling); - for (var material of GTCEuAPI.materialManager.getRegisteredMaterials()) { - var toolProperty = material.getProperty(PropertyKey.TOOL); - if (toolProperty == null) + for (let material of GTCEuAPI.materialManager.getRegisteredMaterials()) { + let toolProperty = material.getProperty(PropertyKey.TOOL); + if (toolProperty === null) continue; toolProperty.setDurability(toolProperty.getDurability() * 6); @@ -339,10 +339,9 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.Thorium.setMaterialSecondaryARGB(0xcd8dbc) - global.MINECRAFT_DYE_NAMES.forEach(colorName => - { - var material = GTCEuAPI.materialManager.getMaterial(`gtceu:${colorName}_dye`); - var property = material.getProperty(PropertyKey.FLUID); + global.MINECRAFT_DYE_NAMES.forEach(colorName => { + let material = GTCEuAPI.materialManager.getMaterial(`gtceu:${colorName}_dye`); + let property = material.getProperty(PropertyKey.FLUID); property.getStorage().store($FluidStorageKeys.LIQUID, () => Fluid.of(`tfc:${colorName}_dye`).fluid, null); }); diff --git a/kubejs/startup_scripts/gtceu/recipe_types.js b/kubejs/startup_scripts/gtceu/recipe_types.js index acfa8362a..cfbf4f01e 100644 --- a/kubejs/startup_scripts/gtceu/recipe_types.js +++ b/kubejs/startup_scripts/gtceu/recipe_types.js @@ -1,36 +1,33 @@ -// priority: 0 -"use strict"; +const registerGTCEuRecipeTypes = (event) => { + event.create('nether_dome') + .category('nether_dome') + .setEUIO('in') + .setMaxIOSize(2, 1, 1, 1) + .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.FIRE) -const registerGTCEuRecipeTypes = (event) => { - event.create('nether_dome') - .category('nether_dome') - .setEUIO('in') - .setMaxIOSize(2, 1, 1, 1) - .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, FillDirection.LEFT_TO_RIGHT) - .setSound(GTSoundEntries.FIRE) + event.create('end_dome') + .category('end_dome') + .setEUIO('in') + .setMaxIOSize(2, 1, 1, 1) + .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.FIRE) - event.create('end_dome') - .category('end_dome') - .setEUIO('in') - .setMaxIOSize(2, 1, 1, 1) + event.create('steam_bloomery') + .category('steam_bloomery') + .setEUIO('in') + .setMaxIOSize(2, 1, 0, 0) .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, FillDirection.LEFT_TO_RIGHT) - .setSound(GTSoundEntries.FIRE) + .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.FIRE) - event.create('steam_bloomery') - .category('steam_bloomery') - .setEUIO('in') - .setMaxIOSize(2, 1, 0, 0) - .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) - .setSound(GTSoundEntries.FIRE) - - event.create('large_solar_panel') - .category('generator') - .setEUIO('out') - .setMaxIOSize(2, 0, 2, 1) - .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) - .setSound(GTSoundEntries.COOLING) -} + event.create('large_solar_panel') + .category('generator') + .setEUIO('out') + .setMaxIOSize(2, 0, 2, 1) + .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.COOLING) +} diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index 13b791aeb..17f75d1f8 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -69,10 +69,6 @@ GTCEuStartupEvents.registry('gtceu:dimension_marker', event => { registerTFGDimensionMarkers(event) }) -TFCEvents.registerFoodTrait(event => { - registerTFGFoodTraits(event) -}) - Platform.mods.primitive_creatures.name = "Primitive Creatures"; Platform.mods.tfg.name = "TerraFirmaGreg"; Platform.mods.kubejs.name = "TerraFirmaGreg"; diff --git a/kubejs/startup_scripts/mega_cells/constants.js b/kubejs/startup_scripts/mega_cells/constants.js index 1a11854d2..495cbe451 100644 --- a/kubejs/startup_scripts/mega_cells/constants.js +++ b/kubejs/startup_scripts/mega_cells/constants.js @@ -17,7 +17,6 @@ global.MEGA_CELLS_DISABLED_ITEMS = [ 'megacells:fluid_storage_cell_256m', 'megacells:portable_item_cell_256m', -, 'megacells:portable_fluid_cell_256m', 'megacells:256m_crafting_storage', diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index fbcb52315..02f558801 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -5,6 +5,7 @@ * Список хранит предметы, * у которых должны быть удалены тэги и они должны быть скрыты в REI. */ + global.MINECRAFT_DISABLED_ITEMS = [ // Зараженные блоки 'minecraft:infested_stone', diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 48869932e..38c9cfd1d 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -1083,13 +1083,13 @@ global.TFC_MAGMA_BLOCKS = [ global.calcAmountOfMetal = (defaultAmount, percents) => { const value = defaultAmount / (100 / percents) - return (value % 2 == 0) ? value : Math.round(value) - 1 + return (value % 2 === 0) ? value : Math.round(value) - 1 } // This prevents the "exploit" where Cassiterite dust gives 2x as much from melting as smelting in a furnace global.calcAmountOfMetalProcessed = (defaultAmount, percents) => { const percentPerItem = percents / Math.ceil(percents / 100) const value = defaultAmount * (percentPerItem / 100) - return (value % 2 == 0) ? value : Math.round(value) - 1 + return (value % 2 === 0) ? value : Math.round(value) - 1 } diff --git a/kubejs/startup_scripts/tfc/register_climates.js b/kubejs/startup_scripts/tfc/register_climates.js index 8a2a1a8df..4a7c88f4b 100644 --- a/kubejs/startup_scripts/tfc/register_climates.js +++ b/kubejs/startup_scripts/tfc/register_climates.js @@ -48,12 +48,10 @@ function calcCurrentTemp(averageTemp, seaLevel, playerY, calendarTicks, tempRang // This is taken from TFC's OverworldClimateModel.java let elevationTemp = clamp((playerY - seaLevel) * 0.16225, 0, 17.822); return averageTemp - elevationTemp + tempDiff; - } - else if (playerY > 20) { + } else if (playerY > 20) { return averageTemp + (tempDiff * (playerY / seaLevel)); - } - else { + } else { // TODO: check this let depthPercent = 1 - (playerY / 20); diff --git a/kubejs/startup_scripts/tfg/blocks.crops.js b/kubejs/startup_scripts/tfg/blocks.crops.js index 843cbf2ea..e3a0c2f2d 100644 --- a/kubejs/startup_scripts/tfg/blocks.crops.js +++ b/kubejs/startup_scripts/tfg/blocks.crops.js @@ -10,7 +10,7 @@ const registerTFGCrops = (event) => { .stages(4) .doubleStages(2) .hardness(0.4) - ['productItem(java.util.function.Consumer)'](product=> { + ['productItem(java.util.function.Consumer)'](product => { product.translationKey('item.tfg.sunflower_product') product.texture('tfg:item/sunflower_product') }) diff --git a/kubejs/startup_scripts/tfg/events.food_traits.js b/kubejs/startup_scripts/tfg/events.food_traits.js deleted file mode 100644 index d19a4deac..000000000 --- a/kubejs/startup_scripts/tfg/events.food_traits.js +++ /dev/null @@ -1,7 +0,0 @@ -"use strict"; - -function registerTFGFoodTraits(event) { - - event.registerTraitWithTooltip(0.02, 'tfg:freeze_dried') - -} \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index e9ae5f284..8044a06fd 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -50,8 +50,7 @@ const registerTFGItems = (event) => { event.create('tfg:unfired_chalk') .translationKey('item.tfg.unfired_chalk') - Color.DYE.forEach((dyeName, dye) => - { + Color.DYE.forEach((dyeName, dye) => { event.create(`tfg:wet_${dyeName}_chalk`) .translationKey(`item.tfg.wet_${dyeName}_chalk`) .textureJson({ diff --git a/pakku-lock.json b/pakku-lock.json index a3699d4d8..be3b0a6dd 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -6971,7 +6971,7 @@ "files": [ { "type": "modrinth", - "file_name": "greate-0.0.45.jar", + "file_name": "greate-0.0.48.jar", "mc_versions": [ "1.20.1" ], @@ -6980,19 +6980,19 @@ "neoforge" ], "release_type": "alpha", - "url": "https://cdn.modrinth.com/data/8wDcQuht/versions/2DOzdz5j/greate-0.0.45.jar", - "id": "2DOzdz5j", + "url": "https://cdn.modrinth.com/data/8wDcQuht/versions/cWoAmFlf/greate-0.0.48.jar", + "id": "cWoAmFlf", "parent_id": "8wDcQuht", "hashes": { - "sha512": "cb1c218604364c9659a9e76ef1ed2b12e14beb17f8515dd7de55ccd91f2d5ac0f88c7d49a74f92e05b09ecf9f86a040cedb821f9a94093d36f3d437990f49367", - "sha1": "65ae0462ffc07fc66ad13db7ca682c8b0cf34dfb" + "sha512": "c38a2bd9546f6b1a0fc1d500aea9ff1884d080bb42f803a19abba26438c22bed83051871a311cab1f56eee09df59426243df2bb0f495d8c61cab268edc3df2bc", + "sha1": "4a76bcbed081397312c837b24f818da497410d30" }, "required_dependencies": [ "7tG215v7", "LNytGWDc" ], - "size": 1531791, - "date_published": "2025-07-05T02:56:36.684356Z" + "size": 1504296, + "date_published": "2025-07-23T00:01:40.637121Z" }, { "type": "curseforge", @@ -7038,6 +7038,27 @@ "modrinth": "7tG215v7" }, "files": [ + { + "type": "modrinth", + "file_name": "gtceu-1.20.1-7.0.2.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "beta", + "url": "https://cdn.modrinth.com/data/7tG215v7/versions/a5uJZGHy/gtceu-1.20.1-7.0.2.jar", + "id": "a5uJZGHy", + "parent_id": "7tG215v7", + "hashes": { + "sha512": "a288c35f5afc4b8e77c7d207680260939587234c02fc63e2746d290e277e66673143d186ddea7d0a3423e4985fef73857c3985dd6410e4cc55fc1af96713905b", + "sha1": "602e4690cf99ddd49146a26f0629ac53bd6813db" + }, + "required_dependencies": [], + "size": 17590375, + "date_published": "2025-07-20T19:38:09.055323Z" + }, { "type": "curseforge", "file_name": "gtceu-1.20.1-1.6.4.jar", @@ -7058,27 +7079,6 @@ "required_dependencies": [], "size": 11787892, "date_published": "2025-03-02T06:22:56.823Z" - }, - { - "type": "modrinth", - "file_name": "gtceu-1.20.1-1.6.4.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "beta", - "url": "https://cdn.modrinth.com/data/7tG215v7/versions/agSy623h/gtceu-1.20.1-1.6.4.jar", - "id": "agSy623h", - "parent_id": "7tG215v7", - "hashes": { - "sha512": "3915ddb104b7cd6b6a9c3213749c8d4c0a3c1eb07745fdbe97d881ab6661853ce0d9411aad0fde5c933648bafb03417455184abcc641e6af7f4c5fab92daa418", - "sha1": "8f9705cb309bc862f1abf684717bc6c87165604a" - }, - "required_dependencies": [], - "size": 11787892, - "date_published": "2025-03-02T06:23:05.388636Z" } ] },