From 6945751ac452bb3dd073cc51bb2a095a902c03b3 Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Mon, 17 Nov 2025 22:22:21 -0600 Subject: [PATCH] bunch of misc things before the update (#2236) * update pakku for core * Update moldraw.yaml * kaolinite moment * adjust flintlock to wrought iron to see how it goes * tweak flintlock damage * Update CHANGELOG.md Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> --------- Signed-off-by: GameStar <56610486+BlueBoat29@users.noreply.github.com> --- CHANGELOG.md | 1 + config/moldraw.yaml | 2 +- kubejs/assets/tfg/molecules/kaolinite.json | 707 ++++++++++++++++++ kubejs/server_scripts/tacz/index_modifiers.js | 11 + kubejs/server_scripts/tacz/recipes.guns.js | 6 +- kubejs/server_scripts/tacz/recipes.misc.js | 18 +- pakku-lock.json | 36 +- 7 files changed, 758 insertions(+), 23 deletions(-) create mode 100644 kubejs/assets/tfg/molecules/kaolinite.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 45276d97c..b3d9162c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Reduced base food oven recipe time from 300 to 200 ticks @Redeix - Made Nitrocellulose less annoying to craft @BlueBoat29 - Added tags to platinum group ores @Mqrius +- Moved the Flintlock from Steel --> Wrought Iron @BlueBoat29 ### Bug fixes - Fixed TFC bug where paths and roads can collapse on themselves when creating a staircase shape. (#2144) @Redeix - Fixed the HV aqueous accumulator water recipe so the amount of water can actually fit in the HV machine @Pyritie diff --git a/config/moldraw.yaml b/config/moldraw.yaml index 412541969..85f917542 100644 --- a/config/moldraw.yaml +++ b/config/moldraw.yaml @@ -4,7 +4,7 @@ debugMode: false coloredAtoms: true -useMaterialColors: true +useMaterialColors: false onlyShowOnShift: true diff --git a/kubejs/assets/tfg/molecules/kaolinite.json b/kubejs/assets/tfg/molecules/kaolinite.json new file mode 100644 index 000000000..991af7e08 --- /dev/null +++ b/kubejs/assets/tfg/molecules/kaolinite.json @@ -0,0 +1,707 @@ +{ + "contents": [ + { + "type": "atom", + "element": "Si", + "index": 0, + "x": 1.6063, + "y": -0.595 + }, + { + "type": "atom", + "element": "Si", + "index": 1, + "x": 2.5813, + "y": -0.2263 + }, + { + "type": "atom", + "element": "Si", + "index": 2, + "x": 4.5, + "y": -0.9388 + }, + { + "type": "atom", + "element": "Si", + "index": 3, + "x": 5.8438, + "y": -0.0013 + }, + { + "type": "atom", + "element": "Si", + "index": 4, + "x": 7.95, + "y": -0.57 + }, + { + "type": "atom", + "element": "Si", + "index": 5, + "x": 8.5688, + "y": -0.1688 + }, + { + "type": "atom", + "element": "O", + "index": 6, + "x": 0.0, + "y": 0.0 + }, + { + "type": "atom", + "element": "O", + "index": 7, + "x": 3.125, + "y": -0.0438 + }, + { + "type": "atom", + "element": "O", + "index": 8, + "x": 2.1, + "y": 0.2437 + }, + { + "type": "atom", + "element": "O", + "index": 9, + "x": 1.1813, + "y": 0.6937 + }, + { + "type": "atom", + "element": "O", + "index": 10, + "x": 4.1438, + "y": 0.5437 + }, + { + "type": "atom", + "element": "O", + "index": 11, + "x": 4.4625, + "y": -0.5113 + }, + { + "type": "atom", + "element": "O", + "index": 12, + "x": 6.2813, + "y": 0.0387 + }, + { + "type": "atom", + "element": "O", + "index": 13, + "x": 6.3125, + "y": 0.9012 + }, + { + "type": "atom", + "element": "O", + "index": 14, + "x": 7.325, + "y": 0.5325 + }, + { + "type": "atom", + "element": "O", + "index": 15, + "x": 8.3625, + "y": 0.2825 + }, + { + "type": "atom", + "element": "O", + "index": 16, + "x": 9.4188, + "y": -0.1113 + }, + { + "type": "atom", + "element": "O", + "index": 17, + "x": 9.8125, + "y": 0.5262 + }, + { + "type": "atom", + "element": "O", + "index": 18, + "x": 4.4563, + "y": -2.4988 + }, + { + "type": "atom", + "element": "O", + "index": 19, + "x": 5.9938, + "y": -1.7263 + }, + { + "type": "atom", + "element": "O", + "index": 20, + "x": 2.625, + "y": -1.945 + }, + { + "type": "atom", + "element": "O", + "index": 21, + "x": 1.775, + "y": -2.3388 + }, + { + "type": "atom", + "element": "O", + "right": "H", + "index": 22, + "x": 5.095, + "y": -2.0925 + }, + { + "type": "atom", + "element": "O", + "index": 23, + "x": 8.4925, + "y": -1.8438 + }, + { + "type": "atom", + "element": "O", + "below": "H", + "index": 24, + "x": 0.833, + "y": -4.4747 + }, + { + "type": "atom", + "element": "O", + "below": "H", + "index": 25, + "x": 3.503, + "y": -4.6247 + }, + { + "type": "atom", + "element": "O", + "below": "H", + "index": 26, + "x": 4.253, + "y": -4.2047 + }, + { + "type": "atom", + "element": "O", + "below": "H", + "index": 27, + "x": 6.883, + "y": -4.3747 + }, + { + "type": "atom", + "element": "O", + "below": "H", + "index": 28, + "x": 7.593, + "y": -4.0047 + }, + { + "type": "atom", + "element": "Al", + "index": 29, + "x": 6.393, + "y": -3.0147 + }, + { + "type": "atom", + "element": "Al", + "index": 30, + "x": 3.013, + "y": -3.2547 + }, + { + "type": "atom", + "element": "O", + "index": 31, + "x": 8.0671, + "y": -2.3257 + }, + { + "type": "bond", + "a": 6, + "b": 8, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 9, + "b": 8, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 9, + "b": 10, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 10, + "b": 8, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 8, + "b": 7, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 7, + "b": 11, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 11, + "b": 12, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 12, + "b": 7, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 13, + "b": 10, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 10, + "b": 14, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 14, + "b": 13, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 14, + "b": 15, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 15, + "b": 17, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 17, + "b": 14, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 12, + "b": 16, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 16, + "b": 15, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 7, + "b": 18, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 18, + "b": 11, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 18, + "b": 12, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 6, + "b": 21, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 21, + "b": 7, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 23, + "b": 17, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 20, + "b": 21, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 21, + "b": 22, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 22, + "b": 20, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 22, + "b": 19, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 22, + "b": 23, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 23, + "b": 19, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 24, + "b": 21, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 26, + "b": 25, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 27, + "b": 26, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 27, + "b": 28, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 23, + "b": 28, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 22, + "b": 26, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 25, + "b": 22, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 22, + "b": 27, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 12, + "b": 15, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 21, + "b": 25, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 9, + "b": 20, + "lines": [ + "solid", + "dotted" + ] + }, + { + "type": "bond", + "a": 8, + "b": 21, + "lines": [ + "dotted" + ] + }, + { + "type": "bond", + "a": 8, + "b": 20, + "lines": [ + "dotted" + ] + }, + { + "type": "bond", + "a": 13, + "b": 19, + "lines": [ + "dotted" + ] + }, + { + "type": "bond", + "a": 10, + "b": 19, + "lines": [ + "dotted" + ] + }, + { + "type": "bond", + "a": 14, + "b": 19, + "lines": [ + "dotted" + ] + }, + { + "type": "bond", + "a": 14, + "b": 23, + "lines": [ + "dotted" + ] + }, + { + "type": "bond", + "a": 15, + "b": 23, + "lines": [ + "dotted" + ] + }, + { + "type": "bond", + "a": 20, + "b": 24, + "lines": [ + "dotted" + ] + }, + { + "type": "bond", + "a": 24, + "b": 25, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 24, + "b": 26, + "lines": [ + "dotted" + ] + }, + { + "type": "bond", + "a": 26, + "b": 20, + "lines": [ + "dotted" + ] + }, + { + "type": "bond", + "a": 19, + "b": 26, + "lines": [ + "dotted" + ] + }, + { + "type": "bond", + "a": 26, + "b": 28, + "lines": [ + "dotted" + ] + }, + { + "type": "bond", + "a": 28, + "b": 19, + "lines": [ + "dotted" + ] + }, + { + "type": "bond", + "a": 10, + "b": 20, + "lines": [ + "dotted" + ] + }, + { + "type": "bond", + "a": 6, + "b": 7, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 27, + "b": 23, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 12, + "b": 31, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 31, + "b": 16, + "lines": [ + "solid" + ] + }, + { + "type": "bond", + "a": 15, + "b": 31, + "lines": [ + "dotted" + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/tacz/index_modifiers.js b/kubejs/server_scripts/tacz/index_modifiers.js index 01946e5b8..3f7cc5d57 100644 --- a/kubejs/server_scripts/tacz/index_modifiers.js +++ b/kubejs/server_scripts/tacz/index_modifiers.js @@ -109,6 +109,17 @@ const gunDataLogic = (event) => { const id = event.getId().toString(); const json = JSON.parse(event.getStdJson()); + if (id === "ulv_guns:flintlock_data"){ + json.bullet.damage = 14; + json.bullet.extra_damage.damage_adjust = + [ + {"distance": 15, "damage": 14}, + {"distance": 35, "damage": 12}, + {"distance": 45, "damage": 10}, + {"distance": "infinite", "damage": 8} + ] + } + if(id === "create_armorer:pistol_revolver_torque_data"){ json.bullet.extra_damage.armor_ignore = 0.25; } diff --git a/kubejs/server_scripts/tacz/recipes.guns.js b/kubejs/server_scripts/tacz/recipes.guns.js index 2ec61fc5b..40d6dda8f 100644 --- a/kubejs/server_scripts/tacz/recipes.guns.js +++ b/kubejs/server_scripts/tacz/recipes.guns.js @@ -10,13 +10,13 @@ function registerTACZGunRecipes(event){ ], { A: '#forge:tools/files', B: 'tfg:flintlock_mechanism', - C: 'gtceu:steel_small_fluid_pipe', + C: 'gtceu:lead_small_fluid_pipe', D: '#firmaciv:hard_wood', E: '#forge:tools/saws', F: '#forge:ingots/brass', G: '#forge:tools/screwdrivers' - }).id('tacz:flintlock_pistol'); + }).id('tfg_tacz:flintlock_pistol'); /* NYI event.shaped(Item.of('tacz:modern_kinetic_gun', '{GunCurrentAmmoCount:0,GunFireMode:"SEMI",GunId:"ulv_guns:blunderbuss",HasBulletInBarrel:1b}'), [ 'ABC', @@ -46,7 +46,7 @@ function registerTACZGunRecipes(event){ F: '#forge:ingots/black_steel', G: '#forge:tools/screwdrivers' - }).id('tacz:trapdoor_rifle'); + }).id('tfg_tacz:trapdoor_rifle'); //DB shotguns event.recipes.gtceu.assembler('tfg_tacz:db_short') diff --git a/kubejs/server_scripts/tacz/recipes.misc.js b/kubejs/server_scripts/tacz/recipes.misc.js index 90901ff94..c37803055 100644 --- a/kubejs/server_scripts/tacz/recipes.misc.js +++ b/kubejs/server_scripts/tacz/recipes.misc.js @@ -59,6 +59,22 @@ function registerTACZMiscRecipes(event) { }).id('tfg:shell_casing_extruder_mold'); //Mechanisms + event.shaped('tfg:flintlock_mechanism', [ + 'ABC', + 'DEF', + 'GHI' + ], { + A: '#forge:tools/screwdrivers', + B: '#forge:gems/flint', + C: '#forge:tools/files', + D: '#forge:springs', + E: '#forge:bolts/wrought_iron', + F: '#forge:double_plates/wrought_iron', + G: '#forge:tools/wire_cutters', + H: '#forge:gears/wrought_iron', + I: '#forge:tools/hammers' + }).id('tfg:shaped/flintlock_mechanism_iron'); + event.shaped('tfg:flintlock_mechanism', [ 'ABC', 'DEF', @@ -73,7 +89,7 @@ function registerTACZMiscRecipes(event) { G: '#forge:tools/wire_cutters', H: '#forge:small_gears/steel', I: '#forge:tools/hammers' - }).id('tfg:shaped/flintlock_mechanism'); + }).id('tfg:shaped/flintlock_mechanism_steel'); event.recipes.gtceu.assembler('tfg:advanced_clockwork_mechanism') .itemInputs('2x greate:aluminium_cogwheel', 'greate:silicone_rubber_belt_connector', '2x #forge:springs/aluminium', diff --git a/pakku-lock.json b/pakku-lock.json index fc79be611..26a1b0f0a 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -13809,7 +13809,7 @@ "files": [ { "type": "modrinth", - "file_name": "TerraFirmaGreg-Core-Modern-0.8.5.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.8.6.jar", "mc_versions": [ "1.20.1" ], @@ -13818,44 +13818,44 @@ "neoforge" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/f95K1jmA/TerraFirmaGreg-Core-Modern-0.8.5.jar", - "id": "f95K1jmA", + "url": "https://cdn.modrinth.com/data/lNttW2Xl/versions/w34zm4Xq/TerraFirmaGreg-Core-Modern-0.8.6.jar", + "id": "w34zm4Xq", "parent_id": "lNttW2Xl", "hashes": { - "sha512": "222d5b1f39261ea051316a7ac68acf9761f41d815b84a0325887957784cb52ec9388146f9435cdbec6fc42f236cc4b6f3bfb6b7da1b59102f90f414ad7aa62fb", - "sha1": "d4d7f1a4fa9690d45b09b17ca2d6f00097ac4d25" + "sha512": "677785f7b14208293f9a4ec2d1605339b47f3bd76e81daf5709fb9a19851f4a5149b590e9e2ad4a423839352946d3f976897089386da6508cfad5bd0f82e6499", + "sha1": "8c37ab2de9e8a646395b49088d21abb692e54909" }, "required_dependencies": [ - "7tG215v7", - "JaCEZUhg" + "JaCEZUhg", + "7tG215v7" ], - "size": 9246856, - "date_published": "2025-10-29T13:26:55.488427Z" + "size": 9283735, + "date_published": "2025-11-17T08:16:44.842196Z" }, { "type": "curseforge", - "file_name": "TerraFirmaGreg-Core-Modern-0.8.5.jar", + "file_name": "TerraFirmaGreg-Core-Modern-0.8.6.jar", "mc_versions": [ "1.20.1" ], "loaders": [ - "neoforge", - "forge" + "forge", + "neoforge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/7163/303/TerraFirmaGreg-Core-Modern-0.8.5.jar", - "id": "7163303", + "url": "https://edge.forgecdn.net/files/7231/807/TerraFirmaGreg-Core-Modern-0.8.6.jar", + "id": "7231807", "parent_id": "513402", "hashes": { - "sha1": "d4d7f1a4fa9690d45b09b17ca2d6f00097ac4d25", - "md5": "dd221274e0df33e3312defa69f416350" + "sha1": "8c37ab2de9e8a646395b49088d21abb692e54909", + "md5": "0fba8bdf94413edb751a97ed05943ca8" }, "required_dependencies": [ "302973", "890405" ], - "size": 9246856, - "date_published": "2025-10-29T13:26:50.930Z" + "size": 9283735, + "date_published": "2025-11-17T08:16:39.213Z" } ] },