From 040ccfda2c41af98cf86f67aadc9c1ca11dce4fe Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 31 Dec 2025 11:56:42 +0000 Subject: [PATCH] fix greate stress levels #2564 --- CHANGELOG.md | 1 + config/crash_assistant/modlist.json | 10 +-- defaultconfigs/greate-server.toml | 89 ------------------- .../greate/material_modification.js | 16 ++++ kubejs/startup_scripts/greate/materials.js | 26 +++--- 5 files changed, 36 insertions(+), 106 deletions(-) create mode 100644 kubejs/startup_scripts/greate/material_modification.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 584467168..9503c712d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Unreleased ### Changes ### Bug fixes +- Fixed Greate stress levels (#2564) @Pyritie ### Translation updates ## [0.11.14] - 31-12-2025 diff --git a/config/crash_assistant/modlist.json b/config/crash_assistant/modlist.json index b4218ae78..e453588be 100644 --- a/config/crash_assistant/modlist.json +++ b/config/crash_assistant/modlist.json @@ -1402,12 +1402,12 @@ "curseForgeHash": 837967200, "modrinthHash": "107d4aec4694c509ea7ea8f3963478ae8002f46e" }, - "TerraFirmaGreg-Core-Modern-0.8.12.jar": { - "jarName": "TerraFirmaGreg-Core-Modern-0.8.12.jar", + "TerraFirmaGreg-Core-Modern-0.8.13.jar": { + "jarName": "TerraFirmaGreg-Core-Modern-0.8.13.jar", "modId": "tfg", - "version": "0.8.12", - "curseForgeHash": 3615222056, - "modrinthHash": "320db558605f446a76db4355e1a8e1b008c33630" + "version": "0.8.13", + "curseForgeHash": 1252674808, + "modrinthHash": "557984bbe48f571e60426b370d6fa52baa4a1cef" }, "tfc_gurman-1.2.0.jar": { "jarName": "tfc_gurman-1.2.0.jar", diff --git a/defaultconfigs/greate-server.toml b/defaultconfigs/greate-server.toml index c97be947b..cdf03e0a6 100644 --- a/defaultconfigs/greate-server.toml +++ b/defaultconfigs/greate-server.toml @@ -1,7 +1,3 @@ -#. -#Multiplier used for calculating how many ticks should initially be removed in fan processing recipes, based on how fast the fan is spinning. -#Range: 0.0 ~ 3.4028234663852886E38 -fanSpeedMultiplier = 0.75 #. #Parameters and abilities of Greate's kinetic mechanisms @@ -243,91 +239,6 @@ fanSpeedMultiplier = 0.75 neutronium_mechanical_saw = 5.0 neutronium_mechanical_pump = 5.0 - #. - #Fine tune settings related to tiers - [kinetics.stressValues.v2.maxCapacity] - - #. - #. - #Settings related to andesite tier machines - [kinetics.stressValues.v2.maxCapacity.andesite] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - andesiteMaxCapacity = 32 - - #. - #Settings related to steel tier machines - [kinetics.stressValues.v2.maxCapacity.steel] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - steelMaxCapacity = 128 - - #. - #Settings related to aluminium tier machines - [kinetics.stressValues.v2.maxCapacity.aluminium] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - aluminiumMaxCapacity = 512 - - #. - #Settings related to stainless steel tier machines - [kinetics.stressValues.v2.maxCapacity.stainlessSteel] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - stainlessSteelMaxCapacity = 2048 - - #. - #Settings related to titanium tier machines - [kinetics.stressValues.v2.maxCapacity.titanium] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - titaniumMaxCapacity = 8192 - - #. - #Settings related to tungstensteel tier machines - [kinetics.stressValues.v2.maxCapacity.tungstensteel] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - tungstensteelMaxCapacity = 32768 - - #. - #Settings related to palladium tier machines - [kinetics.stressValues.v2.maxCapacity.palladium] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - palladiumMaxCapacity = 131072 - - #. - #Settings related to naquadah tier machines - [kinetics.stressValues.v2.maxCapacity.naquadah] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - naquadahMaxCapacity = 524288 - - #. - #Settings related to darmstadtium tier machines - [kinetics.stressValues.v2.maxCapacity.darmstadtium] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - darmstadtiumMaxCapacity = 2097152 - - #. - #Settings related to neutronium tier machines - [kinetics.stressValues.v2.maxCapacity.neutronium] - #. - #Configure the max stress a kinetic block of this tier can support. - #Range: > -2147483648 - neutroniumMaxCapacity = 8388608 - #. #Fine tune settings related to pumps [kinetics.pumps] diff --git a/kubejs/startup_scripts/greate/material_modification.js b/kubejs/startup_scripts/greate/material_modification.js new file mode 100644 index 000000000..21b3e8055 --- /dev/null +++ b/kubejs/startup_scripts/greate/material_modification.js @@ -0,0 +1,16 @@ +// priority: 0 +"use strict"; + +const registerGreateMaterialModification = (event) => { + + const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials") + + // Add flags + $GreateMaterials.RoseQuartz.addFlags( + GTMaterialFlags.GENERATE_LENS + ); + + // Material composition + $GreateMaterials.AndesiteAlloy.setComponents([]) + $GreateMaterials.AndesiteAlloy.setFormula("?") +} \ No newline at end of file diff --git a/kubejs/startup_scripts/greate/materials.js b/kubejs/startup_scripts/greate/materials.js index 8a176bd71..562be0323 100644 --- a/kubejs/startup_scripts/greate/materials.js +++ b/kubejs/startup_scripts/greate/materials.js @@ -1,10 +1,11 @@ +// priority: 0 "use strict"; - const registerGreateMaterials = (event) => { // Belt materials should already have an ingot and plate item already const $BeltProperty = Java.loadClass("electrolyte.greate.content.gtceu.material.BeltProperty") const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials") + const $GreatePropertyKeys = Java.loadClass("electrolyte.greate.content.gtceu.material.GreatePropertyKeys") // Wood belt $GreateMaterials.AndesiteAlloy.setProperty(GreatePropertyKeys.BELT, new $BeltProperty([$GreateMaterials.AndesiteAlloy], 5)) @@ -25,16 +26,17 @@ const registerGreateMaterials = (event) => { GTMaterials.SiliconeRubber.setProperty(GreatePropertyKeys.BELT, new $BeltProperty([GTMaterials.StainlessSteel, GTMaterials.Aluminium], 25)) GTMaterials.StyreneButadieneRubber.setProperty(GreatePropertyKeys.BELT, new $BeltProperty([GTMaterials.Titanium, GTMaterials.StainlessSteel], 30)) -} -const registerGreateMaterialModification = (event) => { - - const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials") - - $GreateMaterials.RoseQuartz.addFlags( - GTMaterialFlags.GENERATE_LENS - ); - - $GreateMaterials.AndesiteAlloy.setComponents([]) - $GreateMaterials.AndesiteAlloy.setFormula("?") + // Change stress levels + let capacity = 32; + $GreateMaterials.AndesiteAlloy.getProperty($GreatePropertyKeys.KINETIC).setMaxCapacity(capacity); + GTMaterials.Steel.getProperty($GreatePropertyKeys.KINETIC).setMaxCapacity(capacity *= 4); + GTMaterials.Aluminium.getProperty($GreatePropertyKeys.KINETIC).setMaxCapacity(capacity *= 4); + GTMaterials.StainlessSteel.getProperty($GreatePropertyKeys.KINETIC).setMaxCapacity(capacity *= 4); + GTMaterials.Titanium.getProperty($GreatePropertyKeys.KINETIC).setMaxCapacity(capacity *= 4); + GTMaterials.TungstenSteel.getProperty($GreatePropertyKeys.KINETIC).setMaxCapacity(capacity *= 4); + GTMaterials.RhodiumPlatedPalladium.getProperty($GreatePropertyKeys.KINETIC).setMaxCapacity(capacity *= 4); + GTMaterials.NaquadahAlloy.getProperty($GreatePropertyKeys.KINETIC).setMaxCapacity(capacity *= 4); + GTMaterials.Darmstadtium.getProperty($GreatePropertyKeys.KINETIC).setMaxCapacity(capacity *= 4); + GTMaterials.Neutronium.getProperty($GreatePropertyKeys.KINETIC).setMaxCapacity(capacity *= 4); } \ No newline at end of file