From 8fed595b827caa44d40eced0384ccebb3bf2c2b4 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 18:00:43 +0100 Subject: [PATCH 01/53] some quest tweaks --- .../ftbquests/quests/chapters/questsmetallurgy.snbt | 2 ++ config/ftbquests/quests/chapters/questsstoneage.snbt | 12 +++++++++--- config/ftbquests/quests/chapters/queststfc_tips.snbt | 2 ++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/config/ftbquests/quests/chapters/questsmetallurgy.snbt b/config/ftbquests/quests/chapters/questsmetallurgy.snbt index 824726725..59d0386e7 100644 --- a/config/ftbquests/quests/chapters/questsmetallurgy.snbt +++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt @@ -427,6 +427,7 @@ id: "tfc:kaolin_clay" } type: "item" + weak_nbt_match: true }] title: "{quests.metal_age.kaolin_clay.title}" x: 13.5d @@ -884,6 +885,7 @@ } title: "Any #tfc:blast_furnace_fuel" type: "item" + weak_nbt_match: true }] title: "{quests.metal_age.blast_furnace_fuel.title}" x: 23.5d diff --git a/config/ftbquests/quests/chapters/questsstoneage.snbt b/config/ftbquests/quests/chapters/questsstoneage.snbt index 372346e1a..8920810bd 100644 --- a/config/ftbquests/quests/chapters/questsstoneage.snbt +++ b/config/ftbquests/quests/chapters/questsstoneage.snbt @@ -622,7 +622,7 @@ "{quests.stone_age.firepit.desc.2}" "{image:tfg:textures/quests/firepit.png width:100 height:100 align:center}" ] - icon: "tfc:firepit" + icon: "minecraft:campfire" id: "5301A38F7EA81140" subtitle: "{quests.stone_age.firepit.subtitle}" tasks: [ @@ -671,6 +671,7 @@ id: "tfc:metal/anvil/copper" } type: "item" + weak_nbt_match: true }] title: "{quests.metal_age.copper_anvil.title}" x: 26.0d @@ -691,7 +692,7 @@ count: 7L id: "5A6EF9EBF232601C" item: { - Count: 7 + Count: 1 ForgeCaps: { "tfc:item_heat": { heat: 0.0f @@ -701,6 +702,7 @@ id: "gtceu:copper_double_ingot" } type: "item" + weak_nbt_match: true }] title: "{quests.stone_age.weld_copper_ingots.title}" x: 21.0d @@ -777,6 +779,7 @@ id: "minecraft:copper_ingot" } type: "item" + weak_nbt_match: true }] title: "{quests.stone_age.copper_for_anvil.title}" x: 17.0d @@ -1806,7 +1809,7 @@ Count: 1 ForgeCaps: { "tfc:food": { - creationDate: -9223372036854775808L + creationDate: 10908000L traits: [ ] } } @@ -2114,6 +2117,7 @@ } title: "Any #forge:crushed_ores" type: "item" + weak_nbt_match: true }] title: "{quests.stone_age.crush_ore.title}" x: 18.0d @@ -2146,6 +2150,7 @@ } title: "Any #forge:impure_dusts" type: "item" + weak_nbt_match: true } { disable_toast: true @@ -2191,6 +2196,7 @@ } title: "Any #forge:dusts" type: "item" + weak_nbt_match: true }] title: "{quests.stone_age.clean_dust.title}" x: 17.0d diff --git a/config/ftbquests/quests/chapters/queststfc_tips.snbt b/config/ftbquests/quests/chapters/queststfc_tips.snbt index e33e2790d..838c35264 100644 --- a/config/ftbquests/quests/chapters/queststfc_tips.snbt +++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt @@ -2346,6 +2346,7 @@ } title: "Any #tfg:unfinished_lamps" type: "item" + weak_nbt_match: true } { id: "146E09EE00F0EC3F" @@ -2358,6 +2359,7 @@ } title: "Any #tfc:lamps" type: "item" + weak_nbt_match: true } ] title: "{quests.tfg_tips.lamps.title}" From 6fd8da5557114f039a7ff55087bb16eb085946e6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 18:00:56 +0100 Subject: [PATCH 02/53] remove netherite tools --- kubejs/startup_scripts/gtceu/constants.js | 5 +++++ kubejs/startup_scripts/gtceu/materials.js | 2 ++ 2 files changed, 7 insertions(+) diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 2353bf80b..0cc3aa43b 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -53,6 +53,11 @@ global.GTCEU_DISABLED_ITEMS = [ 'gtceu:stone_buzz_saw_blade', 'gtceu:stone_wrench_tip', + 'gtceu:netherite_nugget', + 'gtceu:tiny_netherite_dust', + 'gtceu:small_netherite_dust', + 'gtceu:netherite_dust', + 'gtceu:treated_wood_hanging_sign', 'gtceu:treated_wood_boat', 'gtceu:treated_wood_chest_boat', diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index 255e7627f..c715c17de 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -229,6 +229,8 @@ const registerGTCEuMaterialModification = (event) => { // Cast iron tools don't make sense but gregtech shits itself if they're missing, // so I'm just giving them terrible terrible stats GTMaterials.Iron.setProperty(PropertyKey.TOOL, ToolProperty.Builder.of(2.5, 1.0, 20, 2, [GTToolType.PICKAXE]).build()); + // Hide netherite too + GTMaterials.Netherite.getProperty(PropertyKey.TOOL).removeTypes(metalTooling); for (var material of GTCEuAPI.materialManager.getRegisteredMaterials()) { var toolProperty = material.getProperty(PropertyKey.TOOL); From f98b5292e8490733b9346b975b19c4387408e7fc Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 18:01:12 +0100 Subject: [PATCH 03/53] I think I might've fixed #1028????? --- kubejs/server_scripts/gregtech/utility.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/kubejs/server_scripts/gregtech/utility.js b/kubejs/server_scripts/gregtech/utility.js index e0dfc26d0..b34746d18 100644 --- a/kubejs/server_scripts/gregtech/utility.js +++ b/kubejs/server_scripts/gregtech/utility.js @@ -164,12 +164,8 @@ function generatePlatedBlockRecipe(event, material) { .EUt(GTValues.VA[GTValues.LV]) } -//const $MRM = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.IMaterialRegistryManager') - function forEachMaterial(iterator) { - //if (GTMaterialRegistry.getPhase() === $MRM.Phase.CLOSED || GTMaterialRegistry.getPhase() === $MRM.Phase.FROZEN) { - GTMaterialRegistry.getRegisteredMaterials().forEach(material => { - iterator(material) - }) - //} + for (var material of GTCEuAPI.materialManager.getRegisteredMaterials()) { + iterator(material) + } } \ No newline at end of file From ee1585ee799398d924edf319b04e601158b0c51d Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 18 May 2025 22:15:49 +0500 Subject: [PATCH 04/53] config + replace open-parties-and-claims --- config/balm-client.toml | 24 ++ config/balm-common.toml | 13 +- config/dynamicview.json | 34 +++ config/guideme.toml | 15 + config/sidebar_buttons.json | 4 + .../allowed_sounds.properties | 1 + config/xaerominimap.txt | 4 +- config/xaeroworldmap.txt | 4 +- defaultconfigs/ftbchunks/client-config.snbt | 258 ++++++++++++++++++ defaultconfigs/ftbchunks/ftbchunks-world.snbt | 200 ++++++++++++++ mods | 2 +- pakku-lock.json | 124 ++++++--- 12 files changed, 637 insertions(+), 46 deletions(-) create mode 100644 config/balm-client.toml create mode 100644 config/dynamicview.json create mode 100644 config/guideme.toml create mode 100644 defaultconfigs/ftbchunks/client-config.snbt create mode 100644 defaultconfigs/ftbchunks/ftbchunks-world.snbt diff --git a/config/balm-client.toml b/config/balm-client.toml new file mode 100644 index 000000000..5abf8d684 --- /dev/null +++ b/config/balm-client.toml @@ -0,0 +1,24 @@ +#This is an example enum property +#Allowed Values: Hello, World +exampleEnum = "Hello" +#This is an example int property +exampleInt = 42 +#This is an example int list property +exampleIntList = [12, 24] +#This is an example boolean property +exampleBoolean = true +#This is an example string property +exampleString = "Hello World" +#This is an example string list property +exampleStringList = ["Hello", "World"] +#This is an example enum list property +exampleEnumList = ["Hello", "World"] +#This is an example resource location set property +exampleResourceLocationSet = ["minecraft:diamond", "minecraft:dirt"] + +[exampleCategory] + #This is an example string inside a category + innerField = "I am inside" + #This is an example float inside a category + exampleFloat = 42.84000015258789 + diff --git a/config/balm-common.toml b/config/balm-common.toml index afab694fd..c4689131a 100644 --- a/config/balm-common.toml +++ b/config/balm-common.toml @@ -1,19 +1,24 @@ #This is an example boolean property exampleBoolean = true -#Range: > -2147483648 +#This is an example int property exampleInt = 42 +#This is an example string property exampleString = "Hello World" -exampleMultilineString = "Hello World" +#This is an example enum property #Allowed Values: Hello, World exampleEnum = "Hello" +#This is an example string list property exampleStringList = ["Hello", "World"] +#This is an example int list property exampleIntList = [12, 24] +#This is an example enum list property exampleEnumList = ["Hello", "World"] +#This is an example resource location set property +exampleResourceLocationSet = ["minecraft:diamond", "minecraft:dirt"] [exampleCategory] - #This is an example category #This is an example string inside a category innerField = "I am inside" - #Range: -3.4028234663852886E38 ~ 3.4028234663852886E38 + #This is an example float inside a category exampleFloat = 42.84000015258789 diff --git a/config/dynamicview.json b/config/dynamicview.json new file mode 100644 index 000000000..34a0e7378 --- /dev/null +++ b/config/dynamicview.json @@ -0,0 +1,34 @@ +{ + "minChunkViewDist": { + "desc:": "The minimum chunk view distance allowed to use. Default: 10, minimum 3, maximum 200", + "minChunkViewDist": 10 + }, + "maxChunkViewDist": { + "desc:": "The maximum chunk view distance allowed to use. Set to the max a player could benefit from. Default: 10, minimum 3, maximum 200", + "maxChunkViewDist": 10 + }, + "meanAvgTickTime": { + "desc:": "The average tick time to stabilize the distances around. Setting it higher than 50ms is not advised, as after 50ms the TPS will go below 20. Default: 45ms, min: 10, max:100", + "meanAvgTickTime": 45 + }, + "viewDistanceUpdateRate": { + "desc:": "The change frequency of distances in seconds. Default: 30, min:1, max:1000", + "viewDistanceUpdateRate": 60 + }, + "minSimulationDist": { + "desc:": "The minimum simulation distance allowed to use. Default: 4, minimum 1, maximum 200", + "minSimulationDist": 4 + }, + "maxSimulationDist": { + "desc:": "The maximum simulation distance allowed to use. Default: 10, minimum 1, maximum 200", + "maxSimulationDist": 10 + }, + "adjustSimulationDistance": { + "desc:": "Enables automatic simulation distance adjustment. Default: true", + "adjustSimulationDistance": true + }, + "logMessages": { + "desc:": "Whether to output log messages for actions done. This can be helpful to balance the other settings nicely. Default = false", + "logMessages": false + } +} \ No newline at end of file diff --git a/config/guideme.toml b/config/guideme.toml new file mode 100644 index 000000000..7cb39d00c --- /dev/null +++ b/config/guideme.toml @@ -0,0 +1,15 @@ + +[guides] + #Never load translated guide pages for your current language. + ignoreTranslatedGuides = false + +[gui] + #Adapt GUI scaling for the Guide screen to fix Minecraft font issues at GUI scale 1 and 3. + adaptiveScaling = true + #Use the full width of the screen for the guide when it is opened. + fullWidthLayout = true + +[debug] + #Show debugging overlays in GUI on mouse-over. + showDebugGuiOverlays = false + diff --git a/config/sidebar_buttons.json b/config/sidebar_buttons.json index ef607a233..33e67f083 100644 --- a/config/sidebar_buttons.json +++ b/config/sidebar_buttons.json @@ -13,5 +13,9 @@ }, "ftbessentials": { "trash_can": true + }, + "ftbchunks": { + "chunks": false, + "claim_chunks": true } } \ No newline at end of file diff --git a/config/sound_physics_remastered/allowed_sounds.properties b/config/sound_physics_remastered/allowed_sounds.properties index 7710c2cd8..6b370c3b7 100644 --- a/config/sound_physics_remastered/allowed_sounds.properties +++ b/config/sound_physics_remastered/allowed_sounds.properties @@ -871,6 +871,7 @@ tfc\:entity.peafowl.ambient=true minecraft\:block.moss.fall=true tfc\:block.charcoal.hit=true minecraft\:block.cherry_wood.hit=true +guideme\:guide.click=true minecraft\:entity.axolotl.swim=true minecraft\:block.slime_block.hit=true minecraft\:entity.husk.step=true diff --git a/config/xaerominimap.txt b/config/xaerominimap.txt index 513776bae..d417f40a5 100644 --- a/config/xaerominimap.txt +++ b/config/xaerominimap.txt @@ -1,5 +1,5 @@ #CONFIG ONLY OPTIONS -ignoreUpdate:383 +ignoreUpdate:384 settingsButton:false allowWrongWorldTeleportation:false differentiateByServerAddress:true @@ -8,7 +8,7 @@ debugEntityVariantIds:false radarHideInvisibleEntities:true allowInternetAccess:true #INGAME SETTINGS (DO NOT EDIT!) -updateNotification:true +updateNotification:false minimap:true caveMaps:2 caveZoom:1 diff --git a/config/xaeroworldmap.txt b/config/xaeroworldmap.txt index 574155da9..6210ea83f 100644 --- a/config/xaeroworldmap.txt +++ b/config/xaeroworldmap.txt @@ -1,5 +1,5 @@ -ignoreUpdate:0 -updateNotification:true +ignoreUpdate:181 +updateNotification:false allowInternetAccess:true differentiateByServerAddress:true caveMapsAllowed:true diff --git a/defaultconfigs/ftbchunks/client-config.snbt b/defaultconfigs/ftbchunks/client-config.snbt new file mode 100644 index 000000000..7329441e4 --- /dev/null +++ b/defaultconfigs/ftbchunks/client-config.snbt @@ -0,0 +1,258 @@ +# Default config file that will be copied to local\ftbchunks\client-config.snbt if it doesn't exist! +# Just copy any values you wish to override in here! + +{ + advanced: { + # Enables debug info + # Default: false + debug_info: false + + # Advanced option. Change how often the minimap will refresh icons + # Default: 500 + # Range: 0 ~ 10000 + minimap_icon_update_timer: 500 + + # Advanced option. How often map render update will be queued + # Default: 60 + # Range: 1 ~ 600 + rerender_queue_ticks: 60 + + # Advanced option. Max tasks that can queue up + # Default: 100 + # Range: 1 ~ 10000 + task_queue_max: 100 + + # Advanced option. How often queued tasks will run + # Default: 4 + # Range: 1 ~ 300 + task_queue_ticks: 4 + memory: { + # When the large map is closed, auto-release least recently accessed regions down to this number (0 disables releasing) + # Default: 32 + # Range: 0 ~ 2147483647 + autorelease_on_map_close: 32 + + # Constrain maximum map zoom-out based on number of explored regions and available memory + # Default: true + max_zoom_constraint: true + + # Periodically release region data for non-recently-used regions to save memory (units of seconds, 0 disables releasing + # Default: 300 + # Range: 0 ~ 2147483647 + region_release_time: 300 + } + } + appearance: { + # Biome blend + # Default: "blend_5x5" + # Valid values: "none", "blend_3x3", "blend_5x5", "blend_7x7", "blend_9x9", "blend_11x11", "blend_13x13", "blend_15x15" + biome_blend: "blend_5x5" + + # Chunk grid overlay in large map + # Default: false + chunk_grid: false + + # Show claimed chunks on the map + # Default: true + claimed_chunks_on_map: true + + # Advanced option. Foliage darkness + # Default: 50 + # Range: 0 ~ 255 + foliage_darkness: 50 + + # Advanced option. Grass darkness + # Default: 50 + # Range: 0 ~ 255 + grass_darkness: 50 + + # Different ways to render map + # Default: "none" + # Valid values: "none", "night", "topography", "blocks", "light_sources" + map_mode: "none" + + # Noise added to map to make it look less plastic + # Default: 0.05 + # Range: 0.0 ~ 0.5 + noise: 0.05d + + # Only show entities that are on the surface + # Default: true + only_surface_entities: true + + # Show your own claimed chunks on the map + # Default: true + own_claimed_chunks_on_map: true + + # Reduces color palette to 256 colors + # Default: false + reduced_color_palette: false + + # Color intensity + # Default: 1.0 + # Range: 0.0 ~ 1.0 + saturation: 1.0d + + # Shadow intensity + # Default: 0.1 + # Range: 0.0 ~ 0.3 + shadows: 0.1d + + # How many blocks should height checks skip in water. 0 means flat water, ignoring terrain + # Default: 8 + # Range: 0 ~ 128 + water_height_factor: 8 + + # Advanced option. Water visibility + # Default: 220 + # Range: 0 ~ 255 + water_visibility: 220 + } + minimap: { + # Blurs minimap + # Default: "auto" + # Valid values: "auto", "on", "off" + blur_mode: "auto" + + # Adds NWSE compass inside minimap + # Default: true + compass: true + + # Enable minimap + # Default: false + enabled: false + + # Show entities on minimap + # Default: true + entities: true + + # Show entity heads on minimap + # Default: true + entity_heads: true + + # Minimap font scaling (values not a multiple of 0.5 may look bad) + # Default: 0.5 + # Range: 0.1 ~ 5.0 + font_scale: 0.5d + + # Info hidden under minimap + # Default: ["ftbchunks:debug"] + info_hidden: ["ftbchunks:debug"] + + # Info displayed under minimap + # Default: ["ftbchunks:player_pos", "ftbchunks:biome", "ftbchunks:zone", "ftbchunks:fps", "ftbchunks:game_time", "ftbchunks:real_time", "ftbchunks:debug"] + info_order: [ + "ftbchunks:player_pos" + "ftbchunks:biome" + "ftbchunks:zone" + "ftbchunks:fps" + "ftbchunks:game_time" + "ftbchunks:real_time" + "ftbchunks:debug" + ] + info_settings: { } + + # Entities in minimap will be larger + # Default: false + large_entities: false + + # Minimap will not rotate + # Default: true + locked_north: true + + # Show player heads on minimap + # Default: true + player_heads: true + + # Enables minimap to show up in corner + # Default: "top_right" + # Valid values: "bottom_left", "left", "top_left", "top_right", "right", "bottom_right" + position: "top_right" + + # Applied a conditional check to the offset. When set to anything other that None, the offset will apply only to the selected minimap position. + # When set to none and the maps offset is greater than 0, the offset will apply to all directions + # Default: "none" + # Valid values: "bottom_left", "left", "top_left", "top_right", "right", "bottom_right", "none" + position_offset_condition: "none" + + # Changes the maps X offset from it's origin point. When on the Left, the map will be pushed out from the left, then from the right when on the right. + # Default: 0 + # Range: -∞ ~ +∞ + position_offset_x: 0 + + # Changes the maps X offset from it's origin point. When on the Left, the map will be pushed out from the left, then from the right when on the right. + # Default: 0 + # Range: -∞ ~ +∞ + position_offset_y: 0 + + # Size minimap proportional to screen width (and scale) + # Default: true + proportional: true + + # Scale of minimap + # Default: 1.0 + # Range: 0.25 ~ 4.0 + scale: 1.0d + + # Always show player on minimap, even when rotation not locked + # Default: true + show_player_when_unlocked: true + + # Draw a square minimap instead of a circular one + # Default: false + square: false + + # Minimap visibility + # Default: 255 + # Range: 0 ~ 255 + visibility: 255 + + # Show waypoints on minimap + # Default: true + waypoints: true + + # Zoom distance of the minimap + # Default: 1.0 + # Range: 1.0 ~ 4.0 + zoom: 1.0d + } + waypoints: { + # Automatically remove death waypoints if closer than this many blocks away (distance of 0 disables removal) + # Default: 0 + # Range: 0 ~ 2147483647 + death_waypoint_autoremove_distance: 0 + + # Enables creation of death waypoints + # Default: true + death_waypoints: false + + # Show waypoints in world + # Default: true + in_world_waypoints: false + + # Minimum distance before waypoint dots start to fade + # Default: 1.0 + # Range: 1.0 ~ 200.0 + waypoint_dot_fade_distance: 1.0d + + # Minimum distance before waypoint beacons start to fade + # Default: 12.0 + # Range: 1.0 ~ 200.0 + waypoint_fade_distance: 12.0d + + # How close player crosshair needs to be to in-world waypoints to show waypoint labels + # Default: 1.0 + # Range: 1.0 ~ 10.0 + waypoint_focus_distance: 1.0d + + # How much do in-world waypoints enlarge when the player crosshair is close + # Default: 2.0 + # Range: 1.0 ~ 10.0 + waypoint_focus_scale: 2.0d + + # Maximum distance at which waypoints are drawn + # Default: 5000.0 + # Range: 1.0 ~ 2.147483647E9 + waypoint_max_distance: 5000.0d + } +} diff --git a/defaultconfigs/ftbchunks/ftbchunks-world.snbt b/defaultconfigs/ftbchunks/ftbchunks-world.snbt new file mode 100644 index 000000000..d10edbf74 --- /dev/null +++ b/defaultconfigs/ftbchunks/ftbchunks-world.snbt @@ -0,0 +1,200 @@ +# Default config file that will be copied to saves\New World\serverconfig\ftbchunks-world.snbt if it doesn't exist! +# Just copy any values you wish to override in here! + +{ + # Forced modes won't let players change their ally settings + # Default: "default" + # Valid values: "default", "forced_all", "forced_none" + ally_mode: "default" + + # Dimension ID's where chunks may not be claimed. Add "minecraft:the_end" to this list if you want to disable chunk claiming in The End, or "othermod:*" to disable chunk claiming in *all* dimensions added by "othermod" + # Default: [] + claim_dimension_blacklist: [ ] + + # Dimension ID's where chunks may be claimed. If non-empty, chunks may be claimed *only* in these dimensions (and the dimension is not in "claim_dimension_blacklist"). Same syntax as for "claim_dimension_blacklist". + # Default: [] + claim_dimension_whitelist: [ ] + + # Disables all land protection. Useful for private servers where everyone is trusted and claims are only used for force-loading + # Default: false + disable_protection: false + + # Override to disable/enable fake players like miners and auto-clickers globally. + # Default will check this setting for each team + # Default: "check" + # Valid values: "check", "deny", "allow" + fake_players: "check" + + # Minimap for clients connecting to this server will be disabled + # Default: false + force_disable_minimap: true + + # Control how force-loaded chunks work. + # NEVER: only allow chunk force-loading if the owning team has at least one online player. + # ALWAYS: always allow force-loading, even if no players are online. + # DEFAULT: allow force-loading IF the team has at least one player with the 'ftbchunks.chunk_load_offline' FTB Ranks permission. + # Default: "default" + # Valid values: "default", "always", "never" + force_load_mode: "default" + + # Hard limit for the number of chunks a team can claim, regardless of how many members. Default of 0 means no hard limit. + # Default: 0 + # Range: 0 ~ 2147483647 + hard_team_claim_limit: 0 + + # Hard limit for the number of chunks a team can force-load, regardless of how many members. Default of 0 means no hard limit. + # Default: 0 + # Range: 0 ~ 2147483647 + hard_team_force_limit: 0 + + # If true, "Location Visibility" team settings are ignored, and all players can see each other anywhere on the map. + # Default: false + location_mode_override: false + + # Interval in ticks to send updates to clients with long-range player tracking data. + # Lower values mean more frequent updates but more server load and network traffic; be careful with this, especially on busy servers. + # Setting this to 0 disables long-range tracking. + # Default: 20 + # Range: 0 ~ 2147483647 + long_range_tracker_interval: 20 + + # Max claimed chunks. + # You can override this with FTB Ranks 'ftbchunks.max_claimed' permission + # Default: 500 + # Range: -∞ ~ +∞ + max_claimed_chunks: 500 + + # Max force loaded chunks. + # You can override this with FTB Ranks 'ftbchunks.max_force_loaded' permission + # Default: 25 + # Range: -∞ ~ +∞ + max_force_loaded_chunks: 25 + + # Maximum time (in real-world days) where if no player in a team logs in, the team automatically loses their claims. + # Prevents chunks being claimed indefinitely by teams who no longer play. + # Default of 0 means no automatic loss of claims. + # Default: 0.0 + # Range: 0.0 ~ 3650.0 + max_idle_days_before_unclaim: 0.0d + + # Maximum time (in real-world days) where if no player in a team logs in, any forceloaded chunks owned by the team are no longer forceloaded. + # Prevents chunks being forceloaded indefinitely by teams who no longer play. + # Default of 0 means no automatic loss of forceloading. + # Default: 0.0 + # Range: 0.0 ~ 3650.0 + max_idle_days_before_unforce: 0.0d + + # Maximum time in days to keep logs of prevented fakeplayer access to a team's claims. + # Default: 7 + # Range: 1 ~ 2147483647 + max_prevented_log_age: 7 + + # Requires you to claim chunks in order to edit and interact with blocks + # Default: false + no_wilderness: false + + # Dimension ID's where the no_wilderness rule is enforced - building is only allowed in claimed chunks. If this is non-empty, it overrides the 'no_wilderness' setting. + # Default: [] + no_wilderness_dimensions: [ ] + + # Method by which party claim & force-load limits are calculated. + # LARGEST: use the limits of the member with the largest limits + # SUM: add up all the members' limits + # OWNER: use the party owner's limits only + # AVERAGE: use the average of all members' limits. + # Default: "largest" + # Valid values: "largest", "owner", "sum", "average" + party_limit_mode: "largest" + + # If true, pistons are prevented from pushing/pulling blocks across claims owned by different teams (unless the target claim has public 'edit block' permissions defined). If 'disable_protection' is set to true, this setting is ignored. + # Default: true + piston_protection: true + + # When true, standard FTB Chunk explosion protection is applied in protected chunks when the source of the explosion cannot be determined + # (Ghast fireballs are a common case - vanilla supplies a null entity source) + # Default: true + protect_unknown_explosions: true + + # Should PvP combat be allowed in claimed chunks? Default is ALWAYS; NEVER prevents it in all claimed chunks; PER_TEAM allows teams to decide if PvP is allowed in their claims + # Default: "always" + # Valid values: "always", "never", "per_team" + pvp_mode: "always" + + # If true, the player must have the 'ftbchunks_mapping' Game stage to be able to use the map and minimap. + # Requires KubeJS and/or Gamestages to be installed. + # Default: false + require_game_stage: false + team_prop_defaults: { + # Default explosion protection for claimed chunks + # Default: false + def_allow_explosions: false + + # Default mode for block breaking and placing in claimed chunks (NeoForge only) + # Default: "allies" + # Valid values: "allies", "private", "public" + def_block_edit: "allies" + + # Default mode for block interaction, breaking and placing in claimed chunks (Fabric only) + # Default: "allies" + # Valid values: "allies", "private", "public" + def_block_edit_interact: "allies" + + # Default mode for block interaction (right-click) in claimed chunks (NeoForge only) + # Default: "allies" + # Valid values: "allies", "private", "public" + def_block_interact: "allies" + + # Default claim visibility for claimed chunks + # Default: "public" + # Valid values: "allies", "private", "public" + def_claim_visibility: "public" + + # Default mode for left-clicking non-living entities (armor stands, item frames...) in claimed chunks + # Default: "allies" + # Valid values: "allies", "private", "public" + def_entity_attack: "allies" + + # Default mode for entity interaction in claimed chunks + # Default: "allies" + # Valid values: "allies", "private", "public" + def_entity_interact: "allies" + + # Default allow fake player IDs which are the same as real permitted players + # Default: true + def_fake_player_ids: true + + # Default allow-fake-player setting for team properties + # Default: false + def_fake_players: false + + # Default mob griefing protection for claimed chunks + # Default: false + def_mob_griefing: false + + # Default named fake players who should be allowed by default + # Default: [] + def_named_fake_players: [ ] + + # Default long-range player visibility on map + # Default: "allies" + # Valid values: "allies", "private", "public" + def_player_visibility: "allies" + + # Default PvP setting in claimed chunks + # Default: true + def_pvp: true + } + waypoint_sharing: { + # Allow players to share waypoints with their party. + # Default: true + waypoint_sharing_party: true + + # Allow players to share waypoints with other players. + # Default: true + waypoint_sharing_players: true + + # Allow players to share waypoints with the entire server. + # Default: true + waypoint_sharing_server: true + } +} diff --git a/mods b/mods index e47fce871..4b13e86b3 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit e47fce87111ce4cf2fcf425d6d04127d0ac25204 +Subproject commit 4b13e86b338571820b4c21d8a1d2dc807d5e04ff diff --git a/pakku-lock.json b/pakku-lock.json index 62e72a06d..bb085a4c1 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -2604,6 +2604,48 @@ } ] }, + { + "pakku_id": "AzVGsOteKm8d4n0m", + "pakku_links": [ + "GOh1ocuoLHhYMq2J" + ], + "type": "MOD", + "slug": { + "curseforge": "dynamic-view" + }, + "name": { + "curseforge": "Dynamic View[Forge]" + }, + "id": { + "curseforge": "366140" + }, + "files": [ + { + "type": "curseforge", + "file_name": "dynview-1.20.1-4.0.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/5345/889/dynview-1.20.1-4.0.jar", + "id": "5345889", + "parent_id": "366140", + "hashes": { + "sha1": "626d970796531ae63a4029176ef0db07b2109c4f", + "md5": "7efca5128021afe6101defb13e5ae486" + }, + "required_dependencies": [ + "326652" + ], + "size": 22525, + "date_published": "2024-05-15T14:58:36.057Z" + } + ] + }, { "pakku_id": "6rI6AyhyQU3lnCpg", "type": "MOD", @@ -3048,6 +3090,51 @@ } ] }, + { + "pakku_id": "MxMrrOyyu2PvCSN8", + "pakku_links": [ + "ieNTt8vgrcfO2nk9", + "0eaY2qNvkpQzolFy", + "hcwrEZKe0UXf0qM5" + ], + "type": "MOD", + "slug": { + "curseforge": "ftb-chunks-forge" + }, + "name": { + "curseforge": "FTB Chunks (Forge)" + }, + "id": { + "curseforge": "314906" + }, + "files": [ + { + "type": "curseforge", + "file_name": "ftb-chunks-forge-2001.3.6.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6431/735/ftb-chunks-forge-2001.3.6.jar", + "id": "6431735", + "parent_id": "314906", + "hashes": { + "sha1": "7fde7917655a3356cab92f17ad2bca34962c4928", + "md5": "64af750c0cbcadd4b27fb58236654814" + }, + "required_dependencies": [ + "404465", + "419699", + "404468" + ], + "size": 1158842, + "date_published": "2025-04-17T08:07:07.033Z" + } + ] + }, { "pakku_id": "wrtHnSj8GEjPjzsm", "type": "MOD", @@ -5841,43 +5928,6 @@ } ] }, - { - "pakku_id": "nluG9VeKf4nnS0st", - "type": "MOD", - "slug": { - "curseforge": "open-parties-and-claims" - }, - "name": { - "curseforge": "Open Parties and Claims" - }, - "id": { - "curseforge": "636608" - }, - "files": [ - { - "type": "curseforge", - "file_name": "open-parties-and-claims-forge-1.20.1-0.24.0.jar", - "mc_versions": [ - "1.20.1", - "1.20" - ], - "loaders": [ - "forge" - ], - "release_type": "beta", - "url": "https://edge.forgecdn.net/files/6242/869/open-parties-and-claims-forge-1.20.1-0.24.0.jar", - "id": "6242869", - "parent_id": "636608", - "hashes": { - "sha1": "884924b3820d51f0d6ae0f0b5b8bc35aefaf1920", - "md5": "dc2c65305e9ce2ac6ff1c5d5801a31f8" - }, - "required_dependencies": [], - "size": 1246814, - "date_published": "2025-02-27T09:15:57.640Z" - } - ] - }, { "pakku_id": "4ss8vw1e90vwPcs9", "type": "MOD", From 4b37c9eb0207cf6221b0b82d188439a736fde0cd Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 18 May 2025 22:20:51 +0500 Subject: [PATCH 05/53] Update occlusion.properties --- .../occlusion.properties | 380 +++++++++--------- 1 file changed, 190 insertions(+), 190 deletions(-) diff --git a/config/sound_physics_remastered/occlusion.properties b/config/sound_physics_remastered/occlusion.properties index 26304e231..5a5652d2c 100644 --- a/config/sound_physics_remastered/occlusion.properties +++ b/config/sound_physics_remastered/occlusion.properties @@ -9,208 +9,208 @@ # By block ID: # minecraft\:oak_log=1.0 -# Lantern (Sound Type) -LANTERN=1.0 -# Netherrack (Sound Type) -NETHERRACK=1.0 -# Chiseled Bookshelf (Sound Type) -CHISELED_BOOKSHELF=1.0 -# Large Amethyst Bud (Sound Type) -LARGE_AMETHYST_BUD=0.0 -# Sculk Sensor (Sound Type) -SCULK_SENSOR=1.0 -# Sweet Berry Bush (Sound Type) -SWEET_BERRY_BUSH=0.0 -# Moss Carpet (Sound Type) -MOSS_CARPET=0.1 -# Basalt (Sound Type) -BASALT=1.0 -# Snow (Sound Type) -SNOW=0.1 -# Deepslate Bricks (Sound Type) -DEEPSLATE_BRICKS=1.0 -# Sand (Sound Type) -SAND=1.0 -# Sculk Vein (Sound Type) -SCULK_VEIN=1.0 -# Anvil (Sound Type) -ANVIL=1.0 -# Fungus (Sound Type) -FUNGUS=0.0 -# Ladder (Sound Type) -LADDER=0.0 -# Honey Block (Sound Type) -HONEY_BLOCK=0.5 -# Cherry Wood (Sound Type) -CHERRY_WOOD=1.0 -# Netherite Block (Sound Type) -NETHERITE_BLOCK=1.0 -# Mud (Sound Type) -MUD=1.0 -# Wood (Sound Type) -WOOD=1.0 -# Soul Sand (Sound Type) -SOUL_SAND=1.0 -# Lily Pad (Sound Type) -LILY_PAD=0.0 -# Deepslate (Sound Type) -DEEPSLATE=1.0 -# Mangrove Roots (Sound Type) -MANGROVE_ROOTS=1.0 -# Nylium (Sound Type) -NYLIUM=1.0 -# Rooted Dirt (Sound Type) -ROOTED_DIRT=1.0 -# Suspicious Sand (Sound Type) -SUSPICIOUS_SAND=1.0 -# Hanging Sign (Sound Type) -HANGING_SIGN=1.0 -# Nether Wood (Sound Type) -NETHER_WOOD=1.0 -# Stone (Sound Type) -STONE=1.0 -# Mud Bricks (Sound Type) -MUD_BRICKS=1.0 -# Weeping Vines (Sound Type) -WEEPING_VINES=0.0 -# Calcite (Sound Type) -CALCITE=1.0 -# Flowering Azalea (Sound Type) -FLOWERING_AZALEA=1.0 -# Polished Deepslate (Sound Type) -POLISHED_DEEPSLATE=1.0 -# Vine (Sound Type) -VINE=0.0 -# Coral Block (Sound Type) -CORAL_BLOCK=1.0 -# Wet Grass (Sound Type) -WET_GRASS=0.1 -# Small Dripleaf (Sound Type) -SMALL_DRIPLEAF=0.0 -# Glass (Sound Type) -GLASS=0.1 -# Nether Ore (Sound Type) -NETHER_ORE=1.0 -# Decorated Pot Cracked (Sound Type) -DECORATED_POT_CRACKED=1.0 -# Gravel (Sound Type) -GRAVEL=1.0 -# Shroomlight (Sound Type) -SHROOMLIGHT=1.0 -# Amethyst (Sound Type) -AMETHYST=1.0 -# Decorated Pot (Sound Type) -DECORATED_POT=1.0 -# Packed Mud (Sound Type) -PACKED_MUD=1.0 -# Muddy Mangrove Roots (Sound Type) -MUDDY_MANGROVE_ROOTS=1.0 -# Nether Bricks (Sound Type) -NETHER_BRICKS=1.0 -# Sculk Catalyst (Sound Type) -SCULK_CATALYST=1.0 -# Sculk (Sound Type) -SCULK=1.0 -# Roots (Sound Type) -ROOTS=0.0 -# Stem (Sound Type) -STEM=1.0 -# Dripstone Block (Sound Type) -DRIPSTONE_BLOCK=1.0 -# Froglight (Sound Type) -FROGLIGHT=1.0 -# Spore Blossom (Sound Type) -SPORE_BLOSSOM=0.0 -# Bamboo Wood Hanging Sign (Sound Type) -BAMBOO_WOOD_HANGING_SIGN=1.0 -# Wool (Sound Type) -WOOL=1.5 -# Gilded Blackstone (Sound Type) -GILDED_BLACKSTONE=1.0 -# Hard Crop (Sound Type) -HARD_CROP=1.0 -# Amethyst Cluster (Sound Type) -AMETHYST_CLUSTER=1.0 -# Azalea (Sound Type) -AZALEA=1.0 -# Wart Block (Sound Type) -WART_BLOCK=1.0 # Copper (Sound Type) COPPER=1.0 -# Ancient Debris (Sound Type) -ANCIENT_DEBRIS=1.0 -# Sculk Shrieker (Sound Type) -SCULK_SHRIEKER=1.0 -# Metal (Sound Type) -METAL=1.0 -# Powder Snow (Sound Type) -POWDER_SNOW=0.1 -# Small Amethyst Bud (Sound Type) -SMALL_AMETHYST_BUD=0.0 -# Cherry Leaves (Sound Type) -CHERRY_LEAVES=1.0 -# Cherry Sapling (Sound Type) -CHERRY_SAPLING=1.0 -# Deepslate Tiles (Sound Type) -DEEPSLATE_TILES=1.0 -# Bamboo (Sound Type) -BAMBOO=0.1 -# Medium Amethyst Bud (Sound Type) -MEDIUM_AMETHYST_BUD=0.0 -# Cave Vines (Sound Type) -CAVE_VINES=1.0 +# Flowering Azalea (Sound Type) +FLOWERING_AZALEA=1.0 +# Sculk Catalyst (Sound Type) +SCULK_CATALYST=1.0 +# Muddy Mangrove Roots (Sound Type) +MUDDY_MANGROVE_ROOTS=1.0 +# Soul Sand (Sound Type) +SOUL_SAND=1.0 +# Hard Crop (Sound Type) +HARD_CROP=1.0 +# Chiseled Bookshelf (Sound Type) +CHISELED_BOOKSHELF=1.0 +# Decorated Pot (Sound Type) +DECORATED_POT=1.0 +# Suspicious Sand (Sound Type) +SUSPICIOUS_SAND=1.0 # Lodestone (Sound Type) LODESTONE=1.0 -# Hanging Roots (Sound Type) -HANGING_ROOTS=1.0 -# Pointed Dripstone (Sound Type) -POINTED_DRIPSTONE=0.0 -# Bone Block (Sound Type) -BONE_BLOCK=1.0 -# Big Dripleaf (Sound Type) -BIG_DRIPLEAF=1.0 -# Frogspawn (Sound Type) -FROGSPAWN=1.0 -# Bamboo Sapling (Sound Type) -BAMBOO_SAPLING=0.1 -# Azalea Leaves (Sound Type) -AZALEA_LEAVES=1.0 -# Scaffolding (Sound Type) -SCAFFOLDING=0.0 -# Nether Gold Ore (Sound Type) -NETHER_GOLD_ORE=1.0 -# Slime Block (Sound Type) -SLIME_BLOCK=1.0 -# Tuff (Sound Type) -TUFF=1.0 -# Moss (Sound Type) -MOSS=0.75 -# Crop (Sound Type) -CROP=0.0 -# Candle (Sound Type) -CANDLE=1.0 -# Nether Wood Hanging Sign (Sound Type) -NETHER_WOOD_HANGING_SIGN=1.0 -# Suspicious Gravel (Sound Type) -SUSPICIOUS_GRAVEL=1.0 -# Chain (Sound Type) -CHAIN=0.0 -# Grass (Sound Type) -GRASS=1.0 -# Nether Wart (Sound Type) -NETHER_WART=1.0 +# Deepslate Tiles (Sound Type) +DEEPSLATE_TILES=1.0 +# Polished Deepslate (Sound Type) +POLISHED_DEEPSLATE=1.0 +# Azalea (Sound Type) +AZALEA=1.0 # Nether Sprouts (Sound Type) NETHER_SPROUTS=1.0 -# Glow Lichen (Sound Type) -GLOW_LICHEN=0.0 +# Mud (Sound Type) +MUD=1.0 +# Suspicious Gravel (Sound Type) +SUSPICIOUS_GRAVEL=1.0 +# Coral Block (Sound Type) +CORAL_BLOCK=1.0 +# Vine (Sound Type) +VINE=0.0 +# Calcite (Sound Type) +CALCITE=1.0 +# Cave Vines (Sound Type) +CAVE_VINES=1.0 +# Rooted Dirt (Sound Type) +ROOTED_DIRT=1.0 +# Cherry Sapling (Sound Type) +CHERRY_SAPLING=1.0 +# Decorated Pot Cracked (Sound Type) +DECORATED_POT_CRACKED=1.0 +# Chain (Sound Type) +CHAIN=0.0 +# Powder Snow (Sound Type) +POWDER_SNOW=0.1 +# Amethyst (Sound Type) +AMETHYST=1.0 +# Mangrove Roots (Sound Type) +MANGROVE_ROOTS=1.0 +# Hanging Sign (Sound Type) +HANGING_SIGN=1.0 +# Ancient Debris (Sound Type) +ANCIENT_DEBRIS=1.0 +# Shroomlight (Sound Type) +SHROOMLIGHT=1.0 +# Sand (Sound Type) +SAND=1.0 +# Nether Ore (Sound Type) +NETHER_ORE=1.0 +# Anvil (Sound Type) +ANVIL=1.0 +# Nether Wood Hanging Sign (Sound Type) +NETHER_WOOD_HANGING_SIGN=1.0 +# Crop (Sound Type) +CROP=0.0 +# Snow (Sound Type) +SNOW=0.1 # Twisting Vines (Sound Type) TWISTING_VINES=0.0 +# Small Dripleaf (Sound Type) +SMALL_DRIPLEAF=0.0 +# Tuff (Sound Type) +TUFF=1.0 +# Wool (Sound Type) +WOOL=1.5 +# Deepslate Bricks (Sound Type) +DEEPSLATE_BRICKS=1.0 +# Amethyst Cluster (Sound Type) +AMETHYST_CLUSTER=1.0 +# Sculk Sensor (Sound Type) +SCULK_SENSOR=1.0 +# Bone Block (Sound Type) +BONE_BLOCK=1.0 +# Small Amethyst Bud (Sound Type) +SMALL_AMETHYST_BUD=0.0 +# Sweet Berry Bush (Sound Type) +SWEET_BERRY_BUSH=0.0 # Cherry Wood Hanging Sign (Sound Type) CHERRY_WOOD_HANGING_SIGN=1.0 -# Soul Soil (Sound Type) -SOUL_SOIL=1.0 +# Slime Block (Sound Type) +SLIME_BLOCK=1.0 +# Lily Pad (Sound Type) +LILY_PAD=0.0 # Bamboo Wood (Sound Type) BAMBOO_WOOD=1.0 +# Nether Gold Ore (Sound Type) +NETHER_GOLD_ORE=1.0 +# Stone (Sound Type) +STONE=1.0 +# Deepslate (Sound Type) +DEEPSLATE=1.0 +# Pointed Dripstone (Sound Type) +POINTED_DRIPSTONE=0.0 +# Azalea Leaves (Sound Type) +AZALEA_LEAVES=1.0 +# Fungus (Sound Type) +FUNGUS=0.0 +# Sculk Vein (Sound Type) +SCULK_VEIN=1.0 +# Bamboo Sapling (Sound Type) +BAMBOO_SAPLING=0.1 +# Soul Soil (Sound Type) +SOUL_SOIL=1.0 +# Basalt (Sound Type) +BASALT=1.0 +# Roots (Sound Type) +ROOTS=0.0 +# Honey Block (Sound Type) +HONEY_BLOCK=0.5 +# Hanging Roots (Sound Type) +HANGING_ROOTS=1.0 +# Sculk (Sound Type) +SCULK=1.0 +# Moss Carpet (Sound Type) +MOSS_CARPET=0.1 +# Scaffolding (Sound Type) +SCAFFOLDING=0.0 +# Metal (Sound Type) +METAL=1.0 +# Glass (Sound Type) +GLASS=0.1 +# Candle (Sound Type) +CANDLE=1.0 +# Large Amethyst Bud (Sound Type) +LARGE_AMETHYST_BUD=0.0 +# Netherite Block (Sound Type) +NETHERITE_BLOCK=1.0 +# Cherry Wood (Sound Type) +CHERRY_WOOD=1.0 +# Gilded Blackstone (Sound Type) +GILDED_BLACKSTONE=1.0 +# Mud Bricks (Sound Type) +MUD_BRICKS=1.0 +# Lantern (Sound Type) +LANTERN=1.0 +# Wood (Sound Type) +WOOD=1.0 +# Dripstone Block (Sound Type) +DRIPSTONE_BLOCK=1.0 +# Netherrack (Sound Type) +NETHERRACK=1.0 +# Wart Block (Sound Type) +WART_BLOCK=1.0 +# Moss (Sound Type) +MOSS=0.75 +# Froglight (Sound Type) +FROGLIGHT=1.0 +# Frogspawn (Sound Type) +FROGSPAWN=1.0 +# Nylium (Sound Type) +NYLIUM=1.0 +# Cherry Leaves (Sound Type) +CHERRY_LEAVES=1.0 +# Nether Wood (Sound Type) +NETHER_WOOD=1.0 +# Nether Wart (Sound Type) +NETHER_WART=1.0 +# Big Dripleaf (Sound Type) +BIG_DRIPLEAF=1.0 +# Gravel (Sound Type) +GRAVEL=1.0 +# Grass (Sound Type) +GRASS=1.0 +# Packed Mud (Sound Type) +PACKED_MUD=1.0 +# Bamboo (Sound Type) +BAMBOO=0.1 +# Spore Blossom (Sound Type) +SPORE_BLOSSOM=0.0 +# Ladder (Sound Type) +LADDER=0.0 +# Wet Grass (Sound Type) +WET_GRASS=0.1 +# Stem (Sound Type) +STEM=1.0 +# Weeping Vines (Sound Type) +WEEPING_VINES=0.0 +# Nether Bricks (Sound Type) +NETHER_BRICKS=1.0 +# Sculk Shrieker (Sound Type) +SCULK_SHRIEKER=1.0 +# Medium Amethyst Bud (Sound Type) +MEDIUM_AMETHYST_BUD=0.0 +# Glow Lichen (Sound Type) +GLOW_LICHEN=0.0 +# Bamboo Wood Hanging Sign (Sound Type) +BAMBOO_WOOD_HANGING_SIGN=1.0 # Water (Block) minecraft\:water=0.25 # Lava (Block) From b470d187e7bd5ec50e78148508574c4e3ae7897c Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 18 May 2025 22:27:41 +0500 Subject: [PATCH 06/53] test --- .../reflectivity.properties | 380 +++++++++--------- 1 file changed, 190 insertions(+), 190 deletions(-) diff --git a/config/sound_physics_remastered/reflectivity.properties b/config/sound_physics_remastered/reflectivity.properties index a71df34d2..4a52e1397 100644 --- a/config/sound_physics_remastered/reflectivity.properties +++ b/config/sound_physics_remastered/reflectivity.properties @@ -9,205 +9,205 @@ # By block ID: # minecraft\:oak_log=1.0 -# Lantern (Sound Type) -LANTERN=0.5 -# Netherrack (Sound Type) -NETHERRACK=1.1 -# Chiseled Bookshelf (Sound Type) -CHISELED_BOOKSHELF=0.5 -# Large Amethyst Bud (Sound Type) -LARGE_AMETHYST_BUD=0.5 -# Sculk Sensor (Sound Type) -SCULK_SENSOR=0.5 -# Sweet Berry Bush (Sound Type) -SWEET_BERRY_BUSH=0.5 -# Moss Carpet (Sound Type) -MOSS_CARPET=0.5 -# Basalt (Sound Type) -BASALT=1.5 -# Snow (Sound Type) -SNOW=0.15 -# Deepslate Bricks (Sound Type) -DEEPSLATE_BRICKS=1.5 -# Sand (Sound Type) -SAND=0.2 -# Sculk Vein (Sound Type) -SCULK_VEIN=0.5 -# Anvil (Sound Type) -ANVIL=0.5 -# Fungus (Sound Type) -FUNGUS=0.5 -# Ladder (Sound Type) -LADDER=0.5 -# Honey Block (Sound Type) -HONEY_BLOCK=0.1 -# Cherry Wood (Sound Type) -CHERRY_WOOD=0.5 -# Netherite Block (Sound Type) -NETHERITE_BLOCK=1.5 -# Mud (Sound Type) -MUD=0.5 -# Wood (Sound Type) -WOOD=0.4 -# Soul Sand (Sound Type) -SOUL_SAND=0.2 -# Lily Pad (Sound Type) -LILY_PAD=0.5 -# Deepslate (Sound Type) -DEEPSLATE=1.5 -# Mangrove Roots (Sound Type) -MANGROVE_ROOTS=0.5 -# Nylium (Sound Type) -NYLIUM=0.5 -# Rooted Dirt (Sound Type) -ROOTED_DIRT=0.5 -# Suspicious Sand (Sound Type) -SUSPICIOUS_SAND=0.5 -# Hanging Sign (Sound Type) -HANGING_SIGN=0.5 -# Nether Wood (Sound Type) -NETHER_WOOD=0.5 -# Stone (Sound Type) -STONE=1.5 -# Mud Bricks (Sound Type) -MUD_BRICKS=0.5 -# Weeping Vines (Sound Type) -WEEPING_VINES=0.5 -# Calcite (Sound Type) -CALCITE=1.5 -# Flowering Azalea (Sound Type) -FLOWERING_AZALEA=0.5 -# Polished Deepslate (Sound Type) -POLISHED_DEEPSLATE=1.5 -# Vine (Sound Type) -VINE=0.5 -# Coral Block (Sound Type) -CORAL_BLOCK=0.2 -# Wet Grass (Sound Type) -WET_GRASS=0.5 -# Small Dripleaf (Sound Type) -SMALL_DRIPLEAF=0.5 -# Glass (Sound Type) -GLASS=0.75 -# Nether Ore (Sound Type) -NETHER_ORE=1.1 -# Decorated Pot Cracked (Sound Type) -DECORATED_POT_CRACKED=0.5 -# Gravel (Sound Type) -GRAVEL=0.3 -# Shroomlight (Sound Type) -SHROOMLIGHT=0.5 -# Amethyst (Sound Type) -AMETHYST=1.5 -# Decorated Pot (Sound Type) -DECORATED_POT=0.5 -# Packed Mud (Sound Type) -PACKED_MUD=0.5 -# Muddy Mangrove Roots (Sound Type) -MUDDY_MANGROVE_ROOTS=0.5 -# Nether Bricks (Sound Type) -NETHER_BRICKS=1.5 -# Sculk Catalyst (Sound Type) -SCULK_CATALYST=0.5 -# Sculk (Sound Type) -SCULK=0.5 -# Roots (Sound Type) -ROOTS=0.5 -# Stem (Sound Type) -STEM=0.4 -# Dripstone Block (Sound Type) -DRIPSTONE_BLOCK=0.5 -# Froglight (Sound Type) -FROGLIGHT=0.5 -# Spore Blossom (Sound Type) -SPORE_BLOSSOM=0.5 -# Bamboo Wood Hanging Sign (Sound Type) -BAMBOO_WOOD_HANGING_SIGN=0.5 -# Wool (Sound Type) -WOOL=0.1 -# Gilded Blackstone (Sound Type) -GILDED_BLACKSTONE=0.5 -# Hard Crop (Sound Type) -HARD_CROP=0.5 -# Amethyst Cluster (Sound Type) -AMETHYST_CLUSTER=0.5 -# Azalea (Sound Type) -AZALEA=0.5 -# Wart Block (Sound Type) -WART_BLOCK=0.5 # Copper (Sound Type) COPPER=1.25 -# Ancient Debris (Sound Type) -ANCIENT_DEBRIS=0.5 -# Sculk Shrieker (Sound Type) -SCULK_SHRIEKER=0.5 -# Metal (Sound Type) -METAL=1.25 -# Powder Snow (Sound Type) -POWDER_SNOW=0.5 -# Small Amethyst Bud (Sound Type) -SMALL_AMETHYST_BUD=0.5 -# Cherry Leaves (Sound Type) -CHERRY_LEAVES=0.5 -# Cherry Sapling (Sound Type) -CHERRY_SAPLING=0.5 -# Deepslate Tiles (Sound Type) -DEEPSLATE_TILES=1.5 -# Bamboo (Sound Type) -BAMBOO=0.5 -# Medium Amethyst Bud (Sound Type) -MEDIUM_AMETHYST_BUD=0.5 -# Cave Vines (Sound Type) -CAVE_VINES=0.5 +# Flowering Azalea (Sound Type) +FLOWERING_AZALEA=0.5 +# Sculk Catalyst (Sound Type) +SCULK_CATALYST=0.5 +# Muddy Mangrove Roots (Sound Type) +MUDDY_MANGROVE_ROOTS=0.5 +# Soul Sand (Sound Type) +SOUL_SAND=0.2 +# Hard Crop (Sound Type) +HARD_CROP=0.5 +# Chiseled Bookshelf (Sound Type) +CHISELED_BOOKSHELF=0.5 +# Decorated Pot (Sound Type) +DECORATED_POT=0.5 +# Suspicious Sand (Sound Type) +SUSPICIOUS_SAND=0.5 # Lodestone (Sound Type) LODESTONE=0.5 -# Hanging Roots (Sound Type) -HANGING_ROOTS=0.5 -# Pointed Dripstone (Sound Type) -POINTED_DRIPSTONE=0.5 -# Bone Block (Sound Type) -BONE_BLOCK=1.5 -# Big Dripleaf (Sound Type) -BIG_DRIPLEAF=0.5 -# Frogspawn (Sound Type) -FROGSPAWN=0.5 -# Bamboo Sapling (Sound Type) -BAMBOO_SAPLING=0.5 -# Azalea Leaves (Sound Type) -AZALEA_LEAVES=0.5 -# Scaffolding (Sound Type) -SCAFFOLDING=0.5 -# Nether Gold Ore (Sound Type) -NETHER_GOLD_ORE=1.1 -# Slime Block (Sound Type) -SLIME_BLOCK=0.5 -# Tuff (Sound Type) -TUFF=1.5 -# Moss (Sound Type) -MOSS=0.1 -# Crop (Sound Type) -CROP=0.5 -# Candle (Sound Type) -CANDLE=0.5 -# Nether Wood Hanging Sign (Sound Type) -NETHER_WOOD_HANGING_SIGN=0.5 -# Suspicious Gravel (Sound Type) -SUSPICIOUS_GRAVEL=0.5 -# Chain (Sound Type) -CHAIN=0.5 -# Grass (Sound Type) -GRASS=0.3 -# Nether Wart (Sound Type) -NETHER_WART=0.5 +# Deepslate Tiles (Sound Type) +DEEPSLATE_TILES=1.5 +# Polished Deepslate (Sound Type) +POLISHED_DEEPSLATE=1.5 +# Azalea (Sound Type) +AZALEA=0.5 # Nether Sprouts (Sound Type) NETHER_SPROUTS=0.5 -# Glow Lichen (Sound Type) -GLOW_LICHEN=0.5 +# Mud (Sound Type) +MUD=0.5 +# Suspicious Gravel (Sound Type) +SUSPICIOUS_GRAVEL=0.5 +# Coral Block (Sound Type) +CORAL_BLOCK=0.2 +# Vine (Sound Type) +VINE=0.5 +# Calcite (Sound Type) +CALCITE=1.5 +# Cave Vines (Sound Type) +CAVE_VINES=0.5 +# Rooted Dirt (Sound Type) +ROOTED_DIRT=0.5 +# Cherry Sapling (Sound Type) +CHERRY_SAPLING=0.5 +# Decorated Pot Cracked (Sound Type) +DECORATED_POT_CRACKED=0.5 +# Chain (Sound Type) +CHAIN=0.5 +# Powder Snow (Sound Type) +POWDER_SNOW=0.5 +# Amethyst (Sound Type) +AMETHYST=1.5 +# Mangrove Roots (Sound Type) +MANGROVE_ROOTS=0.5 +# Hanging Sign (Sound Type) +HANGING_SIGN=0.5 +# Ancient Debris (Sound Type) +ANCIENT_DEBRIS=0.5 +# Shroomlight (Sound Type) +SHROOMLIGHT=0.5 +# Sand (Sound Type) +SAND=0.2 +# Nether Ore (Sound Type) +NETHER_ORE=1.1 +# Anvil (Sound Type) +ANVIL=0.5 +# Nether Wood Hanging Sign (Sound Type) +NETHER_WOOD_HANGING_SIGN=0.5 +# Crop (Sound Type) +CROP=0.5 +# Snow (Sound Type) +SNOW=0.15 # Twisting Vines (Sound Type) TWISTING_VINES=0.5 +# Small Dripleaf (Sound Type) +SMALL_DRIPLEAF=0.5 +# Tuff (Sound Type) +TUFF=1.5 +# Wool (Sound Type) +WOOL=0.1 +# Deepslate Bricks (Sound Type) +DEEPSLATE_BRICKS=1.5 +# Amethyst Cluster (Sound Type) +AMETHYST_CLUSTER=0.5 +# Sculk Sensor (Sound Type) +SCULK_SENSOR=0.5 +# Bone Block (Sound Type) +BONE_BLOCK=1.5 +# Small Amethyst Bud (Sound Type) +SMALL_AMETHYST_BUD=0.5 +# Sweet Berry Bush (Sound Type) +SWEET_BERRY_BUSH=0.5 # Cherry Wood Hanging Sign (Sound Type) CHERRY_WOOD_HANGING_SIGN=0.5 -# Soul Soil (Sound Type) -SOUL_SOIL=0.2 +# Slime Block (Sound Type) +SLIME_BLOCK=0.5 +# Lily Pad (Sound Type) +LILY_PAD=0.5 # Bamboo Wood (Sound Type) BAMBOO_WOOD=0.5 +# Nether Gold Ore (Sound Type) +NETHER_GOLD_ORE=1.1 +# Stone (Sound Type) +STONE=1.5 +# Deepslate (Sound Type) +DEEPSLATE=1.5 +# Pointed Dripstone (Sound Type) +POINTED_DRIPSTONE=0.5 +# Azalea Leaves (Sound Type) +AZALEA_LEAVES=0.5 +# Fungus (Sound Type) +FUNGUS=0.5 +# Sculk Vein (Sound Type) +SCULK_VEIN=0.5 +# Bamboo Sapling (Sound Type) +BAMBOO_SAPLING=0.5 +# Soul Soil (Sound Type) +SOUL_SOIL=0.2 +# Basalt (Sound Type) +BASALT=1.5 +# Roots (Sound Type) +ROOTS=0.5 +# Honey Block (Sound Type) +HONEY_BLOCK=0.1 +# Hanging Roots (Sound Type) +HANGING_ROOTS=0.5 +# Sculk (Sound Type) +SCULK=0.5 +# Moss Carpet (Sound Type) +MOSS_CARPET=0.5 +# Scaffolding (Sound Type) +SCAFFOLDING=0.5 +# Metal (Sound Type) +METAL=1.25 +# Glass (Sound Type) +GLASS=0.75 +# Candle (Sound Type) +CANDLE=0.5 +# Large Amethyst Bud (Sound Type) +LARGE_AMETHYST_BUD=0.5 +# Netherite Block (Sound Type) +NETHERITE_BLOCK=1.5 +# Cherry Wood (Sound Type) +CHERRY_WOOD=0.5 +# Gilded Blackstone (Sound Type) +GILDED_BLACKSTONE=0.5 +# Mud Bricks (Sound Type) +MUD_BRICKS=0.5 +# Lantern (Sound Type) +LANTERN=0.5 +# Wood (Sound Type) +WOOD=0.4 +# Dripstone Block (Sound Type) +DRIPSTONE_BLOCK=0.5 +# Netherrack (Sound Type) +NETHERRACK=1.1 +# Wart Block (Sound Type) +WART_BLOCK=0.5 +# Moss (Sound Type) +MOSS=0.1 +# Froglight (Sound Type) +FROGLIGHT=0.5 +# Frogspawn (Sound Type) +FROGSPAWN=0.5 +# Nylium (Sound Type) +NYLIUM=0.5 +# Cherry Leaves (Sound Type) +CHERRY_LEAVES=0.5 +# Nether Wood (Sound Type) +NETHER_WOOD=0.5 +# Nether Wart (Sound Type) +NETHER_WART=0.5 +# Big Dripleaf (Sound Type) +BIG_DRIPLEAF=0.5 +# Gravel (Sound Type) +GRAVEL=0.3 +# Grass (Sound Type) +GRASS=0.3 +# Packed Mud (Sound Type) +PACKED_MUD=0.5 +# Bamboo (Sound Type) +BAMBOO=0.5 +# Spore Blossom (Sound Type) +SPORE_BLOSSOM=0.5 +# Ladder (Sound Type) +LADDER=0.5 +# Wet Grass (Sound Type) +WET_GRASS=0.5 +# Stem (Sound Type) +STEM=0.4 +# Weeping Vines (Sound Type) +WEEPING_VINES=0.5 +# Nether Bricks (Sound Type) +NETHER_BRICKS=1.5 +# Sculk Shrieker (Sound Type) +SCULK_SHRIEKER=0.5 +# Medium Amethyst Bud (Sound Type) +MEDIUM_AMETHYST_BUD=0.5 +# Glow Lichen (Sound Type) +GLOW_LICHEN=0.5 +# Bamboo Wood Hanging Sign (Sound Type) +BAMBOO_WOOD_HANGING_SIGN=0.5 From e014d6781ebd78544ee1d89f00c6ec701526e594 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 18:48:03 +0100 Subject: [PATCH 07/53] increased the frequency of the tfc-ruined-world structures --- .../structure_set/ancient_monument_1.json | 18 +++++++++++ .../structure_set/limestone_church.json | 30 +++++++++++++++++++ .../worldgen/structure_set/tower_1.json | 30 +++++++++++++++++++ .../worldgen/structure_set/towerhouse_1.json | 26 ++++++++++++++++ .../temperate/plains_temperate_house.json | 4 +-- 5 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 kubejs/data/tfc_ruined_world/worldgen/structure_set/ancient_monument_1.json create mode 100644 kubejs/data/tfc_ruined_world/worldgen/structure_set/limestone_church.json create mode 100644 kubejs/data/tfc_ruined_world/worldgen/structure_set/tower_1.json create mode 100644 kubejs/data/tfc_ruined_world/worldgen/structure_set/towerhouse_1.json diff --git a/kubejs/data/tfc_ruined_world/worldgen/structure_set/ancient_monument_1.json b/kubejs/data/tfc_ruined_world/worldgen/structure_set/ancient_monument_1.json new file mode 100644 index 000000000..3d4cf89c4 --- /dev/null +++ b/kubejs/data/tfc_ruined_world/worldgen/structure_set/ancient_monument_1.json @@ -0,0 +1,18 @@ +{ + "structures": [ + { + "structure": "tfc_ruined_world:ancient_monument_1", + "weight": 1 + }, + { + "structure": "tfc_ruined_world:ancient_monument_2", + "weight": 1 + } + ], + "placement": { + "salt": 1442136154, + "spacing": 50, + "separation": 30, + "type": "minecraft:random_spread" + } +} \ No newline at end of file diff --git a/kubejs/data/tfc_ruined_world/worldgen/structure_set/limestone_church.json b/kubejs/data/tfc_ruined_world/worldgen/structure_set/limestone_church.json new file mode 100644 index 000000000..7a4f0943b --- /dev/null +++ b/kubejs/data/tfc_ruined_world/worldgen/structure_set/limestone_church.json @@ -0,0 +1,30 @@ +{ + "structures": [ + { + "structure": "tfc_ruined_world:limestone_church", + "weight": 1 + }, + { + "structure": "tfc_ruined_world:small_limestone_church", + "weight": 1 + }, + { + "structure": "tfc_ruined_world:medium_gneiss_church", + "weight": 1 + }, + { + "structure": "tfc_ruined_world:small_gneiss_church", + "weight": 1 + }, + { + "structure": "tfc_ruined_world:small_limestone_church_2", + "weight": 1 + } + ], + "placement": { + "salt": 1442136151, + "spacing": 70, + "separation": 50, + "type": "minecraft:random_spread" + } +} \ No newline at end of file diff --git a/kubejs/data/tfc_ruined_world/worldgen/structure_set/tower_1.json b/kubejs/data/tfc_ruined_world/worldgen/structure_set/tower_1.json new file mode 100644 index 000000000..740104fcc --- /dev/null +++ b/kubejs/data/tfc_ruined_world/worldgen/structure_set/tower_1.json @@ -0,0 +1,30 @@ +{ + "structures": [ + { + "structure": "tfc_ruined_world:tower_1", + "weight": 1 + }, + { + "structure": "tfc_ruined_world:tower_2", + "weight": 1 + }, + { + "structure": "tfc_ruined_world:tower_3", + "weight": 1 + }, + { + "structure": "tfc_ruined_world:tower_4", + "weight": 1 + }, + { + "structure": "tfc_ruined_world:tower_5", + "weight": 1 + } + ], + "placement": { + "salt": 1442136152, + "spacing": 60, + "separation": 40, + "type": "minecraft:random_spread" + } +} \ No newline at end of file diff --git a/kubejs/data/tfc_ruined_world/worldgen/structure_set/towerhouse_1.json b/kubejs/data/tfc_ruined_world/worldgen/structure_set/towerhouse_1.json new file mode 100644 index 000000000..339e6135c --- /dev/null +++ b/kubejs/data/tfc_ruined_world/worldgen/structure_set/towerhouse_1.json @@ -0,0 +1,26 @@ +{ + "structures": [ + { + "structure": "tfc_ruined_world:towerhouse_1", + "weight": 2 + }, + { + "structure": "tfc_ruined_world:towerhouse_2", + "weight": 2 + }, + { + "structure": "tfc_ruined_world:castle_1", + "weight": 1 + }, + { + "structure": "tfc_ruined_world:castle_2", + "weight": 1 + } + ], + "placement": { + "salt": 1442136153, + "spacing": 120, + "separation": 100, + "type": "minecraft:random_spread" + } +} \ No newline at end of file diff --git a/kubejs/data/tfg/worldgen/structure_set/temperate/plains_temperate_house.json b/kubejs/data/tfg/worldgen/structure_set/temperate/plains_temperate_house.json index e9ae1fed3..2af0bca7b 100644 --- a/kubejs/data/tfg/worldgen/structure_set/temperate/plains_temperate_house.json +++ b/kubejs/data/tfg/worldgen/structure_set/temperate/plains_temperate_house.json @@ -7,8 +7,8 @@ ], "placement": { "salt": 264167119, - "spacing": 120, - "separation": 100, + "spacing": 90, + "separation": 70, "type": "minecraft:random_spread" } } \ No newline at end of file From 242c91a5fea3db7ca7bb58598fb6b476358ce9e3 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 18:50:24 +0100 Subject: [PATCH 08/53] halved the frequency of caves/canyons so the world looks less ugly --- .../worldgen/configured_carver/canyon.json | 55 +++++++++++++++++++ .../tfc/worldgen/configured_carver/cave.json | 48 ++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 kubejs/data/tfc/worldgen/configured_carver/canyon.json create mode 100644 kubejs/data/tfc/worldgen/configured_carver/cave.json diff --git a/kubejs/data/tfc/worldgen/configured_carver/canyon.json b/kubejs/data/tfc/worldgen/configured_carver/canyon.json new file mode 100644 index 000000000..7666c7c2d --- /dev/null +++ b/kubejs/data/tfc/worldgen/configured_carver/canyon.json @@ -0,0 +1,55 @@ +{ + "type": "tfc:canyon", + "config": { + "probability": 0.015, + "y": { + "type": "uniform", + "min_inclusive": { + "absolute": 10 + }, + "max_inclusive": { + "absolute": 67 + } + }, + "yScale": 3, + "lava_level": { + "above_bottom": 8 + }, + "aquifers_enabled": true, + "vertical_rotation": { + "type": "uniform", + "value": { + "min_inclusive": -0.125, + "max_exclusive": 0.125 + } + }, + "shape": { + "distance_factor": { + "type": "uniform", + "value": { + "min_inclusive": 0.75, + "max_exclusive": 1.0 + } + }, + "thickness": { + "type": "trapezoid", + "value": { + "min": 0.0, + "max": 6.0, + "plateau": 2.0 + } + }, + "width_smoothness": 3, + "horizontal_radius_factor": { + "type": "uniform", + "value": { + "min_inclusive": 0.75, + "max_exclusive": 1.0 + } + }, + "vertical_radius_default_factor": 1.0, + "vertical_radius_center_factor": 0.0 + }, + "replaceable": "#tfc:can_carve" + } +} \ No newline at end of file diff --git a/kubejs/data/tfc/worldgen/configured_carver/cave.json b/kubejs/data/tfc/worldgen/configured_carver/cave.json new file mode 100644 index 000000000..5489ce8e3 --- /dev/null +++ b/kubejs/data/tfc/worldgen/configured_carver/cave.json @@ -0,0 +1,48 @@ +{ + "type": "tfc:cave", + "config": { + "probability": 0.015, + "y": { + "type": "uniform", + "min_inclusive": { + "absolute": -56 + }, + "max_inclusive": { + "absolute": 126 + } + }, + "yScale": { + "type": "uniform", + "value": { + "min_inclusive": 0.1, + "max_exclusive": 0.9 + } + }, + "lava_level": { + "above_bottom": 8 + }, + "aquifers_enabled": true, + "horizontal_radius_multiplier": { + "type": "uniform", + "value": { + "min_inclusive": 0.7, + "max_exclusive": 1.4 + } + }, + "vertical_radius_multiplier": { + "type": "uniform", + "value": { + "min_inclusive": 0.8, + "max_exclusive": 1.3 + } + }, + "floor_level": { + "type": "uniform", + "value": { + "min_inclusive": -1, + "max_exclusive": -0.4 + } + }, + "replaceable": "#tfc:can_carve" + } +} \ No newline at end of file From c6a2206d9e0681385d65e51d0854a9ae4b1d5341 Mon Sep 17 00:00:00 2001 From: TomPlop Date: Sun, 18 May 2025 13:51:55 -0400 Subject: [PATCH 09/53] Fixes for MV Quest (#1031) * Fix quest for electrolyzer in MV * Fix for MV quest --- .../quests/chapters/mv__medium_voltage.snbt | 71 +++++++++++++++---- 1 file changed, 58 insertions(+), 13 deletions(-) diff --git a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt index bdbeb0137..af23a8289 100644 --- a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt +++ b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt @@ -329,7 +329,7 @@ subtitle: "{quests.medium_voltage.electrolyzer.subtitle}" tasks: [{ id: "1A599E57A9493E9F" - item: "gtceu:mv_chemical_reactor" + item: "gtceu:mv_electrolyzer" type: "item" }] title: "{quests.medium_voltage.electrolyzer.title}" @@ -680,10 +680,7 @@ y: 14.0d } { - dependencies: [ - "38DE506FF5B32031" - "3DFFA8F91452C62A" - ] + dependencies: ["38DE506FF5B32031"] description: ["{quests.medium_voltage.mv_second_hv.desc}"] icon: "gtceu:micro_processor_assembly" id: "5063FDFFBE3E4855" @@ -994,7 +991,6 @@ y: 2.5d } { - dependencies: ["6A304E453D74C57C"] description: ["{quests.medium_voltage.mv_oilsands.desc}"] id: "575B07D390D9D079" optional: true @@ -1007,14 +1003,15 @@ type: "item" }] title: "{quests.medium_voltage.mv_oilsands.title}" - x: -8.0d + x: -2.5d y: 1.0d } { dependencies: [ + "575B07D390D9D079" "53DC6E32C41C94C3" - "6EB68C28BEE24DEF" "05ADBAE5B6F38956" + "6EB68C28BEE24DEF" ] dependency_requirement: "one_completed" description: [ @@ -1031,12 +1028,12 @@ size: 1.0d subtitle: "{quests.medium_voltage.mv_distillery.subtitle}" tasks: [{ - id: "6C32C7BCF9D12EBC" + id: "685043442271A0D0" item: { Count: 1 id: "ftbfiltersystem:smart_filter" tag: { - "ftbfiltersystem:filter": "or(item(gtceu:lv_distillery)item(gtceu:mv_distillery))" + "ftbfiltersystem:filter": "or(item(gtceu:mv_distillery)item(gtceu:lv_distillery))" } } title: "{quests.medium_voltage.mv_distillery.task}" @@ -1174,7 +1171,7 @@ }] title: "{quests.medium_voltage.mv_mutli_channel.title}" x: -8.0d - y: -2.0d + y: 1.0d } { dependencies: ["315169840E06110F"] @@ -1488,11 +1485,11 @@ } { dependencies: ["22E462070F8B027A"] - description: ["{quests.medium_voltage.mv_.desc}"] + description: ["{quests.medium_voltage.mv_chemical_reactor.desc}"] id: "79E8DC4D9B5F6B97" shape: "octagon" size: 2.0d - subtitle: "{quests.medium_voltage.mv_.subtitle}" + subtitle: "{quests.medium_voltage.mv_chemical_reactor.subtitle}" tasks: [{ id: "04A6D4858DA3CE94" item: "gtceu:mv_chemical_reactor" @@ -1519,6 +1516,54 @@ x: 9.0d y: 6.0d } + { + dependencies: [ + "26394C1290D70AB6" + "5063FDFFBE3E4855" + ] + dependency_requirement: "one_completed" + description: ["{quests.medium_voltage.lsb.desc}"] + icon: "gtceu:steel_large_boiler" + id: "730D7C10DEED3117" + shape: "square" + size: 1.0d + subtitle: "{quests.medium_voltage.lsb.subtitle}" + tasks: [{ + id: "67728209D0BE18B1" + item: "gtceu:steel_large_boiler" + type: "item" + }] + title: "{quests.medium_voltage.lsb.title}" + x: 1.28d + y: 16.5d + } + { + dependencies: ["315169840E06110F"] + description: ["{quests.medium_voltage.mv_cpu.desc}"] + icon: "gtceu:cpu_chip" + id: "2C875707A396B6D3" + subtitle: "{quests.medium_voltage.mv_cpu.subtitle}" + tasks: [ + { + id: "0C0649DBFF188F15" + item: "gtceu:diamond_lens" + type: "item" + } + { + id: "54424809334833A8" + item: "gtceu:cpu_wafer" + type: "item" + } + { + id: "79DC85B4ACC166FB" + item: "gtceu:cpu_chip" + type: "item" + } + ] + title: "{quests.medium_voltage.mv_cpu.title}" + x: 5.0d + y: 8.0d + } ] subtitle: ["{quests.medium_voltage.subtitle}"] title: "{quests.medium_voltage}" From f81bb6582c3baec9140c98852c0fe117fa33703a Mon Sep 17 00:00:00 2001 From: Risuga Date: Sun, 18 May 2025 10:52:12 -0700 Subject: [PATCH 10/53] Overlapping recipe fixes (#1024) * fix overlapping recipes * changelog --- CHANGELOG.md | 1 + kubejs/server_scripts/create/recipes.js | 2 + kubejs/server_scripts/firmalife/recipes.js | 68 ---------------------- 3 files changed, 3 insertions(+), 68 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bfbe9dc4..6226ff56f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [Unreleased] ### Changes +- Remove various overlapping recipe conflicts. @Oosyrag ## [0.9.7] - 17.05.2025 ### Changes diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index e4a24671d..7af1fedb1 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1449,6 +1449,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:windmill_bearing') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .circuit(1) // #endregion @@ -1848,6 +1849,7 @@ const registerCreateRecipes = (event) => { .itemOutputs('create:gantry_carriage') .duration(50) .EUt(GTValues.VA[GTValues.ULV]) + .circuit(2) event.shaped('create:weighted_ejector', [ ' B ', diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 694169ff2..38eed5558 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -454,9 +454,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('4x firmalife:food/pizza_dough', ['firmalife:spice/basil_leaves', '#tfc:foods/dough', 'tfc:powder/salt', Fluid.of('tfc:olive_oil', 1000)]) - .id('firmalife:create/mixer/food/pizza_dough') - // Vanilla Ice Cream event.recipes.gtceu.mixer('firmalife:food/vanilla_ice_cream') .itemInputs('firmalife:ice_shavings', '#tfc:sweetener', 'firmalife:spice/vanilla') @@ -465,9 +462,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/vanilla_ice_cream', ['firmalife:ice_shavings', '#tfc:sweetener', 'firmalife:spice/vanilla', Fluid.of('firmalife:cream', 1000)]) - .id('firmalife:create/mixer/food/vanilla_ice_cream') - // Pumpkin Pie Dough event.recipes.gtceu.mixer('firmalife:food/pumpkin_pie_dough') .itemInputs('#tfc:sweetener', '#forge:eggs', '2x tfc:food/pumpkin_chunks', '#tfc:foods/flour') @@ -477,9 +471,6 @@ const registerFirmaLifeRecipes = (event) => { .EUt(16) .circuit(2) - event.recipes.create.mixing('firmalife:food/pumpkin_pie_dough', ['#tfc:sweetener', '#forge:eggs', '2x tfc:food/pumpkin_chunks', '#tfc:foods/flour', Fluid.of('minecraft:water', 1000)] - ).id('firmalife:create/mixer/food/pumpkin_pie_dough') - // Butter event.recipes.gtceu.mixer('firmalife:food/butter') .itemInputs('tfc:powder/salt') @@ -488,9 +479,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('firmalife:food/butter', ['tfc:powder/salt', Fluid.of('firmalife:cream', 1000)]) - .id('firmalife:create/mixer/food/butter') - // Pie Dough event.recipes.gtceu.mixer('firmalife:food/pie_dough') .itemInputs('#tfc:sweetener', 'firmalife:food/butter', '#tfc:foods/flour') @@ -500,9 +488,6 @@ const registerFirmaLifeRecipes = (event) => { .EUt(16) .circuit(2) - event.recipes.create.mixing('firmalife:food/pie_dough', ['#tfc:sweetener', 'firmalife:food/butter', '#tfc:foods/flour', Fluid.of('minecraft:water', 1000)]) - .id('firmalife:create/mixer/food/pie_dough') - // Cookie Dough event.recipes.gtceu.mixer('firmalife:food/cookie_dough') .itemInputs('#tfc:sweetener', 'firmalife:food/butter', '#tfc:foods/flour', '#forge:eggs', 'firmalife:spice/vanilla') @@ -510,9 +495,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('4x firmalife:food/cookie_dough', ['#tfc:sweetener', 'firmalife:food/butter', '#tfc:foods/flour', '#forge:eggs', 'firmalife:spice/vanilla']) - .id('firmalife:create/mixer/food/cookie_dough') - // Hardtack Dough event.recipes.gtceu.mixer('firmalife:food/hardtack_dough') .itemInputs('tfc:powder/salt', '#tfc:foods/flour') @@ -522,9 +504,6 @@ const registerFirmaLifeRecipes = (event) => { .EUt(16) .circuit(2) - event.recipes.create.mixing('4x firmalife:food/hardtack_dough', ['tfc:powder/salt', '#tfc:foods/flour', Fluid.of('minecraft:water', 1000)]) - .id('firmalife:create/mixer/food/hardtack_dough') - // Yeast starter event.recipes.gtceu.mixer('firmalife:yeast_starter') .inputFluids(Fluid.of('firmalife:yeast_starter', 100)) @@ -534,9 +513,6 @@ const registerFirmaLifeRecipes = (event) => { .EUt(8) .circuit(1) - event.recipes.create.mixing(Fluid.of('firmalife:yeast_starter', 600), ['#tfc:foods/flour', Fluid.of('firmalife:yeast_starter', 100)]) - .id('firmalife:create/mixer/yeast_starter') - // Cocoa Powder event.recipes.gtceu.macerator('firmalife:food/cocoa_powder') .itemInputs('gtceu:cocoa_dust') @@ -558,9 +534,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('firmalife:food/chocolate_ice_cream', ['firmalife:food/vanilla_ice_cream', Fluid.of('firmalife:chocolate', 1000)]) - .id('firmalife:create/mixer/food/chocolate_ice_cream') - // White Chocolate Blend event.recipes.gtceu.mixer('firmalife:food/white_chocolate_blend/milk') .itemInputs('2x firmalife:food/cocoa_butter', '#tfc:sweetener') @@ -569,9 +542,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/white_chocolate_blend', ['2x firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('minecraft:milk', 1000)]) - .id('firmalife:create/mixer/food/white_chocolate_blend/milk') - event.recipes.gtceu.mixer('firmalife:food/white_chocolate_blend/yak_milk') .itemInputs('2x firmalife:food/cocoa_butter', '#tfc:sweetener') .inputFluids(Fluid.of('firmalife:yak_milk', 1000)) @@ -579,9 +549,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/white_chocolate_blend', ['2x firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('firmalife:yak_milk', 1000)]) - .id('firmalife:create/mixer/food/white_chocolate_blend/yak_milk') - event.recipes.gtceu.mixer('firmalife:food/white_chocolate_blend/goat_milk') .itemInputs('2x firmalife:food/cocoa_butter', '#tfc:sweetener') .inputFluids(Fluid.of('firmalife:goat_milk', 1000)) @@ -589,9 +556,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/white_chocolate_blend', ['2x firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('firmalife:goat_milk', 1000)]) - .id('firmalife:create/mixer/food/white_chocolate_blend/goat_milk') - event.recipes.gtceu.mixer('firmalife:food/white_chocolate_blend/coconut_milk') .itemInputs('2x firmalife:food/cocoa_butter', '#tfc:sweetener') .inputFluids(Fluid.of('firmalife:coconut_milk', 1000)) @@ -599,9 +563,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/white_chocolate_blend', ['2x firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('firmalife:coconut_milk', 1000)]) - .id('firmalife:create/mixer/food/white_chocolate_blend/coconut_milk') - // Dark Chocolate Blend event.recipes.gtceu.mixer('firmalife:food/dark_chocolate_blend/milk') .itemInputs('2x firmalife:food/cocoa_powder', '#tfc:sweetener') @@ -610,9 +571,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/dark_chocolate_blend', ['2x firmalife:food/cocoa_powder', '#tfc:sweetener', Fluid.of('minecraft:milk', 1000)]) - .id('firmalife:create/mixer/food/dark_chocolate_blend/milk') - event.recipes.gtceu.mixer('firmalife:food/dark_chocolate_blend/yak_milk') .itemInputs('2x firmalife:food/cocoa_powder', '#tfc:sweetener') .inputFluids(Fluid.of('firmalife:yak_milk', 1000)) @@ -620,9 +578,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/dark_chocolate_blend', ['2x firmalife:food/cocoa_powder', '#tfc:sweetener', Fluid.of('firmalife:yak_milk', 1000)]) - .id('firmalife:create/mixer/food/dark_chocolate_blend/yak_milk') - event.recipes.gtceu.mixer('firmalife:food/dark_chocolate_blend/goat_milk') .itemInputs('2x firmalife:food/cocoa_powder', '#tfc:sweetener') .inputFluids(Fluid.of('firmalife:goat_milk', 1000)) @@ -630,8 +585,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/dark_chocolate_blend', ['2x firmalife:food/cocoa_powder', '#tfc:sweetener', Fluid.of('firmalife:goat_milk', 1000)]) - .id('firmalife:create/mixer/food/dark_chocolate_blend/goat_milk') event.recipes.gtceu.mixer('firmalife:food/dark_chocolate_blend/coconut_milk') .itemInputs('2x firmalife:food/cocoa_powder', '#tfc:sweetener') @@ -640,9 +593,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/dark_chocolate_blend', ['2x firmalife:food/cocoa_powder', '#tfc:sweetener', Fluid.of('firmalife:coconut_milk', 1000)]) - .id('firmalife:create/mixer/food/dark_chocolate_blend/coconut_milk') - // Milk Chocolate Blend event.recipes.gtceu.mixer('firmalife:food/milk_chocolate_blend/milk') .itemInputs('firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener') @@ -651,9 +601,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/milk_chocolate_blend', ['firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('minecraft:milk', 1000)]) - .id('firmalife:create/mixer/food/milk_chocolate_blend/milk') - event.recipes.gtceu.mixer('firmalife:food/milk_chocolate_blend/yak_milk') .itemInputs('firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener') .inputFluids(Fluid.of('firmalife:yak_milk', 1000)) @@ -661,9 +608,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/milk_chocolate_blend', ['firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('firmalife:yak_milk', 1000)]) - .id('firmalife:create/mixer/food/milk_chocolate_blend/yak_milk') - event.recipes.gtceu.mixer('firmalife:food/milk_chocolate_blend/goat_milk') .itemInputs('firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener') .inputFluids(Fluid.of('firmalife:goat_milk', 1000)) @@ -671,9 +615,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/milk_chocolate_blend', ['firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('firmalife:goat_milk', 1000)]) - .id('firmalife:create/mixer/food/milk_chocolate_blend/goat_milk') - event.recipes.gtceu.mixer('firmalife:food/milk_chocolate_blend/coconut_milk') .itemInputs('firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener') .inputFluids(Fluid.of('firmalife:coconut_milk', 1000)) @@ -681,9 +622,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('2x firmalife:food/milk_chocolate_blend', ['firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('firmalife:coconut_milk', 1000)]) - .id('firmalife:create/mixer/food/milk_chocolate_blend/coconut_milk') - // Strawberry Ice Cream event.recipes.gtceu.mixer('firmalife:food/strawberry_ice_cream') .itemInputs('firmalife:food/vanilla_ice_cream', '2x tfc:food/strawberry') @@ -691,9 +629,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('firmalife:food/strawberry_ice_cream', ['firmalife:food/vanilla_ice_cream', '2x tfc:food/strawberry'] - ).id('firmalife:create/mixer/food/strawberry_ice_cream') - // Hardtack Dough event.recipes.gtceu.mixer('firmalife:food/chocolate_chip_cookie_dough') .itemInputs('4x firmalife:food/cookie_dough', '#firmalife:chocolate_blends') @@ -701,9 +636,6 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) - event.recipes.create.mixing('4x firmalife:food/chocolate_chip_cookie_dough', ['4x firmalife:food/cookie_dough', '#firmalife:chocolate_blends']) - .id('firmalife:create/mixer/food/chocolate_chip_cookie_dough') - //#endregion //#region Обжарка некоторой еды From 689e4e870ac41271b4457e8a1573ea239e6898d9 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 19:04:46 +0100 Subject: [PATCH 11/53] added sugar water recipe --- kubejs/server_scripts/firmalife/recipes.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 694169ff2..ca55cd8d8 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -797,4 +797,12 @@ const registerFirmaLifeRecipes = (event) => { event.shaped('firmalife:drying_mat', ['AAA'], { A: 'tfc:plant/winged_kelp' }).id('tfg:shaped/drying_mat_winged_kelp') // #endregion + + event.recipes.gtceu.mixer('sugar_water') + .itemInputs('#tfc:sweetener') + .inputFluids(Fluid.of('minecraft:water', 1000)) + .outputFluids(Fluid.of('firmalife:sugar_water', 500)) + .circuit(5) + .EUt(GTValues.VA[GTValues.ULV]) + .duration(200) } From 774da71e4d1eadf9b5af6d88f085652298b46f24 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 19:14:24 +0100 Subject: [PATCH 12/53] fixed some missing GT behaviours on damascus steel tools --- .../data/minecraft/loot_tables/chests/bastion_bridge.json | 6 +++--- .../minecraft/loot_tables/chests/bastion_hoglin_stable.json | 6 +++--- kubejs/data/minecraft/loot_tables/chests/bastion_other.json | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json b/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json index 411acdc09..05b645dd1 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json @@ -419,7 +419,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"Mode\":2}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -485,7 +485,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + "tag": "{\"tfc:forging_bonus\": 4, \"GT.Behaviours\":{\"HarvestIce\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -496,7 +496,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + "tag": "{\"tfc:forging_bonus\": 4, \"GT.Behaviours\":{\"DisableShields\":1, \"TreeFelling\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] } diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json b/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json index 411acdc09..05b645dd1 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json @@ -419,7 +419,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"Mode\":2}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -485,7 +485,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + "tag": "{\"tfc:forging_bonus\": 4, \"GT.Behaviours\":{\"HarvestIce\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -496,7 +496,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + "tag": "{\"tfc:forging_bonus\": 4, \"GT.Behaviours\":{\"DisableShields\":1, \"TreeFelling\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] } diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_other.json b/kubejs/data/minecraft/loot_tables/chests/bastion_other.json index 411acdc09..05b645dd1 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_other.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_other.json @@ -419,7 +419,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\":4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + "tag": "{\"tfc:forging_bonus\":4, \"GT.Behaviours\":{\"Mode\":2}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -485,7 +485,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + "tag": "{\"tfc:forging_bonus\": 4, \"GT.Behaviours\":{\"HarvestIce\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] }, @@ -496,7 +496,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{\"tfc:forging_bonus\": 4, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" + "tag": "{\"tfc:forging_bonus\": 4, \"GT.Behaviours\":{\"DisableShields\":1, \"TreeFelling\":1}, \"HideFlags\":1, \"Enchantments\": [{\"id\":\"minecraft:infinity\",\"lvl\":\"1s\"}]}" } ] } From 30c8a05036b6d4bd2200c6409b62197118de8541 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 20:11:49 +0100 Subject: [PATCH 13/53] credit crafting --- .../ftbquests/quests/chapters/queststfg.snbt | 5 +++ kubejs/assets/gtceu/lang/en_us.json | 12 +++++-- kubejs/server_scripts/gregtech/recipes.js | 36 +++++++++++++++++++ .../gregtech/recipes.tfcmetals.js | 2 +- .../vintage_improvements/tags.js | 1 + 5 files changed, 53 insertions(+), 3 deletions(-) diff --git a/config/ftbquests/quests/chapters/queststfg.snbt b/config/ftbquests/quests/chapters/queststfg.snbt index 63a98ffa3..8ddb3dcc3 100644 --- a/config/ftbquests/quests/chapters/queststfg.snbt +++ b/config/ftbquests/quests/chapters/queststfg.snbt @@ -51,6 +51,11 @@ 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/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index a5ea52d7b..811a4df3a 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -51,8 +51,16 @@ "item.gtceu.iron_quadruple_cable": "4x Cast Iron Cable", "item.gtceu.iron_octal_cable": "8x Cast Iron Cable", "item.gtceu.iron_hex_cable": "16x Cast Iron Cable", - "item.gtceu.ice_bucket": "Ice Water Bucket", - "material.gtceu.ice": "Ice Water", + "item.gtceu.ice_bucket": "Ice Slush Bucket", + "item.gtceu.copper_credit": "§71 Credit", + "item.gtceu.cupronickel_credit": "§78 Credits", + "item.gtceu.silver_credit": "§764 Credits", + "item.gtceu.gold_credit": "§7512 Credits", + "item.gtceu.platinum_credit": "§74,096 Credits", + "item.gtceu.osmium_credit": "§732,768 Credits", + "item.gtceu.naquadah_credit": "§7262,144 Credits", + "item.gtceu.neutronium_credit": "§72,097,152 Credits", + "material.gtceu.ice": "Ice Slush", "material.gtceu.cooperite": "Cooperite", "material.gtceu.fayalite": "Fayalite", "material.gtceu.diopside": "Diopside", diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 1788039cb..d65f9ae49 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1085,6 +1085,42 @@ 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 + // TODO: Greate again... event.shapeless('gtceu:programmed_circuit', ['minecraft:stick', '#forge:tools/wrenches']) .id('tfg:shapeless/programmed_circuit_from_stick') diff --git a/kubejs/server_scripts/gregtech/recipes.tfcmetals.js b/kubejs/server_scripts/gregtech/recipes.tfcmetals.js index 5ce01f049..4bcbd13a1 100644 --- a/kubejs/server_scripts/gregtech/recipes.tfcmetals.js +++ b/kubejs/server_scripts/gregtech/recipes.tfcmetals.js @@ -2,7 +2,7 @@ function registerGTCEuTFCMetalsRecipes(event) { - //#region LV hull + //#region LV hull event.replaceInput('gtceu:shaped/lv_machine_hull', '#forge:plates/wrought_iron', '#forge:plates/red_steel') diff --git a/kubejs/server_scripts/vintage_improvements/tags.js b/kubejs/server_scripts/vintage_improvements/tags.js index dc872695d..5e18eb937 100644 --- a/kubejs/server_scripts/vintage_improvements/tags.js +++ b/kubejs/server_scripts/vintage_improvements/tags.js @@ -36,6 +36,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') } From 4aa2cd30f86127a025674188f68e0545a40f4cbd Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 20:11:53 +0100 Subject: [PATCH 14/53] langs --- kubejs/assets/tfg/lang/en_us.json | 80 +++++++++++++++---------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 5bc6a96ec..94e4b2f9f 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -601,44 +601,44 @@ "quests.high_voltage.TEST.desc.3": "", "quests.high_voltage.TEST.desc.4": "", "quests.low_voltage": "&7LV&r - Low Voltage", - "quests.low_voltage.subtitle": "Tame electricity and make your first machines", + "quests.low_voltage.subtitle": "Tame electricity and begin your GregTech journey", "quests.low_voltage.lv_machine_hull.title": "Your second machine hull", "quests.low_voltage.lv_machine_hull.subtitle": "It's time to get into electricity", - "quests.low_voltage.lv_machine_hull.desc.1": "That's it you are getting real close to your &6first LV Machine&r and the begining of the electric age. Crafting this hull will cost you quite a lot of &4Red Steel&r but you will get &6new ways&r to improve your production.\n\nThis is the Gregtech approach: &6the further you progress, the better the new recipes become&r.\n\nTry to make at least 3 or 4 casings to begin.", - "quests.low_voltage.lv_machine_hull.desc.2": "For some players reaching a new tier is making the &6circuit&r, for others it's the &6machine hull&r and for me it's the &6energy hatch&r. At the end of the day you do you.", + "quests.low_voltage.lv_machine_hull.desc.1": "You're getting real close to your &6first LV Machine&r and the beginning of the electric age! If you haven't made any &4Red Steel&r yet, you'll now have to, but in return you will get &6new ways&r to improve your production.\n\nThis is the GregTech philosophy: &6the further you progress, the better the new recipes become&r.\n\nTry to make at least 3 or 4 casings to begin.", + "quests.low_voltage.lv_machine_hull.desc.2": "For some players, reaching a new tier is marked by crafting the first &6circuit&r, for others it's the &6machine hull&r or the &6energy hatch&r. You can use whatever works best for you, but for the sake of organization, these quests will use the machine hull.", "quests.low_voltage.lv_machine_casing.title": "LV Machine Casing for Create?", - "quests.low_voltage.lv_machine_casing.subtitle": "An infinite amount of possibilities", - "quests.low_voltage.lv_machine_casing.desc": "Usually now would be time to go full Gregtech but &5TFG&r offers you the possibility to use &6Create&r machines to basically do the job of some usual &6Gregtech&r machines.\n\nWe introduced them &6last chapter&r, just know that in this chapter if there is an alternative to a Gregtech machine, you will have the choice within the quest.", + "quests.low_voltage.lv_machine_casing.subtitle": "More options!", + "quests.low_voltage.lv_machine_casing.desc": "To make getting into LV less intimidating, &5TFG&r gives you the option to use &6Create&r machines in place of some &6GregTech&r machines.\n\nWe introduced them &6last chapter&r, but just know that if there is an alternative to a GregTech machine, you will have the choice within the quest.", "quests.low_voltage.lv_motor.title": "The First of Many Motors", "quests.low_voltage.lv_motor.subtitle": "Low Voltage beckons...", - "quests.low_voltage.lv_motor.desc": "Remember that &2JEI is your friend&r if recipes are getting overwhelming.\n\nGetting back on topic, set yourself up for &7LV&r by crafting six &aLV Electric Motors&r! This may seem like a lot, but that's the bare minimum required to get to the good stuff in &7LV&r.", + "quests.low_voltage.lv_motor.desc": "Remember that &2EMI is your friend&r if recipes are getting overwhelming. You can click the button with four stacked squares on the bottom right of any recipe, and EMI will show you a tree of all the crafting ingredients, and you can even have it add a \"shopping list\" to your favourites!\n\nGetting back on topic, set yourself up for &7LV&r by crafting six &aLV Electric Motors&r! This may seem like a lot, but that's the bare minimum required to get to the good stuff in &7LV&r.", "quests.low_voltage.lv_age_progression.title": "LV Age Progression", "quests.low_voltage.lv_age_progression.subtitle": "Too many options, too little time!", "quests.low_voltage.lv_age_progression.desc": "&7LV&r will require you to craft a lot of different machines! Here's a friendly tip if you're struggling to set goals: pick an item in a later quest and go backwards from there.\n\nWith that in mind... why don't we start with a &5Fusion Controller&r? Never mind, slightly too ambitious - let's check a closer goal instead. Ah, yes, the &3Electric Blast Furnace&r - the main end goal of &7LV&r - should be a good target.\n\nThe EBF is &aexpensive&r, which is why you should initially focus on machines to make components and materials cheaper. Our quests will try to will guide you in the right direction.\n\nOther important goals are crafting the &3LV Assembler&r, making your first &aMV Circuits&r and getting your first &bCircuit Assembler&r.", "quests.low_voltage.lv_age_progression.task": "I... might have some sense of direction now", "quests.low_voltage.lv_steam_turbine.title": "Electricity Generation", - "quests.low_voltage.lv_steam_turbine.subtitle": "You must construct more turbines", - "quests.low_voltage.lv_steam_turbine.desc.1": "The &3Steam Turbine&r is one of the only generators you can realistically use in &7LV&r. &2Later, you'll unlock more interesting Power options&r, such as natural gases or petrols.\n\nWhen provided Steam, the turbine will output EU at a ratio of &d2 Steam = 1 EU&r.\n\n&6This quest unlocks two new tutorials on Electricity and Cables in the &lTips and Tricks&r&6 tab - check them out to learn more!&r", + "quests.low_voltage.lv_steam_turbine.subtitle": "You must construct additional turbines", + "quests.low_voltage.lv_steam_turbine.desc.1": "The &3Steam Turbine&r is one of the only generators you can realistically use in &7LV&r. &2Later, you'll unlock more interesting Power options&r, such as natural gases or petrols.\n\nWhen provided Steam, the turbine will output EU at a ratio of &d2 Steam = 1 EU&r.", "quests.low_voltage.lv_steam_turbine.desc.2": "If you're using a single &3Steam Turbine&r, you only need &a1x Tin Cables&r. On the other hand, if you upgrade to &32 Steam Turbines&r, you should use &a2x Tin Cables&r - else they may end up &cburning&r.\n\nThis is because of the &9Amperage&r mechanic... but that will be explained later so you can enjoy playing. Don't worry!", "quests.low_voltage.lbb.title": "Large Bronze Boiler", "quests.low_voltage.lbb.subtitle": "Boom, boom, boom, boom", - "quests.low_voltage.lbb.desc.1": "&cBe wary this one explodes if running when you load your world, waiting for a fix from GTm devs&r\n\n&oThe &3Large Boiler&r is an &6optional&r big-boy variant of the Small Boilers. It runs off solid or liquid fuel.\n\nIf you want Steam-based power production, this will be your first port-of-call. Other power options are listed in the &bMV&r chapter.\n\n&cImportant:&r This Boiler &lCAN&r also &cexplode&r similarly to the regular Boilers! Usually, the explosion can be rather devastating...", - "quests.low_voltage.lbb.desc.2": "&cWater supply is &lcrucial&r&r. Dedicate a system only for it.\n\nOnce fully heated up, the &3LBB&r produces 800 Steam per tick, which is &d400EU/t&r after conversion, or 12.5 Basic Steam Turbines. Such (relatively!) immense power comes at the cost of &la lot&r of burnable fuel. In TerraFirmaGreg we advise &8Creosote&r or &cLava&r. You can use Create to bring that if needed...", - "quests.low_voltage.lbb.desc.3": "&5With this in consideration&r, the GUI lets you &9throttle&r the Boiler down to 25% power for 200 Steam per tick. That's &d100EU/t&r, or slightly above 3 Basic Steam Turbines.\n\n&9Note:&r An in-depth tutorial about Multiblocks is given after you get the &3Electric Blast Furnace&r. We recommend you aim for that first.", + "quests.low_voltage.lbb.desc.1": "The &3Large Boiler&r is an &6optional&r big-boy variant of the Small Boilers. It runs off solid or liquid fuel.\n\nIf you want Steam-based power production, this is an alternative to the Create Steam Engine. Later power options are listed in the &bMV&r chapter.\n\nAt the moment, due to a bug in GTCEu, this machine is prevented from ever exploding, but you should set it up so it never runs out of water like your Small Boilers, so it doesn't explode when the bug is fixed.", + "quests.low_voltage.lbb.desc.2": "Once fully heated up, the &3LBB&r produces 800 Steam per tick, which is &d400EU/t&r after conversion, or 12.5 Basic Steam Turbines. Such (relatively!) immense power comes at the cost of &la lot&r of burnable fuel. &5With this in consideration&r, the GUI lets you &9throttle&r the Boiler down to 25% power for 200 Steam per tick. That's &d100EU/t&r, or slightly above 3 Basic Steam Turbines.\n\nWe recommend holding off making this until you're ready to power your EBF.", + "quests.low_voltage.lbb.desc.3": "In TerraFirmaGreg, you have a few options for fuel. You can use a Hose Pulley to pull infinite &cLava&r out of a deep underground lake, or set up a tree farm to give infinite &8Charcoal&r and &8Creosote&r. Lastly, there are huge surface-level &8Coal&r veins that you can extract with some automated mining machines and turn into Coke and significantly more Creosote than charcoal.", "quests.low_voltage.lv_polariser.title": "Basic Polariser", "quests.low_voltage.lv_polariser.subtitle": "The Polarizer polarizes!", "quests.low_voltage.lv_polariser.desc": "One of the cheapest - if not the cheapest - &7LV&r machine. Use this to make &6Redstone-free Magnetic Rods&r for your Motors. Whenever you start to batch your Motors, this machine will save you stacks and stacks of Redstone.", "quests.low_voltage.lv_turbo_charge.title": "Turbo Charger", - "quests.low_voltage.lv_turbo_charge.subtitle": "Useful to charge faster your future electric tools", + "quests.low_voltage.lv_turbo_charge.subtitle": "Useful to charge your electric tools faster", "quests.low_voltage.lv_turbo_charge.desc": "&oThis quest's subject is optional, but may still be of interest to you. We've put it here in the name of completeness.&r\n\nThe &3Turbo Charger&r charges &6RF and EU&r items such as &9Drills&r extremely quickly.\n\nIt accepts up to 4 Amps for every item it charges, making it &6twice as fast&r as the &3Battery Buffer&r. It cannot discharge, though.\n\n&eAny&r Charger will complete this Quest.", "quests.low_voltage.lv_turbo_charge.task": "Any Turbo Charger will do", - "quests.low_voltage.lv_fisher.title": "Fishing 50", - "quests.low_voltage.lv_fisher.subtitle": "Fully compatible with TFC", - "quests.low_voltage.lv_fisher.desc": "&oThis quest's subject is optional, but may still be of interest to you. We've put it here in the name of completeness.&r\n\nThe &3Fisher&r catches fish from Water. It requires a 5x5 area of Water directly below to operate. It uses the same loot table as normal Fishing. Each operation consumes 1 String and EU equivalent to its tier (32 for &7LV&r, etc.) That's about it.\n\n&eFish Oil&r can be extracted from Fish, which can be used for &6Bio Diesel&r.", + "quests.low_voltage.lv_fisher.title": "Fishing Machine", + "quests.low_voltage.lv_fisher.subtitle": "Fully compatible with TFC!", + "quests.low_voltage.lv_fisher.desc": "&oThis quest's subject is optional, but may still be of interest to you. We've put it here in the name of completeness.&r\n\nThe &3Fisher&r catches fish from Water. It requires a 5x5 area of Water directly below to operate. It uses the same loot table as normal Fishing. Each operation consumes 1 String and EU equivalent to its tier (32 for &7LV&r, etc.). That's about it.\n\n&eFish Oil&r can be extracted from Fish, which can be used for &6Bio Diesel&r.", "quests.low_voltage.lv_fisher.task": "Any Fisher will do", - "quests.low_voltage.lv_rock_crusher.title": "Cobble is Life", - "quests.low_voltage.lv_rock_crusher.subtitle": "Time to get any of the TFC stones you want", - "quests.low_voltage.lv_rock_crusher.desc.1": "&oThis quest's subject is optional, but may still be of interest to you. We've put it here in the name of completeness.&r\n\nThe &3Rock Breaker&r generates different types of igneous Rocks. Those rocks might be pulverized and electrolyzed into certain materials.\n\nCertain rocks, need up to &5EV&r power to generate.\n\n&eAny&r Rock Breaker will complete this Quest.", + "quests.low_voltage.lv_rock_crusher.title": "Rock Crusher", + "quests.low_voltage.lv_rock_crusher.subtitle": "Cobble is Love, Cobble is Life", + "quests.low_voltage.lv_rock_crusher.desc.1": "&oThis quest's subject is optional, but may still be of interest to you. We've put it here in the name of completeness.&r\n\nThe &3Rock Breaker&r is effectively a Cobblestone Generator in a box. You can give it any raw rock or cobblestone block, and it will produce copies of it. Very handy if you want a lot of bricks fast!\n\n&eAny&r Rock Breaker will complete this Quest.", "quests.low_voltage.lv_rock_crusher.desc.2": "&l&3Lore:&r&o Obsidian requiring Redstone to generate is in reference to an ancient Minecraft bug, &7MC-4239&f. Placing Redstone where the Cobblestone would go in a cobble generator would make it generate Obsidian instead. This bug was resolved in snapshot 14w25b for Minecraft 1.8, over 9 years ago at the time of writing!", "quests.low_voltage.lv_rock_crusher.task": "Any Rock Crusher will do", "quests.low_voltage.lv_wiremill.title": "Basic Wiremill", @@ -656,7 +656,7 @@ "quests.low_voltage.lv_lathe.desc.2": "&l&3Lore:&r&o The GregTech 5 Lathe produces one Rod and 2 small piles of Dust per Ingot. We also have a setting for this in GTCEu, but it's turned off by default.\n\n&oThe GT6 Lathe acts like GT5's, but Bolts lathe into one Screw and 1/72 of a pile of Dust. Disgusting!", "quests.low_voltage.lv_lathe.task": "Any of these", "quests.low_voltage.universal_cell.title": "Better bucket", - "quests.low_voltage.universal_cell.subtitle": "You can see inside not like these drums...", + "quests.low_voltage.universal_cell.subtitle": "You can see inside, unlike those drums...", "quests.low_voltage.universal_cell.desc.1": "Cells are an alternative form of Fluid storage. All Cell types with the same type and amount of Fluid inside them &6stack&r. They can be automatically filled with a &3Canning Machine&r.\n\nCells hold &done bucket&r of Fluid.", "quests.low_voltage.universal_cell.desc.2": "Universal Cells hold up to &done bucket&r, but also can store &9fractions&r of Buckets. They're particularly ideal if you want to store leftover Fluid without crafting a whole Drum. \n\nCells made from higher tier materials can hold even more fluid, but &9Drums&r and &9Super Tanks&r will hold more by then.\n\nLike Drums, Cells can be placed into a crafting grid to clear their contents.", "quests.low_voltage.universal_cell.task": "", @@ -685,7 +685,7 @@ "quests.low_voltage.lv_pump.desc": "When placed on a machine, pumps will transfer fluid. You can configure them to import or export.\n\nIt can accept a &9Fluid Filter&r.", "quests.low_voltage.lv_fluid_regulator.title": "LV Fluid Regulator", "quests.low_voltage.lv_fluid_regulator.subtitle": "A cover that you may not use much", - "quests.low_voltage.lv_fluid_regulator.desc": "The &aFluid Regulator&r is sort of the equivalent to a &9Robot Arm&r for Fluids.\n\nIt can transfer fluids, but has two useful modes:\n\n&9-&r &dSupply Exact&r will transfer the amount of specified Fluid per tick if available. No more, no less.\n&9-&r &dKeep Exact&r will make sure the exact amount of Fluid in the attached machine is being kept.\n\nYou won't need it much because natively GT machines will fill only one slot with the &6Pump Cover&r", + "quests.low_voltage.lv_fluid_regulator.desc": "The &aFluid Regulator&r is sort of the equivalent to a &9Robot Arm&r for Fluids.\n\nIt can transfer fluids, but has two useful modes:\n\n&9-&r &dSupply Exact&r will transfer the amount of specified Fluid per tick if available. No more, no less.\n&9-&r &dKeep Exact&r will make sure the exact amount of Fluid in the attached machine is being kept.\n\nYou won't need it much, because natively GT machines will fill only one slot with the &6Pump Cover&r", "quests.low_voltage.cover_behaviour.title": "Cover Behaviour", "quests.low_voltage.cover_behaviour.subtitle": "Extra utility without taking up bloackspace!", "quests.low_voltage.cover_behaviour.desc.1": "Covers are placed by right-clicking with Cover in hand on a face of a machine, and removed with a &5Crowbar&r (or by mining the machine, but that's way slower).\n\nPretty much any GregTech Tile-Entity will accept Covers, even if they wouldn't provide any functionality.\n\nOpening a Cover is done by sneak-right-clicking it with an &5empty hand&r. You can also right-click with a &5Screwdriver&r, or sneak-right-click on another face using the grid.", @@ -700,67 +700,67 @@ "quests.low_voltage.lv_battery.task": "Any LV Battery", "quests.low_voltage.lv_battery_preparation.title": "Battery Preparations!", "quests.low_voltage.lv_battery_preparation.subtitle": "Batteries are great!", - "quests.low_voltage.lv_battery_preparation.desc": "Make some Battery Alloy, used for Battery Hulls.\n\nAntimony is found within &6Stibnite vein&r, look through your TFC Field Guide for more information.\n\n&9Note:&r This quest does &lnot&r contain functional Batteries - head downwards for that.", + "quests.low_voltage.lv_battery_preparation.desc": "Make some Battery Alloy, used for Battery Hulls.\n\nAntimony is found in &6Stibnite&r, look through your TFC Field Guide for more information on where to find it.\n\n&9Note:&r This quest does &lnot&r contain functional Batteries - head downwards for that.", "quests.low_voltage.lv_battery_buffer_4x.title": "Battery Buffer", - "quests.low_voltage.lv_battery_buffer_4x.subtitle": "Usefull if you don't want to build tons of generators", + "quests.low_voltage.lv_battery_buffer_4x.subtitle": "Useful if you don't want to build tons of generators", "quests.low_voltage.lv_battery_buffer_4x.desc.1": "By itself, the Battery Buffer does nothing. However, if you place batteries inside its internal storage, it will act as a power buffer.\n\nThe &3Battery Buffer&r handles &9two Amps in&r, and &9one Amp out&r, &dper Battery&r. The output side has the dot, and all other sides are used as inputs.\n\n&6It'll also charge &lboth&r EU and RF Tools inside it&r.\n\nThis is a must have if you don't have unlimited power at hand. Get &eany&r &7LV&r Battery Buffer to finish the quest. However, the 16 slots variant is likely overkill at this stage.", "quests.low_voltage.lv_battery_buffer_4x.desc.2": "&9Note:&r Don't loop your lossy Cables back to your Battery Buffer! If you think about it, you'll just end up voiding energy.\n\n&l&3Lore:&r&o To be frank with you, the GTCE Battery Buffer was... mediocre. It's been reworked in GTCEu to provide a mix between GT5 and GTCE's functionality. Energy now splits evenly across all batteries!", "quests.low_voltage.lv_battery_buffer_4x.task": "Any Battery Buffer", "quests.low_voltage.lv_amp_explanation.title": "But what are Amps?", "quests.low_voltage.lv_amp_explanation.subtitle": "Amps and You: a how-to", - "quests.low_voltage.lv_amp_explanation.desc": "This questline serves as a quick guide to &9GregTech Amperage&r. As for &dVoltage&r mechanics, we'll go over those once you reach &bMV&r.\n\n&6&lTL;DR:&r For safety, match the Amperage limit of your Cables with the max amount of Amps provided by your Energy Producers.\n\n&6This quest unlocks a new tutorial on Amperage in the &lTips and Tricks&r&6 tab - check it out to learn more!&r", + "quests.low_voltage.lv_amp_explanation.desc": "This questline serves as a quick guide to &9GregTech Amperage&r. As for &dVoltage&r mechanics, we'll go over those once you reach &bMV&r.\n\n&6&lTL;DR:&r For safety, match the Amperage limit of your Cables with the max amount of Amps provided by your Energy Producers.\n\nStill confused? Check the &cGregTech Energy&r chapter for a full rundown on GregTech's electricity system!", "quests.low_voltage.lv_ore_prospector.title": "This is Hacking", "quests.low_voltage.lv_ore_prospector.subtitle": "The future of prospector", "quests.low_voltage.lv_ore_prospector.desc": "The Prospector is an amazing tool that'll help you find veins in no time.\n\nIts GUI is interactive. Right-clicking will scan for ores, displaying them on a dynamic map.\n\n&l&3Lore:&r&o Back in OUR day, the portable Prospector was locked to &dLuV&f. Kids these days have it easy.", "quests.low_voltage.lv_sprayer.title": "Spray Can", "quests.low_voltage.lv_sprayer.subtitle": "Time for server tag wars", "quests.low_voltage.lv_sprayer.desc": "Unfortunately, this is only an &lEmpty&r Spray Can, which you have to fill with Chemical Dye before using.\n\n&aSpray Cans&r do not provide any functionality involving machines, but can be quite &bvisually appealing and useful&r!\n\nAny (or almost any) GregTech tile entity (machine, pipe, cable...) can be &6painted&r to one of the 16 colors of your choosing. This is great for screenshots, or to separate different setups for convenience in a Multiplayer base. They also help with distinguishing between pipelines and cables.\n\nHolding the &aSpray Can&r in the offhand will automatically paint any block you place.", - "quests.low_voltage.other_machines.title": "There is other machines", + "quests.low_voltage.other_machines.title": "But wait, there's more!", "quests.low_voltage.other_machines.subtitle": "You can't escape Greg...", - "quests.low_voltage.other_machines.desc": "We won't go over the &dfull scale of regular Ore Processing&r. Why regular? Some ores require special treatment, but that's a topic for much later. Oh no, we're already getting carried away!\n\nSome machines like the &bChemical Bath&r or the &bElectrolyser&r could be useful.\n\n&cNote:&r Don't get too preoccupied with Ore Processing! It's very slow at this point, and somewhat power hungry. Around 90% of ores are not important enough to warrant going out of your way to obtain their byproducts. That's a legitimate stat, by the way.", + "quests.low_voltage.other_machines.desc": "We won't go over the &dfull scale of regular Ore Processing&r. Why regular? Some ores require special treatment, but that's a topic for much later. Oh no, we're already getting carried away!\n\nSome machines like the &bChemical Bath&r or the &bElectrolyser&r could be useful.\n\nIntimidated by ore processing? Check the dedicated &cOre Processing&r chapter for a full walkthrough!", "quests.low_voltage.other_machines.task": "I agree to lose my sanity", "quests.low_voltage.lv_chemical_bath.title": "Basic Chemical Bath", "quests.low_voltage.lv_chemical_bath.subtitle": "The Chemical Bath bathes...", - "quests.low_voltage.lv_chemical_bath.desc.1": "&lOutside of Ore Processing:&r\n\nYou can use the Chemical Bath to replace recipes made with the &6sealed barrel&r. Making paper and leather never been &6faster&r.\n\nThere are some other less important recipes, such as applying colours to various items and blocks, or bleaching them.", - "quests.low_voltage.lv_chemical_bath.desc.2": "&lFor Ore Processing:&r\n\nSome &aCrushed Ores&r have alternate routes when washed into &aPurified Ore&r, involving bathing in either &aMercury&r or &aSodium Persulfate&r. This step isn't really important, unless you really want that special &6Byproduct&r. This can be a nice alternate source of Gold (hint, hint!).", + "quests.low_voltage.lv_chemical_bath.desc.1": "&lOutside of Ore Processing:&r\n\nYou can use the Chemical Bath to replace recipes made with the &6sealed barrel&r, making paper and leather &6painless&r.\n\nThere are some other less important recipes, such as dyeing various items and blocks, or bleaching them.", + "quests.low_voltage.lv_chemical_bath.desc.2": "&lFor Ore Processing:&r\n\nSome &aCrushed Ores&r have alternate routes when washed into &aPurified Ore&r, involving bathing in either &aMercury&r or &aSodium Persulfate&r. This step isn't really important, unless you really want that special &6Byproduct&r. This can be a nice alternate source of Silver (hint, hint!).", "quests.low_voltage.lv_electroliser.title": "Basic Electrolyzer", "quests.low_voltage.lv_electroliser.subtitle": "It goes bzzz", "quests.low_voltage.lv_electroliser.desc.1": "&lOutside of Ore Processing:&r\n\nSimilar to the Centrifuge, this machine does a lot of things - we can't hope to list them all! Fortunately, it's one of the cheapest &7LV&r machines, so grab it as soon as it becomes necessary.", "quests.low_voltage.lv_electroliser.desc.2": "&lFor Ore Processing:&r\n\nOkay, we lied. It's not &oexactly&r used for Ore Processing, it's actually used in the &adecomposition of Dusts&r. However, most of the useful electrolysis recipes are locked at &bMV&r. You can peep at the &emolecular formula&r in a dust's tooltip to see what you can get from electrolysis.", "quests.low_voltage.lv_electroliser.desc.3": "&cTake caution!&r Due to how ores work, directly smelting dusts into Ingots can give higher metal yields than electrolysis. However, it means you lose the other products in the dust. You will have to decide whether you want to prioritise direct value, or byproduct count.", "quests.low_voltage.lv_mixer.title": "Basic Mixer", - "quests.low_voltage.lv_mixer.subtitle": "Mixer is for mixing", - "quests.low_voltage.lv_mixer.desc": "Using the mixer will &6significantly speed up&r the process of making colored steel, especially for &4red steel&r. Even if you don't think you need it now, you'll find it &6essential&r later on.", + "quests.low_voltage.lv_mixer.subtitle": "The Mixer mixes...", + "quests.low_voltage.lv_mixer.desc": "Using the mixer will &6significantly speed up&r the process of making colored steel, especially the &4red steel&r for your machine hulls. Even if you don't think you need it now, you'll find it &6essential&r later on.", "quests.low_voltage.lv_mixer.task": "From Create or Gregtech", "quests.low_voltage.soldering_alloy.title": "Soldering Alloy", "quests.low_voltage.soldering_alloy.subtitle": "I got soul but I'm not a solder", "quests.low_voltage.soldering_alloy.desc": "&aSoldering Alloy&r is used solely as a &9Fluid&r, and in most cases is &dinterchangeable&r in circuit recipes as a cheaper alternative to Tin&r.\n\nThe choice is yours. Save more materials? Make Soldering Alloy. Spend less time crafting materials? Tin is the way to go.", "quests.low_voltage.gallium_arsenide.title": "Gallium Arsenide", "quests.low_voltage.gallium_arsenide.subtitle": "I hate byproducts, they're awesome", - "quests.low_voltage.gallium_arsenide.desc": "Many materials going forward cannot be smelted directly from any Ores! They are instead obtained as byproducts from processing of other ores. Gallium and Arsenic are &4among&r these materials.\n\nFor &dGallium&r, you may, ranged from worst to best (compromising difficulty and yields):\n\n&9- &3Electrolyze &aSphalerite&r for a low chance of small dust. Note that you lose out on direct smelting value.\n\n&9-&r Put &aCrushed Bauxite&r in the &3Chemical Bath&r. Note that this requires &9Sodium Persulfate&r.\n\n&9-&r Obtain it as a Byproduct of &aSphalerite&r Ore Processing in the &3Thermal Centrifuge&r or &3Centrifuge&r.\n\nFor &dArsenic&r, you will have to mine and &3centrifuge&r &aRealgar&r.", + "quests.low_voltage.gallium_arsenide.desc": "Many materials going forward cannot be smelted directly from any Ores! They are instead obtained as byproducts from processing of other ores. Gallium and Arsenic are &4among&r these materials.\n\nFor &dGallium&r, you may, ranged from worst to best (compromising difficulty and yields):\n\n&9- &3Electrolyze &aSphalerite&r for a low chance of small dust. Note that you lose out on direct smelting value.\n\n&9-&r Put &aCrushed Bauxite&r in the &3Chemical Bath&r. Note that this requires &9Sodium Persulfate&r.\n\n&9-&r Obtain it as a Byproduct of &aSphalerite&r Ore Processing in the &3Thermal Centrifuge&r or &3Centrifuge&r.\n\nFor &dArsenic&r, you will have to mine and &3centrifuge&r &aRealgar&r, or put &aCobaltite&r through an EBF.", "quests.low_voltage.lv_assembler.title": "Basic Assembler", "quests.low_voltage.lv_assembler.subtitle": "This bad boy is assembling better than you and IKEA", "quests.low_voltage.lv_assembler.desc.1": "While this is an extremely &9important&r machine for progression, this will &9&lnot help you immediately&r as it is &cexpensive.&r Most of the recipes you will want to pursue require &cfluids&r. Set up a little bit more infrastructure before rushing this.\n\nWith that out of the way, the &3Assembler&r is crucial to gameplay. Consider it as important as a Crafting Table, except... well, it's a machine, duh.", - "quests.low_voltage.lv_assembler.desc.2": "Once you have enough infrastructure you will be able to make use of better recipes for:\n\n&9-&r &6Vacuum Tubes&r, giving over double the previous yield\n\n&9-&r &6Resistors&r, granting 4 resistors per craft!\n\n&9-&r &6Circuit Boards&r, greatly reducing copper used\n\n&9-&r &6LV Machine Casing&r without the need for red steel.\n\nWahoo!\n\n&l&3Lore:&r&o Back in the days of GregTech 2, the Assembling Machine only had two slots, and was only really used for alternate Circuit and Hull recipes.", - "quests.low_voltage.lv_assembler.task": "", + "quests.low_voltage.lv_assembler.desc.2": "Once you have enough infrastructure you will be able to make use of better recipes for:\n\n&9-&r &6Vacuum Tubes&r, giving over double the previous yield\n\n&9-&r &6Resistors&r, granting 4 resistors per craft!\n\n&9-&r &6Circuit Boards&r, greatly reducing copper used\n\nWahoo!\n\n&l&3Lore:&r&o Back in the days of GregTech 2, the Assembling Machine only had two slots, and was only really used for alternate Circuit and Hull recipes.", + "quests.low_voltage.lv_assembler.task": "Basic Assembler", "quests.low_voltage.t2_circuit_board.subtitle": "Yeah yeah it's wood but don't under estimate it", "quests.low_voltage.t2_circuit_board.desc.1": "This Circuit Board is used to create &dMV Circuits&r!\n\n&9Note:&r You have <wo&r options when making the Phenolic Printed Circuit Board. If you use &aSodium Persulfate&r or &aIron III Chloride&r, making boards takes &6only a quarter of the Silver&r as opposed to the crafting recipe.\n\n&lHowever&r, given how painful it may be for you to obtain these chemicals &oright now&r, you can simply use more Silver by mining most of a Galena Vein...\n\nThe quest for &aSodium Persulfate&r is in the &bMV&r chapter, if you're down for some light reading.", "quests.low_voltage.t2_circuit_board.desc.2": "&l&3Lore:&r&o Back in GTCEu 1.12.2, these circuit boards were called &2Good Circuit Boards&f. Not exactly a fitting name, as they're &4rather evil&f to craft.", "quests.low_voltage.lv_diode.title": "Diode", "quests.low_voltage.lv_diode.subtitle": "Don't be swayed by EMI!", - "quests.low_voltage.lv_diode.desc": "Don't let JEI fool you... there's only one possible recipe right now for this Primitive Diode.\n\nDiodes have a infamously &4nasty recipe&r, but they will become cheaper and more convenient once you can obtain &ePolyethylene&r.\n\nThis is required for &dMV Circuits&r.", + "quests.low_voltage.lv_diode.desc": "Don't let JEI fool you... there's only one possible recipe right now for this Primitive Diode -- the liquid glass one.\n\nDiodes have a infamously &4nasty recipe&r, but they will become cheaper and more convenient once you can obtain &ePolyethylene&r.\n\nThis is required for &dMV Circuits&r.", "quests.low_voltage.1_mv_circuit.title": "First MV Circuit!", "quests.low_voltage.1_mv_circuit.subtitle": "Does that mean we're at MV yet?", - "quests.low_voltage.1_mv_circuit.desc": "Well... gotten any Aluminium Ingots yet?\n\nEach Electric Age has Circuits corresponding to its tier. The Good Electronic Circuit is the &dfirst MV Circuit&r you can make out of the three tiers of &bMV&r Circuitry.\n\nAlways be on the lookout for a cheaper way to make your circuits - new sets of recipes become available each time you make a new tier of &2Circuit Assembler&r. Conveniently, this tier of Circuit unlocks one now! Its recipes are far, far cheaper than hand-crafting Circuits.\n\n&6Having this and Aluminium will grant access to MV Machines.&r\n\nIf you are having trouble understanding the mess that is Gregtech circuits don't hesitate to look at the &6Development Table&r", + "quests.low_voltage.1_mv_circuit.desc": "Well... got any Aluminium Ingots yet?\n\nEach Electric Age has Circuits corresponding to its tier. The Good Electronic Circuit is the &dfirst MV Circuit&r you can make out of the three tiers of &bMV&r Circuitry.\n\nAlways be on the lookout for a cheaper way to make your circuits - new sets of recipes become available each time you make a new tier of &2Circuit Assembler&r. Conveniently, this tier of Circuit unlocks one now! Its recipes are far, far cheaper than the Deployers.\n\n&6Having this and Aluminium will grant access to MV Machines.&r\n\nIf you are having trouble understanding the mess that is GregTech circuits, check out the &6Progression Table&r chapter.", "quests.low_voltage.lv_circuit_assembler.title": "The Circuit Assembler", "quests.low_voltage.lv_circuit_assembler.subtitle": "Hopefully, your first MV Circuit expense", "quests.low_voltage.lv_circuit_assembler.desc.1": "From now on, all Circuits should be made in a &3Circuit Assembler&r. Use it now to enjoy &6far cheaper LV and MV circuits&r.\n\nEach time you upgrade to a new tier of &3Circuit Assembler&r, you will be able to craft more &dadvanced themes&r of circuit. These will use &ccomplex&r and &msometimes&r unfamiliar ingredients, but will be more efficient to craft overall.", "quests.low_voltage.lv_circuit_assembler.desc.2": "&l&3Lore:&r&o The Circuit Assembler has made appearances in and out of GregTech versions. GT5 did not have it, and it was reimplemented in GT5 Unofficial. GTCE decided not to port it, and the tug-of-war continues with its inclusion in GTCEu.", - "quests.low_voltage.lv_greenhouse.title": "Greenhouse", + "quests.low_voltage.lv_greenhouse.title": "Electric Greenhouse", "quests.low_voltage.lv_greenhouse.subtitle": "The power of KubeJS", - "quests.low_voltage.lv_greenhouse.desc.1": "GregTech doesn't provide ways to farm plants or trees, so we made a custom multiblock for the modpack!\n\nThe multiblock &3Greenhouse&r will be your source of &aWood&r and other plants if you wish.\n\nIts &aWood&r production should be enough to run &32 Pyrolyse Ovens&r at their lowest Power.\n\nYou can also use this for automated &aResin&r. The yields are kept low to incentivize other rubber sources later in the game.", - "quests.low_voltage.lv_greenhouse.desc.2": "&9Note: &rWith &d72 EU/t&r recipes, it needs either 1 &bMV&r energy hatch or 2 &7LV&r energy hatches. Multiblocks will &cnot&r use 2A of one tier to reach the next one for recipe voltage minimums.\n\nIn other words, the controller needs to say at least &bMV&r in the GUI to run recipes which say &bMV&r in EMI, even if they can draw enough EU/t with a lower tier hatch configuration.\n\n&9Note:&r The structure requires a lot of &7Steel&r. Make sure you have an &3EBF&r for that.", - "quests.low_voltage.lv_greenhouse.desc.3": "&l&3Lore from Community Pack:&r&o We originally implemented a Chemical Reactor recipe for wood in the modpack to solve the tree problem. Our implementation turned out to be completely busted, so we decided that a rebalance was due. Hopefully, the Greenhouse is a happy middle ground.", + "quests.low_voltage.lv_greenhouse.desc.1": "The multiblock &3Electric Greenhouse&r can be your source of &aLogs&r and other plants if you prefer making GregTech machines over Create contraptions. It also has the unique property of being able to grow more of TFC's decorative plants!\n\nYou can also use this for automated &aResin&r. The yields are kept low to incentivize other rubber sources later in the game.", + "quests.low_voltage.lv_greenhouse.desc.2": "&9Note: &rWith recipes requiring more than 32 EU/t, it needs either 1 &bMV&r energy hatch or 2 &7LV&r energy hatches. Multiblocks will &cnot&r use 2A of one tier to reach the next one for recipe voltage minimums.\n\nIn other words, the controller needs to say at least &bMV&r in the GUI to run recipes which say &bMV&r in EMI, even if they can draw enough EU/t with a lower tier hatch configuration.\n\n&9Note:&r The structure requires a lot of &7Steel&r. Make sure you have an &3EBF&r for that.", + "quests.low_voltage.lv_greenhouse.desc.3": "&l&3Lore:&r&o This multiblock was originally created for the GTCEu Community Pack, but is also available on the GTCEu developer documentation. It's significantly slower than default to keep in line with TFC's slower tree growing speeds, but prior to TFG 0.9, it used to take almost an hour for each recipe!", "quests.low_voltage.lv_centrifuge.title": "Basic Centrifuge", "quests.low_voltage.lv_centrifuge.subtitle": "It does the opposite of the Mixer", "quests.low_voltage.lv_centrifuge.desc.1": "&lOutside of Ore Processing:&r\n\nOh boy, what can't this machine do? Decomposition recipes to separate dust types, separating air, do your taxes, and many others...\n\nThe list is too long! Let's just say &cyou need the Centrifuge&r.", @@ -768,8 +768,8 @@ "quests.low_voltage.lv_centrifuge.desc.3": "&l&3Lore:&r&o In base GTCE, this was objectively the strongest Ore Processing machine as it was fairly easy to use, and gave three tiny dusts, just like the Ore Washer or the Thermal Centrifuge. We tuned it down in favor of diversity.", "quests.low_voltage.lv_centrifuge.task": "", "quests.low_voltage.lv_glue.title": "Glued", - "quests.low_voltage.lv_glue.subtitle": "Oh so I can use my sticky resin better", - "quests.low_voltage.lv_glue.desc": "You can now &3centrifuge&r &aSticky Resin&r, which will give you &aGlue&r in fluid form (and the less useful Plantball, &6for now&r).\n\nGive yourself a headstart and get on producing Glue. You can use it to make &6cheaper Resistors&r, as well as &6cheaper Circuit Boards&r in the &3Assembling Machine&r (and it is especially useful &oin the near future&r).\n\n&eNote:&r You could also use &aGlue&r from TFC or &aConifer Rosin&r if you feel it would be easier for you", + "quests.low_voltage.lv_glue.subtitle": "What a sticky situation", + "quests.low_voltage.lv_glue.desc": "You can now &3centrifuge&r &aSticky Resin&r, which will give you &aGlue&r in fluid form (and the less useful Plantball, &6for now&r).\n\nGive yourself a headstart and get on producing Glue. You can use it to make &6cheaper Resistors&r, as well as &6cheaper Circuit Boards&r in the &3Assembler&r (and it is especially useful &oin the near future&r).\n\n&eNote:&r You can also centrifuge TFC's &aGlue&r or &aConifer Rosin&r, whichever's easiest!", "quests.low_voltage.lv_cutter.title": "Basic Cutter", "quests.low_voltage.lv_cutter.subtitle": "The Cutter... cuts...", "quests.low_voltage.lv_cutter.desc": "For now, you should use &9Water&r for its recipes instead of trying to acquire Lubricant.\n\nThe &3Cutting Machine&r additionally unlocks converting &6Rods into four Bolts&r.\n\nThis machine is the only way to obtain &dGem Plates&r, which are needed to craft Filters, and by extension, the &3Gas Collector&r.", From f569ded46dc3a937902a08f23f379df7be147aa8 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 20:50:02 +0100 Subject: [PATCH 15/53] fishing net field guide typo --- .../field_guide/en_us/entries/mechanics/fishing_nets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/fishing_nets.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/fishing_nets.json index 305f16de0..22ef09b61 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/fishing_nets.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/fishing_nets.json @@ -8,7 +8,7 @@ "type": "patchouli:spotlight", "title": "Fishing Nets", "item": { "tag": "forge:tools/fishing_nets" }, - "text": "Tired of hunting down fish with spears? Or loosing a floppy catch while $(l:mechanics/fishing)fishing$()? Craft a $(thing)Fishing Net$() to scoop up your dinner.$(br)To use a fishing net; right click on a fish entity to capture the fish into your inventory. Different tier fshing nets all act the same, but have different durability." + "text": "Tired of hunting down fish with spears? Or loosing a floppy catch while $(l:mechanics/fishing)fishing$()? Craft a $(thing)Fishing Net$() to scoop up your dinner.$(br)To use a fishing net; right click on a fish entity to capture the fish into your inventory. Different tier fishing nets all act the same, but have different durability." }, { "type": "patchouli:crafting", From 054a27977b3d18ebedd09719e590fb9d24fd2ae0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 21:08:20 +0100 Subject: [PATCH 16/53] added default keybinds for ftb-chunks, updated field guide and quests for it --- config/defaultoptions/keybindings.txt | 2 ++ .../field_guide/en_us/entries/tfg_tips/faqs.json | 2 +- kubejs/assets/tfg/lang/en_us.json | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/defaultoptions/keybindings.txt b/config/defaultoptions/keybindings.txt index d68acb032..f439dfcb7 100644 --- a/config/defaultoptions/keybindings.txt +++ b/config/defaultoptions/keybindings.txt @@ -116,3 +116,5 @@ key_key.entityculling.toggle:key.keyboard.unknown:NONE key_key.craftpresence.config_keycode.name:key.keyboard.unknown:NONE key_gui.xaero_pac_key_open_menu:key.keyboard.apostrophe:NONE key_gtceu.key.armor_mode_switch:key.keyboard.o +key_key.ftbchunks.map:key.keyboard.unknown:NONE +key_key.ftbchunks.claim_manager:key.keyboard.m:CONTROL \ No newline at end of file diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/faqs.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/faqs.json index d84ae86f0..ce8574c54 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/faqs.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/faqs.json @@ -33,7 +33,7 @@ { "type": "patchouli:text", "anchor": "chunks", - "text": "$(italic)How do I force-load a chunk?$()$(br2)Open your map with $(item)$(k:gui.xaero_open_map)$(), then right-click the chunk > $(thing)Claim Selected$(). Right-click a claimed chunk again > $(thing)Forceload Selected$().$(br2)To increase the number of forceloaded chunks, press $(item)$(k:gui.xaero_pac_key_open_menu)$(), then go to the player settings and increase the number of bonus chunk forceloads." + "text": "$(italic)How do I force-load a chunk?$()$(br2)Open your map with $(item)$(k:key.ftbchunks.claim_manager)$(), then shift-left-click the chunk. Shift-right-click to unclaim.$(br2)To increase the number of forceloaded chunks, use $(item)/ftbchunks admin extra_force_load_chunks @p set X$(), where X is the new limit." }, { "type": "patchouli:text", diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 94e4b2f9f..cb997c86b 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -1687,7 +1687,7 @@ "quests.tfg.create_team.desc": "You can create a team to complete quests together. To do this, open your inventory, then in the upper left corner select the button where 3 colorful people are drawn, then an interface will open in which you can create a team. Click the §aCreate a team§r button, then give it a name and possibly some other parameters, and after successfully creating a team, you can invite other players to it using the plus button in the green circle in the upper right corner. From this point onwards, your quests will be synchronized and any team member will be able to complete them. Good luck!", "quests.tfg.capture_territory.title": "How to capture territory?", "quests.tfg.capture_territory.subtitle": "And how to load chunks in your territory", - "quests.tfg.capture_territory.desc": "If you play on a server, you might want to claim your territory so other players can't interfere. Use the Open Map key (default \"M\") to open the map, then right-click the chunk you want to claim, and select Claim Chunk. There is a limit to this, so you can't claim everything. You can right-click on a chunk again to Forceload (aka \"chunk load\") it. Claiming chunks will include your whole team, if you're using one.", + "quests.tfg.capture_territory.desc": "If you play on a server, you might want to claim your territory so other players can't interfere. Use the Open Claims key (default \"Ctrl+M\") to open the window, then left-click to claim a chunk and right-click to unclaim them. There is a limit to this, so you can't claim everything. You can shift-left-click on a chunk to forceload (aka \"chunk load\") it, and shift-right-click to un-forceload it. Claiming chunks will include your whole team, if you're using one.", "quests.tfg.field_guide.title": "Important information about quests!", "quests.tfg.field_guide.subtitle": "I need to read more?", "quests.tfg.field_guide.desc": "The quests are still in development, and we're always working on improving them! A lot of information about specific mechanics are also in your Field Guide, accessible via the Book tab in your inventory.\n\nRemember that both JEI and the Field Guide are your friends, as not everything will be explained through quests.", From 6048af80422d1af70aa18af24271dd680728fe78 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 21:11:53 +0100 Subject: [PATCH 17/53] Entity loot table changes (#1035) * trying stuff, might delete later * updated all loot tables so looting only affects animal meat drops --- .../beneath/loot_tables/entities/red_elk.json | 12 +- .../loot_tables/entities/cave_enderman.json | 99 +------ .../entities/dark_oak_enderman.json | 74 +----- .../entities/mushroom_fields_enderman.json | 98 +------ .../loot_tables/entities/swamp_enderman.json | 97 ++----- .../loot_tables/entities/drowned.json | 65 +++++ .../loot_tables/entities/enderman.json | 29 -- .../minecraft/loot_tables/entities/frog.json | 54 ++++ .../loot_tables/entities/magma_cube.json | 13 +- .../loot_tables/entities/phantom.json | 28 +- .../loot_tables/entities/wither_skeleton.json | 39 +-- .../loot_tables/entities/zombie.json | 65 +++++ .../endermanoverhaul/recipes.js | 9 + kubejs/server_scripts/main_server_script.js | 1 + .../primitive_creatures/loot.js | 6 +- kubejs/server_scripts/tfc/loot.js | 249 ++++++++++++++++-- kubejs/server_scripts/tfctextile/recipes.js | 7 + 17 files changed, 496 insertions(+), 449 deletions(-) create mode 100644 kubejs/data/minecraft/loot_tables/entities/drowned.json create mode 100644 kubejs/data/minecraft/loot_tables/entities/frog.json create mode 100644 kubejs/data/minecraft/loot_tables/entities/zombie.json create mode 100644 kubejs/server_scripts/tfctextile/recipes.js diff --git a/kubejs/data/beneath/loot_tables/entities/red_elk.json b/kubejs/data/beneath/loot_tables/entities/red_elk.json index 16da75c4c..498eb39f7 100644 --- a/kubejs/data/beneath/loot_tables/entities/red_elk.json +++ b/kubejs/data/beneath/loot_tables/entities/red_elk.json @@ -11,11 +11,21 @@ "functions": [ { "function": "minecraft:set_count", + "add": false, "count": { "min": 4, "max": 10, "type": "minecraft:uniform" } + }, + { + "count": { + "type": "minecraft:uniform", + "max": 3.0, + "min": 1.0 + }, + "enchantment": "minecraft:looting", + "function": "minecraft:looting_enchant" } ] } @@ -34,7 +44,7 @@ "count": { "type": "minecraft:uniform", "min": 1, - "max": 3 + "max": 6 } } ] diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json index cdb4a42cc..33a5fe22a 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json @@ -6,27 +6,11 @@ "entries": [ { "type": "minecraft:item", - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 3.0, - "min": 1.0 - }, - "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" - } - ], "name": "ae2:ender_dust" + }, + { + "type": "minecraft:item", + "name": "endermanoverhaul:summoner_pearl" } ], "rolls": 1.0 @@ -45,25 +29,10 @@ "min": 2.0 }, "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" } ], "name": "gtceu:raw_coal" - } - ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "entries": [ + }, { "type": "minecraft:item", "functions": [ @@ -75,25 +44,10 @@ "min": 2.0 }, "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" } ], - "name": "gtceu:raw_goethite" - } - ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "entries": [ + "name": "tfc:ore/normal_magnetite" + }, { "type": "minecraft:item", "functions": [ @@ -105,51 +59,12 @@ "min": 2.0 }, "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" } ], "name": "tfc:ore/normal_native_copper" } ], "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 - }, - "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" - } - ], - "name": "endermanoverhaul:summoner_pearl" - } - ], - "rolls": 1.0 } ], "random_sequence": "endermanoverhaul:entities/cave_enderman" diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/dark_oak_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/dark_oak_enderman.json index 19df111fe..a993404ae 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/dark_oak_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/dark_oak_enderman.json @@ -6,27 +6,11 @@ "entries": [ { "type": "minecraft:item", - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" - } - ], "name": "ae2:ender_dust" + }, + { + "type": "minecraft:item", + "name": "endermanoverhaul:corrupted_pearl" } ], "rolls": 1.0 @@ -45,18 +29,9 @@ "min": 4.0 }, "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" } ], - "name": "tfc:powder/wood_ash" + "name": "tfc:soot" } ], "rolls": 1.0 @@ -75,51 +50,12 @@ "min": 4.0 }, "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" } ], "name": "minecraft:charcoal" } ], "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 - }, - "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" - } - ], - "name": "endermanoverhaul:corrupted_pearl" - } - ], - "rolls": 1.0 } ], "random_sequence": "endermanoverhaul:entities/dark_oak_enderman" diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/mushroom_fields_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/mushroom_fields_enderman.json index af35178ec..3fca22932 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/mushroom_fields_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/mushroom_fields_enderman.json @@ -6,27 +6,11 @@ "entries": [ { "type": "minecraft:item", - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 3.0, - "min": 1.0 - }, - "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 3.0, - "min": 1.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" - } - ], "name": "ae2:ender_dust" + }, + { + "type": "minecraft:item", + "name": "endermanoverhaul:summoner_pearl" } ], "rolls": 1.0 @@ -41,85 +25,25 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 4.0, - "min": 2.0 + "max": 2.0, + "min": 1.0 }, "function": "minecraft:set_count" }, { + "add": false, "count": { "type": "minecraft:uniform", - "max": 4.0, - "min": 2.0 + "max": 2.0, + "min": 1.0 }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" + "function": "minecraft:set_count" } ], "name": "minecraft:red_mushroom" } ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 4.0, - "min": 2.0 - }, - "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 4.0, - "min": 2.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" - } - ], - "name": "minecraft:brown_mushroom" - } - ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 - }, - "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" - } - ], - "name": "endermanoverhaul:summoner_pearl" - } - ], - "rolls": 1.0 + "rolls": 3.0 } ], "random_sequence": "endermanoverhaul:entities/mushroom_fields_enderman" diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/swamp_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/swamp_enderman.json index 02bf8d53d..25ec767e4 100644 --- a/kubejs/data/endermanoverhaul/loot_tables/entities/swamp_enderman.json +++ b/kubejs/data/endermanoverhaul/loot_tables/entities/swamp_enderman.json @@ -6,27 +6,11 @@ "entries": [ { "type": "minecraft:item", - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 3.0, - "min": 1.0 - }, - "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 3.0, - "min": 1.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" - } - ], "name": "ae2:ender_dust" + }, + { + "type": "minecraft:item", + "name": "endermanoverhaul:summoner_pearl" } ], "rolls": 1.0 @@ -45,25 +29,25 @@ "min": 2.0 }, "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 4.0, - "min": 2.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" } ], "name": "minecraft:glow_berries" - } - ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "entries": [ + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "minecraft:moss_block" + }, { "type": "minecraft:item", "functions": [ @@ -75,51 +59,12 @@ "min": 1.0 }, "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" } ], "name": "tfc:wood/sapling/mangrove" } ], - "rolls": 1.0 - }, - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 - }, - "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" - } - ], - "name": "endermanoverhaul:summoner_pearl" - } - ], - "rolls": 1.0 + "rolls": 2.0 } ], "random_sequence": "endermanoverhaul:entities/swamp_enderman" diff --git a/kubejs/data/minecraft/loot_tables/entities/drowned.json b/kubejs/data/minecraft/loot_tables/entities/drowned.json new file mode 100644 index 000000000..718f019b7 --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/entities/drowned.json @@ -0,0 +1,65 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:rotten_flesh", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "max": 2, + "min": 1, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfc:groundcover/driftwood", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "max": 2, + "min": 0, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "max": 1, + "min": 0, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/minecraft/loot_tables/entities/enderman.json b/kubejs/data/minecraft/loot_tables/entities/enderman.json index 8fc22b68f..6aa7661d3 100644 --- a/kubejs/data/minecraft/loot_tables/entities/enderman.json +++ b/kubejs/data/minecraft/loot_tables/entities/enderman.json @@ -7,26 +7,6 @@ "entries": [ { "type": "minecraft:item", - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 3.0, - "min": 1.0 - }, - "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 3.0, - "min": 1.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" - } - ], "name": "ae2:ender_dust" } ] @@ -46,15 +26,6 @@ "min": 2.0 }, "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 4.0, - "min": 2.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" } ], "name": "minecraft:chorus_fruit" diff --git a/kubejs/data/minecraft/loot_tables/entities/frog.json b/kubejs/data/minecraft/loot_tables/entities/frog.json new file mode 100644 index 000000000..9776c5589 --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/entities/frog.json @@ -0,0 +1,54 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfc:food/frog_legs", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 2, + "max": 3, + "type": "minecraft:uniform" + } + }, + { + "count": { + "type": "minecraft:uniform", + "max": 1.0, + "min": 0.0 + }, + "enchantment": "minecraft:looting", + "function": "minecraft:looting_enchant" + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 2, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/minecraft/loot_tables/entities/magma_cube.json b/kubejs/data/minecraft/loot_tables/entities/magma_cube.json index ac76235c8..5b733d438 100644 --- a/kubejs/data/minecraft/loot_tables/entities/magma_cube.json +++ b/kubejs/data/minecraft/loot_tables/entities/magma_cube.json @@ -12,19 +12,10 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 + "max": 2.0, + "min": 1.0 }, "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 1.0, - "min": 0.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" } ], "name": "minecraft:magma_cream" diff --git a/kubejs/data/minecraft/loot_tables/entities/phantom.json b/kubejs/data/minecraft/loot_tables/entities/phantom.json index 83e70384a..8ab7b52ce 100644 --- a/kubejs/data/minecraft/loot_tables/entities/phantom.json +++ b/kubejs/data/minecraft/loot_tables/entities/phantom.json @@ -3,7 +3,7 @@ "pools": [ { "name": "loot_pool", - "rolls": 2, + "rolls": 1, "entries": [ { "type": "minecraft:item", @@ -16,19 +16,16 @@ "min": 1.0 }, "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 3.0, - "min": 1.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" } ], "name": "minecraft:bone" - }, + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ { "type": "minecraft:item", "functions": [ @@ -40,15 +37,6 @@ "min": 1.0 }, "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" } ], "name": "minecraft:phantom_membrane" diff --git a/kubejs/data/minecraft/loot_tables/entities/wither_skeleton.json b/kubejs/data/minecraft/loot_tables/entities/wither_skeleton.json index be0b4fc56..499f1c349 100644 --- a/kubejs/data/minecraft/loot_tables/entities/wither_skeleton.json +++ b/kubejs/data/minecraft/loot_tables/entities/wither_skeleton.json @@ -16,15 +16,6 @@ "min": 2.0 }, "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" } ], "name": "minecraft:bone" @@ -42,29 +33,14 @@ "add": false, "count": { "type": "minecraft:uniform", - "max": 5.0, + "max": 4.0, "min": 2.0 }, "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" } ], "name": "beneath:cursecoal" - } - ] - }, - { - "name": "loot_pool", - "rolls": 1, - "entries": [ + }, { "type": "minecraft:item", "functions": [ @@ -73,18 +49,9 @@ "count": { "type": "minecraft:uniform", "max": 5.0, - "min": 2.0 + "min": 3.0 }, "function": "minecraft:set_count" - }, - { - "count": { - "type": "minecraft:uniform", - "max": 2.0, - "min": 1.0 - }, - "enchantment": "minecraft:looting", - "function": "minecraft:looting_enchant" } ], "name": "gtceu:rich_raw_coal" diff --git a/kubejs/data/minecraft/loot_tables/entities/zombie.json b/kubejs/data/minecraft/loot_tables/entities/zombie.json new file mode 100644 index 000000000..12839c18d --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/entities/zombie.json @@ -0,0 +1,65 @@ +{ + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:rotten_flesh", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "max": 2, + "min": 1, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:stick", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "max": 2, + "min": 0, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "max": 1, + "min": 0, + "type": "minecraft:uniform" + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/endermanoverhaul/recipes.js b/kubejs/server_scripts/endermanoverhaul/recipes.js index 90c2ec970..065d9bebd 100644 --- a/kubejs/server_scripts/endermanoverhaul/recipes.js +++ b/kubejs/server_scripts/endermanoverhaul/recipes.js @@ -4,5 +4,14 @@ function registerEndermanOverhaulRecipes(event) { event.remove({ id: 'endermanoverhaul:corrupted_shield' }) event.remove({ id: 'endermanoverhaul:corrupted_blade' }) + + event.shapeless('ae2:ender_dust', ['#forge:ender_pearls', '#forge:tools/mortars']) + .id('tfg:shapeless/mortar_ender_pearls') + event.recipes.gtceu.macerator('tfg:macerate_ender_pearls') + .itemInputs('#forge:ender_pearls') + .itemOutputs('ae2:ender_dust') + .category(GTRecipeCategories.MACERATOR_RECYCLING) + .duration(50) + .EUt(GTValues.VA[GTValues.ULV]) } \ No newline at end of file diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index f4bf51528..0745c3183 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -204,6 +204,7 @@ ServerEvents.recipes(event => { registerTFCBetterBFRecipes(event) registerTFGRecipes(event) registerTFCGroomingStationRecipes(event) + registerTFCTextileRecipes(event) registerToolBeltRecipes(event) registerTreeTapRecipes(event) registerVintageImprovementsRecipes(event) diff --git a/kubejs/server_scripts/primitive_creatures/loot.js b/kubejs/server_scripts/primitive_creatures/loot.js index 8693dd669..09e4a1220 100644 --- a/kubejs/server_scripts/primitive_creatures/loot.js +++ b/kubejs/server_scripts/primitive_creatures/loot.js @@ -3,8 +3,10 @@ function registerPrimitiveCreatesLoots(event) { event.addEntityLootModifier('kaolinclayze:tfc') - .addWeightedLoot([7,15], ['tfc:kaolin_clay', 'minecraft:clay_ball']) + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addWeightedLoot([12,16], ['tfc:kaolin_clay', 'minecraft:clay_ball']) event.addEntityLootModifier('kaolinclayze:golem_2') - .addWeightedLoot([7,15], ['gtceu:poor_raw_graphite', 'gtceu:raw_graphite', 'gtceu:rich_raw_graphite']) + .removeLoot(ItemFilter.ALWAYS_TRUE) + .addWeightedLoot([4,6], ['gtceu:rich_raw_graphite']) } \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/loot.js b/kubejs/server_scripts/tfc/loot.js index dbb7c8c77..2b8041d0c 100644 --- a/kubejs/server_scripts/tfc/loot.js +++ b/kubejs/server_scripts/tfc/loot.js @@ -1,64 +1,261 @@ // priority: 0 -function registerTFCLoots(event) -{ +function registerTFCLoots(event) { + // Hostile animals + event.addEntityLootModifier('tfc:black_bear') - .addWeightedLoot([8,12], ['tfc:food/bear']) + .addWeightedLoot([8, 12], ['tfc:food/bear']) + + event.addEntityLootModifier('tfc:black_bear') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([4, 6], ['tfc:food/bear']) + event.addEntityLootModifier('tfc:grizzly_bear') - .addWeightedLoot([10,16], ['tfc:food/bear']) + .addWeightedLoot([10, 16], ['tfc:food/bear']) + + event.addEntityLootModifier('tfc:grizzly_bear') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([5, 8], ['tfc:food/bear']) + event.addEntityLootModifier('tfc:polar_bear') - .addWeightedLoot([14,20], ['tfc:food/bear']) - .addWeightedLoot([2,5], ['tfc:blubber']) + .addWeightedLoot([14, 20], ['tfc:food/bear']) + .addWeightedLoot([2, 5], ['tfc:blubber']) + + event.addEntityLootModifier('tfc:polar_bear') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([7, 10], ['tfc:food/bear']) + event.addEntityLootModifier('tfc:cougar') - .addWeightedLoot([6,10], ['tfc:food/gran_feline']) + .addWeightedLoot([6, 10], ['tfc:food/gran_feline']) + + event.addEntityLootModifier('tfc:cougar') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([3, 5], ['tfc:food/gran_feline']) + event.addEntityLootModifier('tfc:panther') - .addWeightedLoot([6,10], ['tfc:food/gran_feline']) + .addWeightedLoot([6, 10], ['tfc:food/gran_feline']) + + event.addEntityLootModifier('tfc:panther') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([3, 5], ['tfc:food/gran_feline']) + event.addEntityLootModifier('tfc:sabertooth') - .addWeightedLoot([9,14], ['tfc:food/gran_feline']) + .addWeightedLoot([9, 14], ['tfc:food/gran_feline']) + + event.addEntityLootModifier('tfc:sabertooth') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([4, 7], ['tfc:food/gran_feline']) + event.addEntityLootModifier('tfc:lion') - .addWeightedLoot([9,14], ['tfc:food/gran_feline']) - + .addWeightedLoot([9, 14], ['tfc:food/gran_feline']) + + event.addEntityLootModifier('tfc:lion') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([4, 7], ['tfc:food/gran_feline']) + + event.addEntityLootModifier('tfc:tiger') - .addWeightedLoot([9,14], ['tfc:food/gran_feline']) + .addWeightedLoot([9, 14], ['tfc:food/gran_feline']) + + event.addEntityLootModifier('tfc:tiger') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([4, 7], ['tfc:food/gran_feline']) + event.addEntityLootModifier('tfc:ocelot') - .addWeightedLoot([2,5], ['tfc:food/gran_feline']) + .addWeightedLoot([2, 5], ['tfc:food/gran_feline']) + + event.addEntityLootModifier('tfc:ocelot') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([1, 2], ['tfc:food/gran_feline']) + event.addEntityLootModifier('tfc:cat') - .addWeightedLoot([2,5], ['tfc:food/gran_feline']) + .addWeightedLoot([2, 5], ['tfc:food/gran_feline']) + + event.addEntityLootModifier('tfc:cat') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([1, 2], ['tfc:food/gran_feline']) + event.addEntityLootModifier('tfc:sabertooth') - .addWeightedLoot([9,14], ['tfc:food/gran_feline']) + .addWeightedLoot([9, 14], ['tfc:food/gran_feline']) + + event.addEntityLootModifier('tfc:sabertooth') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([4, 7], ['tfc:food/gran_feline']) + event.addEntityLootModifier('tfc:dog') - .addWeightedLoot([5,9], ['tfc:food/wolf']) + .addWeightedLoot([5, 8], ['tfc:food/wolf']) + + event.addEntityLootModifier('tfc:dog') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([2, 4], ['tfc:food/wolf']) + event.addEntityLootModifier('tfc:wolf') - .addWeightedLoot([5,9], ['tfc:food/wolf']) + .addWeightedLoot([5, 8], ['tfc:food/wolf']) + + event.addEntityLootModifier('tfc:wolf') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([2, 4], ['tfc:food/wolf']) + event.addEntityLootModifier('tfc:direwolf') - .addWeightedLoot([10,15], ['tfc:food/wolf']) + .addWeightedLoot([8, 12], ['tfc:food/wolf']) + + event.addEntityLootModifier('tfc:direwolf') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([4, 6], ['tfc:food/wolf']) - event.addEntityLootModifier('tfc:wolf') - .addWeightedLoot([5,9], ['tfc:food/wolf']) event.addEntityLootModifier('tfc:hyena') - .addWeightedLoot([5,9], ['tfc:food/hyena']) + .addWeightedLoot([4, 7], ['tfc:food/hyena']) + + event.addEntityLootModifier('tfc:hyena') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([2, 4], ['tfc:food/hyena']) + event.addEntityLootModifier('tfc:fox') - .addWeightedLoot([5,9], ['tfc:food/fox']) + .addWeightedLoot([4, 7], ['tfc:food/fox']) + + event.addEntityLootModifier('tfc:fox') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([2, 4], ['tfc:food/fox']) + - event.addEntityLootModifier('tfc:crocodile') - .addWeightedLoot([5,10], ['tfc:food/bluegill', 'tfc:food/crappie', 'tfc:food/lake_trout', 'tfc:food/rainbow_trout', 'tfc:food/frog_legs']) + .addWeightedLoot([5, 10], ['tfc:food/bluegill', 'tfc:food/crappie', 'tfc:food/lake_trout', 'tfc:food/rainbow_trout', 'tfc:food/frog_legs']) .addSequenceLoot(LootEntry.of('tfc:metal/fish_hook/copper').when(c => c.randomChance(0.2))) + event.addEntityLootModifier('tfc:crocodile') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([2, 5], ['tfc:food/bluegill', 'tfc:food/crappie', 'tfc:food/lake_trout', 'tfc:food/rainbow_trout', 'tfc:food/frog_legs']) + + // Passive animals + + event.addEntityLootModifier('tfc:alpaca') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([5, 10], ['tfc:food/camelidae']) + + event.addEntityLootModifier('tfc:boar') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([2, 4], ['tfc:food/pork']) + + event.addEntityLootModifier('tfc:bongo') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([2, 4], ['tfc:food/venison']) + + event.addEntityLootModifier('tfc:caribou') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([3, 5], ['tfc:food/venison']) + + event.addEntityLootModifier('tfc:chicken') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([1, 3], ['tfc:food/chicken']) + + event.addEntityLootModifier('tfc:cow') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([8, 12], ['tfc:food/beef']) + + event.addEntityLootModifier('tfc:deer') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([2, 4], ['tfc:food/camelidae']) + + event.addEntityLootModifier('tfc:deer') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([2, 5], ['tfc:food/venison']) + + event.addEntityLootModifier('tfc:donkey') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([7, 10], ['tfc:food/horse_meat']) + + event.addEntityLootModifier('tfc:duck') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([1, 3], ['tfc:food/duck']) + + event.addEntityLootModifier('tfc:frog') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([1, 2], ['tfc:food/frog_legs']) + + event.addEntityLootModifier('tfc:gazelle') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([2, 4], ['tfc:food/venison']) + + event.addEntityLootModifier('tfc:goat') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([4, 6], ['tfc:food/chevon']) + + event.addEntityLootModifier('tfc:grouse') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([1, 2], ['tfc:food/grouse']) + + event.addEntityLootModifier('tfc:horse') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([7, 10], ['tfc:food/horse_meat']) + + event.addEntityLootModifier('tfc:moose') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([5, 10], ['tfc:food/venison']) + + event.addEntityLootModifier('tfc:mule') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([7, 10], ['tfc:food/horse_meat']) + + event.addEntityLootModifier('tfc:musk_ox') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([7, 10], ['tfc:food/mutton']) + + event.addEntityLootModifier('tfc:peafowl') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([1, 2], ['tfc:food/peafowl']) + + event.addEntityLootModifier('tfc:pheasant') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([1, 2], ['tfc:food/pheasant']) + + event.addEntityLootModifier('tfc:pig') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([5, 7], ['tfc:food/pork']) + + event.addEntityLootModifier('tfc:quail') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([1, 3], ['tfc:food/quail']) + + event.addEntityLootModifier('tfc:rabbit') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addLoot('tfc:food/rabbit') + + event.addEntityLootModifier('tfc:sheep') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([6, 9], ['tfc:food/mutton']) + + event.addEntityLootModifier('tfc:turkey') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([1, 2], ['tfc:food/turkey']) + + event.addEntityLootModifier('tfc:turtle') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addLoot('tfc:food/turtle') + + event.addEntityLootModifier('tfc:wildebeest') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([4, 7], ['tfc:food/beef']) + + event.addEntityLootModifier('tfc:yak') + .randomChanceWithEnchantment('minecraft:looting', [0, 0.3, 0.6, 1]) + .addWeightedLoot([7, 10], ['tfc:food/chevon']) + + + // Blocks event.addBlockLootModifier('minecraft:ice') .removeLoot(ItemFilter.ALWAYS_TRUE) @@ -66,11 +263,11 @@ function registerTFCLoots(event) event.addBlockLootModifier('minecraft:packed_ice') .not(n => n.matchMainHand("#forge:tools/saws")) - .addWeightedLoot([4,6], ['firmalife:ice_shavings']) + .addWeightedLoot([4, 6], ['firmalife:ice_shavings']) event.addBlockLootModifier('minecraft:blue_ice') .not(n => n.matchMainHand("#forge:tools/saws")) - .addWeightedLoot([8,12], ['firmalife:ice_shavings']) + .addWeightedLoot([8, 12], ['firmalife:ice_shavings']) event.addBlockLootModifier('tfc:sea_ice') .removeLoot(ItemFilter.ALWAYS_TRUE) diff --git a/kubejs/server_scripts/tfctextile/recipes.js b/kubejs/server_scripts/tfctextile/recipes.js new file mode 100644 index 000000000..f3a63a123 --- /dev/null +++ b/kubejs/server_scripts/tfctextile/recipes.js @@ -0,0 +1,7 @@ +// priority: 0 + +function registerTFCTextileRecipes(event) { + + event.shapeless('tfc:large_raw_hide', ['tfc_textile:crocodile_leather', '#forge:tools/knives']) + +} \ No newline at end of file From 8f0a6613a3e8aacd54a25541a86d59fa22b947ee Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 21:17:42 +0100 Subject: [PATCH 18/53] updated changelog --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6226ff56f..058b624f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,16 @@ ## [Unreleased] ### Changes +- Changed to a different mod to claim/forceload chunks - use Ctrl+M to open the interface. @Xikaro +- Fixed a bug where sometimes, materials would fail to load and a lot of recipes would break. (#1028) @Pyritie +- Changes to entity loot tables, so now butchery knife gives more meat drops but nothing else. (#1035) @Pyritie - Remove various overlapping recipe conflicts. @Oosyrag +- Improved crafting of GregTech credits, if servers want to use them as currency. (#944) @Pyritie +- Fixed some missing behaviours with damascus steel tools from bastion chests. (#1010) @Pyritie +- Increased the frequency of some overworld structures. @Pyritie +- Decreased the frequency of caves/canyons so the world looks less 'scarred'. @Pyritie +- Added mixer recipe for Sugar Water. @Pyritie +- More quest tweaks and fixes. ## [0.9.7] - 17.05.2025 ### Changes From 6bf4a74479ebf1191ac0a3837f6de034b8169b45 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 21:31:42 +0100 Subject: [PATCH 19/53] removed the last few ways of getting perma lights pre-LV --- .../blocks/brown_mushroom_block.json | 20 +++++++++++ .../blocks/red_mushroom_block.json | 20 +++++++++++ .../loot_tables/blocks/shroomlight.json | 35 +++++++++++++++++++ .../loot_tables/chests/bastion_bridge.json | 8 ++--- .../chests/bastion_hoglin_stable.json | 8 ++--- .../loot_tables/chests/bastion_other.json | 8 ++--- kubejs/server_scripts/minecraft/recipes.js | 22 ++++++++++++ kubejs/server_scripts/minecraft/tags.js | 3 ++ 8 files changed, 112 insertions(+), 12 deletions(-) create mode 100644 kubejs/data/minecraft/loot_tables/blocks/brown_mushroom_block.json create mode 100644 kubejs/data/minecraft/loot_tables/blocks/red_mushroom_block.json create mode 100644 kubejs/data/minecraft/loot_tables/blocks/shroomlight.json diff --git a/kubejs/data/minecraft/loot_tables/blocks/brown_mushroom_block.json b/kubejs/data/minecraft/loot_tables/blocks/brown_mushroom_block.json new file mode 100644 index 000000000..08eeb81be --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/blocks/brown_mushroom_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:brown_mushroom_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/minecraft/loot_tables/blocks/red_mushroom_block.json b/kubejs/data/minecraft/loot_tables/blocks/red_mushroom_block.json new file mode 100644 index 000000000..9b2379355 --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/blocks/red_mushroom_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:red_mushroom_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/minecraft/loot_tables/blocks/shroomlight.json b/kubejs/data/minecraft/loot_tables/blocks/shroomlight.json new file mode 100644 index 000000000..8df9d37a0 --- /dev/null +++ b/kubejs/data/minecraft/loot_tables/blocks/shroomlight.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:glowstone_dust" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:brown_mushroom_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json b/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json index 05b645dd1..d61eacbd3 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_bridge.json @@ -827,13 +827,13 @@ }, { "type": "minecraft:item", - "name": "minecraft:shroomlight", + "name": "minecraft:phantom_membrane", "functions": [ { "function": "minecraft:set_count", "count": { - "min": 3, - "max": 6, + "min": 1, + "max": 3, "type": "minecraft:uniform" } } @@ -842,7 +842,7 @@ }, { "type": "minecraft:item", - "name": "minecraft:glowstone", + "name": "minecraft:glowstone_dust", "functions": [ { "function": "minecraft:set_count", diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json b/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json index 05b645dd1..d61eacbd3 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_hoglin_stable.json @@ -827,13 +827,13 @@ }, { "type": "minecraft:item", - "name": "minecraft:shroomlight", + "name": "minecraft:phantom_membrane", "functions": [ { "function": "minecraft:set_count", "count": { - "min": 3, - "max": 6, + "min": 1, + "max": 3, "type": "minecraft:uniform" } } @@ -842,7 +842,7 @@ }, { "type": "minecraft:item", - "name": "minecraft:glowstone", + "name": "minecraft:glowstone_dust", "functions": [ { "function": "minecraft:set_count", diff --git a/kubejs/data/minecraft/loot_tables/chests/bastion_other.json b/kubejs/data/minecraft/loot_tables/chests/bastion_other.json index 05b645dd1..d61eacbd3 100644 --- a/kubejs/data/minecraft/loot_tables/chests/bastion_other.json +++ b/kubejs/data/minecraft/loot_tables/chests/bastion_other.json @@ -827,13 +827,13 @@ }, { "type": "minecraft:item", - "name": "minecraft:shroomlight", + "name": "minecraft:phantom_membrane", "functions": [ { "function": "minecraft:set_count", "count": { - "min": 3, - "max": 6, + "min": 1, + "max": 3, "type": "minecraft:uniform" } } @@ -842,7 +842,7 @@ }, { "type": "minecraft:item", - "name": "minecraft:glowstone", + "name": "minecraft:glowstone_dust", "functions": [ { "function": "minecraft:set_count", diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 0fa318848..f4d96fd6b 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -986,4 +986,26 @@ const registerMinecraftRecipes = (event) => { event.shapeless('4x minecraft:clay_ball', ['minecraft:clay']) .id('tfg:shapeless/clay_block_to_balls') + + // Mushrooms + + event.shapeless('4x minecraft:red_mushroom', ['minecraft:red_mushroom_block', '#forge:tools/knives']) + .id('tfg:shapeless/cut_red_mushroom_block') + + event.shapeless('4x minecraft:brown_mushroom', ['minecraft:brown_mushroom_block', '#forge:tools/knives']) + .id('tfg:shapeless/cut_brown_mushroom_block') + + event.recipes.gtceu.chemical_bath('tfg:red_mushroom_to_shroomlight') + .itemInputs('minecraft:red_mushroom_block') + .inputFluids(Fluid.of('gtceu:glowstone', 144)) + .itemOutputs('minecraft:shroomlight') + .duration(200) + .EUt(GTValues.VA[GTValues.ULV]) + + event.recipes.gtceu.chemical_bath('tfg:brown_mushroom_to_shroomlight') + .itemInputs('minecraft:brown_mushroom_block') + .inputFluids(Fluid.of('gtceu:glowstone', 144)) + .itemOutputs('minecraft:shroomlight') + .duration(200) + .EUt(GTValues.VA[GTValues.ULV]) } diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js index 46d1c06e9..1f227b270 100644 --- a/kubejs/server_scripts/minecraft/tags.js +++ b/kubejs/server_scripts/minecraft/tags.js @@ -57,6 +57,9 @@ const registerMinecraftItemTags = (event) => { event.remove('forge:gems', 'minecraft:charcoal') event.remove('forge:gems', 'minecraft:coal') event.remove('minecraft:dirt', 'minecraft:moss_block') + + event.add('tfc:compost_greens_high', 'minecraft:red_mushroom_block') + event.add('tfc:compost_greens_high', 'minecraft:brown_mushroom_block') } const registerMinecraftBlockTags = (event) => { From c1f3883f9b4d5ce70da9f2381a04d47a47ef4811 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 21:32:17 +0100 Subject: [PATCH 20/53] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 058b624f5..469fd7088 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Increased the frequency of some overworld structures. @Pyritie - Decreased the frequency of caves/canyons so the world looks less 'scarred'. @Pyritie - Added mixer recipe for Sugar Water. @Pyritie +- Shroomlights are no longer easily obtainable for permanent lighting pre-LV. @Pyritie - More quest tweaks and fixes. ## [0.9.7] - 17.05.2025 From 5bf1d24f1f04ffe50ccb36b302da605c0b0d4ef1 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 21:40:46 +0100 Subject: [PATCH 21/53] removed raw ore block recipes --- kubejs/server_scripts/gregtech/recipes.materials.js | 4 ++++ kubejs/startup_scripts/minecraft/constants.js | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/kubejs/server_scripts/gregtech/recipes.materials.js b/kubejs/server_scripts/gregtech/recipes.materials.js index 9e747fa03..21b58f96e 100644 --- a/kubejs/server_scripts/gregtech/recipes.materials.js +++ b/kubejs/server_scripts/gregtech/recipes.materials.js @@ -401,6 +401,10 @@ function registerGTCEUMetalRecipes(event) { if (!material.hasProperty(PropertyKey.BLAST)) { event.smelting(ingotItem, normalOreItem).id(`gtceu:smelting/smelt_raw_${material.getName()}_ore_to_ingot`) } + + // Remove ore block recipes + event.remove({ id: `gtceu:compressor/compress_${material.getName()}_to_raw_ore_block` }) + event.remove({ id: `gtceu:forge_hammer/decompress_${material.getName()}_to_raw_ore` }) } const processRichRawOre = (material) => { diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index d7f07dfed..ce8873bfc 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -768,6 +768,10 @@ global.MINECRAFT_HIDED_ITEMS = [ 'minecraft:oxidized_cut_copper', 'minecraft:oxidized_cut_copper_stairs', 'minecraft:oxidized_cut_copper_slab',*/ + + "minecraft:raw_iron_block", + "minecraft:raw_copper_block", + "minecraft:raw_gold_block" ]; global.VANILLA_WOOD_TYPES = [ From be0f6ab2964c3cd440e9f5aca6915c3165cc041f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 21:49:06 +0100 Subject: [PATCH 22/53] fixed being able to get infinite lights through domum --- kubejs/server_scripts/domum_ornamentum/tags.js | 1 - 1 file changed, 1 deletion(-) diff --git a/kubejs/server_scripts/domum_ornamentum/tags.js b/kubejs/server_scripts/domum_ornamentum/tags.js index 15988fbd6..1d2b16674 100644 --- a/kubejs/server_scripts/domum_ornamentum/tags.js +++ b/kubejs/server_scripts/domum_ornamentum/tags.js @@ -164,7 +164,6 @@ const registerDomumOrnamentumBlockTags = (event) => { event.add('domum_ornamentum:timber_frames_center', `${material}`) event.add('domum_ornamentum:timber_frames_frame', `${material}`) event.add('domum_ornamentum:trapdoors_materials', `${material}`) - event.add('domum_ornamentum:framed_light_center', `${material}`) }); // Gregtech storage blocks don't work here From 11b52b9ec34b677bf6fbe099c52da5487de34be7 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 21:51:27 +0100 Subject: [PATCH 23/53] made pressure plates cheaper --- kubejs/server_scripts/tfc/recipes.stone.js | 9 ++++----- kubejs/server_scripts/tfc/recipes.wood.js | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/kubejs/server_scripts/tfc/recipes.stone.js b/kubejs/server_scripts/tfc/recipes.stone.js index 8165b868f..ed0eeb15f 100644 --- a/kubejs/server_scripts/tfc/recipes.stone.js +++ b/kubejs/server_scripts/tfc/recipes.stone.js @@ -33,19 +33,18 @@ function registerTFCStoneRecipes(event) { // ? -> Сырая нажимная пластина event.shaped(`tfc:rock/pressure_plate/${stone}`, [ - 'ABA', + ' B ', 'CDC', - 'AEA' + ' E ' ], { - A: '#forge:screws/wrought_iron', B: '#tfc:hammers', C: `tfc:rock/raw/${stone}_slab`, - D: '#forge:springs', + D: '#forge:small_springs', E: '#forge:tools/screwdrivers' }).id(`tfc:crafting/rock/${stone}_pressure_plate`) event.recipes.gtceu.assembler(`${stone}_raw_pressure_plate`) - .itemInputs('#forge:springs', `2x tfc:rock/raw/${stone}_slab`) + .itemInputs('#forge:small_springs', `2x tfc:rock/raw/${stone}_slab`) .circuit(0) .itemOutputs(`2x tfc:rock/pressure_plate/${stone}`) .duration(50) diff --git a/kubejs/server_scripts/tfc/recipes.wood.js b/kubejs/server_scripts/tfc/recipes.wood.js index ce7f3296f..f703fff0a 100644 --- a/kubejs/server_scripts/tfc/recipes.wood.js +++ b/kubejs/server_scripts/tfc/recipes.wood.js @@ -26,19 +26,18 @@ function registerTFCWoodRecipes(event) { // ? -> Деревянная нажимная пластина event.shaped(`tfc:wood/planks/${wood}_pressure_plate`, [ - 'ABA', + ' B ', 'CDC', - 'AEA' + ' E ' ], { - A: '#forge:screws/wood', B: '#tfc:hammers', C: `tfc:wood/planks/${wood}_slab`, - D: '#forge:springs', + D: '#forge:small_springs', E: '#forge:tools/screwdrivers' }).id(`tfc:crafting/wood/${wood}_pressure_plate`) event.recipes.gtceu.assembler(`${wood}_pressure_plate`) - .itemInputs('#forge:springs', `2x tfc:wood/planks/${wood}_slab`) + .itemInputs('#forge:small_springs', `2x tfc:wood/planks/${wood}_slab`) .circuit(0) .itemOutputs(`2x tfc:wood/planks/${wood}_pressure_plate`) .duration(50) From 54e9155f49fa718bc217835b526e4e7c83b9a438 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 21:59:07 +0100 Subject: [PATCH 24/53] fixed framed pressure plates --- CHANGELOG.md | 1 + .../server_scripts/framed_blocks/recipes.js | 38 ++++++++++++++++--- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 469fd7088..755aad47f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Decreased the frequency of caves/canyons so the world looks less 'scarred'. @Pyritie - Added mixer recipe for Sugar Water. @Pyritie - Shroomlights are no longer easily obtainable for permanent lighting pre-LV. @Pyritie +- Made pressure plates cheaper. @Pyritie - More quest tweaks and fixes. ## [0.9.7] - 17.05.2025 diff --git a/kubejs/server_scripts/framed_blocks/recipes.js b/kubejs/server_scripts/framed_blocks/recipes.js index 86a2674bf..f11150e34 100644 --- a/kubejs/server_scripts/framed_blocks/recipes.js +++ b/kubejs/server_scripts/framed_blocks/recipes.js @@ -59,7 +59,7 @@ const registerFramedBlocksRecipes = (event) => { event.shapeless( Item.of('framedblocks:framed_pressure_plate', 1), [ - '#minecraft:pressure_plates', + '#minecraft:wooden_pressure_plates', 'framedblocks:framed_cube', ] ).id('framedblocks:framed_pressure_plate') @@ -70,17 +70,43 @@ const registerFramedBlocksRecipes = (event) => { { "count": 1, "ingredient": { - tag: "minecraft:pressure_plates" + tag: "minecraft:wooden_pressure_plates" } } ], - material: 1536, + material: 6144, result: { item: "framedblocks:framed_pressure_plate" } }).id('framedblocks:framing_saw/framed_pressure_plate') //#endregion + //#region Framed Pressure Plate + event.shapeless( + Item.of('framedblocks:framed_stone_pressure_plate', 1), + [ + '#minecraft:stone_pressure_plates', + 'framedblocks:framed_cube', + ] + ).id('framedblocks:framed_stone_pressure_plate') + + event.custom({ + type: "framedblocks:frame", + additives: [ + { + "count": 1, + "ingredient": { + tag: "minecraft:stone_pressure_plates" + } + } + ], + material: 6144, + result: { + item: "framedblocks:framed_stone_pressure_plate" + } + }).id('framedblocks:framing_saw/framed_stone_pressure_plate') + //#endregion + //#region Framed Gold Pressure Plate event.shaped('framedblocks:framed_gold_pressure_plate', [ 'AA', @@ -100,7 +126,7 @@ const registerFramedBlocksRecipes = (event) => { } } ], - material: 1536, + material: 6144, result: { item: "framedblocks:framed_gold_pressure_plate" } @@ -112,7 +138,7 @@ const registerFramedBlocksRecipes = (event) => { 'AA', 'BB' ], { - A: '#forge:plates/wrought_iron', + A: '#forge:plates/iron', B: 'framedblocks:framed_cube' }).id('framedblocks:framed_iron_pressure_plate') @@ -126,7 +152,7 @@ const registerFramedBlocksRecipes = (event) => { } } ], - material: 1536, + material: 6144, result: { item: "framedblocks:framed_iron_pressure_plate" } From 0e6b6d599852fb5b51e0ec64ce0a44beb3acb65a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 22:06:29 +0100 Subject: [PATCH 25/53] added chisel recipes for stone walls --- kubejs/server_scripts/tfc/recipes.stone.js | 8 ++++++++ kubejs/server_scripts/tfg/recipes.rocks.js | 5 +---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/kubejs/server_scripts/tfc/recipes.stone.js b/kubejs/server_scripts/tfc/recipes.stone.js index ed0eeb15f..0fd415b9d 100644 --- a/kubejs/server_scripts/tfc/recipes.stone.js +++ b/kubejs/server_scripts/tfc/recipes.stone.js @@ -467,6 +467,14 @@ function registerTFCStoneRecipes(event) { //#region Стена + event.recipes.tfc.chisel(`tfc:rock/raw/${stone}_wall`, `tfc:rock/raw/${stone}_slab`, 'smooth') + event.recipes.tfc.chisel(`tfc:rock/cobble/${stone}_wall`, `tfc:rock/cobble/${stone}_slab`, 'smooth') + event.recipes.tfc.chisel(`tfc:rock/smooth/${stone}_wall`, `tfc:rock/smooth/${stone}_slab`, 'smooth') + event.recipes.tfc.chisel(`tfc:rock/bricks/${stone}_wall`, `tfc:rock/bricks/${stone}_slab`, 'smooth') + event.recipes.tfc.chisel(`tfc:rock/cracked_bricks/${stone}_wall`, `tfc:rock/cracked_bricks/${stone}_slab`, 'smooth') + event.recipes.tfc.chisel(`tfc:rock/mossy_cobble/${stone}_wall`, `tfc:rock/mossy_cobble/${stone}_slab`, 'smooth') + event.recipes.tfc.chisel(`tfc:rock/mossy_bricks/${stone}_wall`, `tfc:rock/mossy_bricks/${stone}_slab`, 'smooth') + // Сырой event.recipes.gtceu.macerator(`raw_wall_${stone}_to_dust`) .itemInputs(`tfc:rock/raw/${stone}_wall`) diff --git a/kubejs/server_scripts/tfg/recipes.rocks.js b/kubejs/server_scripts/tfg/recipes.rocks.js index ad1920c2b..d8fce61c8 100644 --- a/kubejs/server_scripts/tfg/recipes.rocks.js +++ b/kubejs/server_scripts/tfg/recipes.rocks.js @@ -179,7 +179,6 @@ function registerTFGRockRecipes(event) { CUTTER.forEach(x => { if ("stair" in x) { event.recipes.tfc.chisel(x.stair, x.raw, 'stair') - //event.stonecutting(x.stair, x.raw).id(`${x.raw}_to_${x.stair}`.replace(/:/g, '_')) event.recipes.gtceu.macerator(`macerate_${x.stair}`.replace(/:/g, '_')) .itemInputs(x.stair) @@ -194,7 +193,6 @@ function registerTFGRockRecipes(event) { } if ("slab" in x) { event.recipes.tfc.chisel(x.slab, x.raw, 'slab').extraDrop(x.slab) - //event.stonecutting(`2x ${x.slab}`, x.raw).id(`${x.raw}_to_${x.slab}`.replace(/:/g, '_')) event.recipes.gtceu.macerator(`macerate_${x.slab}`.replace(/:/g, '_')) .itemInputs(`2x ${x.slab}`) @@ -208,8 +206,7 @@ function registerTFGRockRecipes(event) { } } if ("wall" in x) { - event.recipes.tfc.chisel(x.slab, x.raw, 'smooth') - //event.stonecutting(x.wall, x.raw).id(`${x.raw}_to_${x.wall}`.replace(/:/g, '_')) + event.recipes.tfc.chisel(x.wall, x.slab, 'smooth') event.recipes.gtceu.macerator(`macerate_${x.wall}`.replace(/:/g, '_')) .itemInputs(x.wall) From 0c23be893a33d641d211479d75fa619d44c48c42 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 22:06:56 +0100 Subject: [PATCH 26/53] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 755aad47f..6df94b6dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ - Added mixer recipe for Sugar Water. @Pyritie - Shroomlights are no longer easily obtainable for permanent lighting pre-LV. @Pyritie - Made pressure plates cheaper. @Pyritie +- Added chisel recipes for stone walls. @Pyritie - More quest tweaks and fixes. ## [0.9.7] - 17.05.2025 From 027039d44aaa449d5e4b557a296ba5b68c53d4d2 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 22:07:56 +0100 Subject: [PATCH 27/53] electric greenhouse now uses way less electricity --- kubejs/server_scripts/gregtech/utility.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/server_scripts/gregtech/utility.js b/kubejs/server_scripts/gregtech/utility.js index b34746d18..b8a66896e 100644 --- a/kubejs/server_scripts/gregtech/utility.js +++ b/kubejs/server_scripts/gregtech/utility.js @@ -34,7 +34,7 @@ const generateGreenHouseRecipe = (event, input, fluid_amount, output, id) => { .chancedOutput(input, 7500, 0) .chancedOutput(input, 5000, 0) .duration(36000) // 30 mins - .EUt(72) + .EUt(GTValues.VA[GTValues.LV]) // С удобрением event.recipes.gtceu.greenhouse(`${id}_fertilized`) @@ -46,7 +46,7 @@ const generateGreenHouseRecipe = (event, input, fluid_amount, output, id) => { .chancedOutput(input, 8500, 0) .chancedOutput(input, 6000, 0) .duration(12000) // 10 mins - .EUt(196) + .EUt(GTValues.VA[GTValues.LV]) } const getFillingNBT = (material, amount) => { From e4b169546dee2b3fbca1a8569aab4080f8f20cff Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 22:08:22 +0100 Subject: [PATCH 28/53] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6df94b6dc..49701d298 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Shroomlights are no longer easily obtainable for permanent lighting pre-LV. @Pyritie - Made pressure plates cheaper. @Pyritie - Added chisel recipes for stone walls. @Pyritie +- Reduced electricity cost of electric greenhouse. @Pyritie - More quest tweaks and fixes. ## [0.9.7] - 17.05.2025 From 43baa760fa5a0bb6aa9c8a90d539de9ad33402df Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 22:42:39 +0100 Subject: [PATCH 29/53] smelting recipes for chocolate --- kubejs/server_scripts/firmalife/recipes.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index ca07ea4ca..d044f8479 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -563,6 +563,8 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) + event.smelting('firmalife:food/white_chocolate', 'firmalife:food/white_chocolate_blend') + // Dark Chocolate Blend event.recipes.gtceu.mixer('firmalife:food/dark_chocolate_blend/milk') .itemInputs('2x firmalife:food/cocoa_powder', '#tfc:sweetener') @@ -593,6 +595,8 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) + event.smelting('firmalife:food/dark_chocolate', 'firmalife:food/dark_chocolate_blend') + // Milk Chocolate Blend event.recipes.gtceu.mixer('firmalife:food/milk_chocolate_blend/milk') .itemInputs('firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener') @@ -622,6 +626,8 @@ const registerFirmaLifeRecipes = (event) => { .duration(300) .EUt(16) + event.smelting('firmalife:food/milk_chocolate', 'firmalife:food/milk_chocolate_blend') + // Strawberry Ice Cream event.recipes.gtceu.mixer('firmalife:food/strawberry_ice_cream') .itemInputs('firmalife:food/vanilla_ice_cream', '2x tfc:food/strawberry') From c6d30fb0f8178973fd63c93a63f3357fbab36d51 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 18 May 2025 22:42:48 +0100 Subject: [PATCH 30/53] removed small black steel gear --- kubejs/startup_scripts/gtceu/materials.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/startup_scripts/gtceu/materials.js b/kubejs/startup_scripts/gtceu/materials.js index c715c17de..f284c6764 100644 --- a/kubejs/startup_scripts/gtceu/materials.js +++ b/kubejs/startup_scripts/gtceu/materials.js @@ -192,7 +192,7 @@ const registerGTCEuMaterialModification = (event) => { GTMaterials.BismuthBronze.addFlags(GENERATE_SMALL_GEAR); GTMaterials.Nickel.addFlags(GENERATE_ROD, GENERATE_LONG_ROD); - GTMaterials.BlackSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW, GENERATE_SMALL_GEAR); + GTMaterials.BlackSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW); GTMaterials.BlueSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW); GTMaterials.RedSteel.addFlags(GENERATE_LONG_ROD, GENERATE_BOLT_SCREW); GTMaterials.WroughtIron.addFlags(GENERATE_ROTOR, GENERATE_SPRING, GENERATE_SMALL_GEAR); From 0cd0489998b2fdd1c1b40f2e08dd1c2215747e0c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 19 May 2025 00:23:30 +0100 Subject: [PATCH 31/53] added vacuumizer recipe for dandelions/goldenrod --- CHANGELOG.md | 1 + kubejs/server_scripts/afc/recipes.js | 12 ++++++------ .../server_scripts/vintage_improvements/recipes.js | 10 ++++++++++ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49701d298..bc6a072c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - Made pressure plates cheaper. @Pyritie - Added chisel recipes for stone walls. @Pyritie - Reduced electricity cost of electric greenhouse. @Pyritie +- Added vacuumizer recipe for dandelions and goldenrod to latex. @Pyritie - More quest tweaks and fixes. ## [0.9.7] - 17.05.2025 diff --git a/kubejs/server_scripts/afc/recipes.js b/kubejs/server_scripts/afc/recipes.js index e245678e2..eb06007a6 100644 --- a/kubejs/server_scripts/afc/recipes.js +++ b/kubejs/server_scripts/afc/recipes.js @@ -170,20 +170,20 @@ const registerAFCRecipes = (event) => { event.recipes.gtceu.extractor('latex_from_log') - .itemInputs('4x #tfg:latex_logs') - .outputFluids(Fluid.of('tfg:latex', 1000)) + .itemInputs('#tfg:latex_logs') + .outputFluids(Fluid.of('tfg:latex', 250)) .duration(600) .EUt(20) event.recipes.gtceu.extractor('latex_from_sapling') - .itemInputs('10x #tfg:rubber_saplings') - .outputFluids(Fluid.of('tfg:latex', 1000)) + .itemInputs('#tfg:rubber_saplings') + .outputFluids(Fluid.of('tfg:latex', 100)) .duration(750) .EUt(20) event.recipes.gtceu.extractor('latex_from_leaves') - .itemInputs('20x #tfg:rubber_leaves') - .outputFluids(Fluid.of('tfg:latex', 1000)) + .itemInputs('#tfg:rubber_leaves') + .outputFluids(Fluid.of('tfg:latex', 50)) .duration(750) .EUt(20) diff --git a/kubejs/server_scripts/vintage_improvements/recipes.js b/kubejs/server_scripts/vintage_improvements/recipes.js index 787e5b3e9..e20c36827 100644 --- a/kubejs/server_scripts/vintage_improvements/recipes.js +++ b/kubejs/server_scripts/vintage_improvements/recipes.js @@ -577,12 +577,14 @@ function registerVintageImprovementsRecipes(event) { results: [{ fluid: 'tfg:latex', amount: 250 }], processingTime: 600 }).id('tfg:vi/vacuumizing/latex_from_rubber_logs') + event.custom({ type: 'vintageimprovements:vacuumizing', ingredients: [{ tag: 'tfg:rubber_saplings' }], results: [{ fluid: 'tfg:latex', amount: 100 }], processingTime: 300 }).id('tfg:vi/vacuumizing/latex_from_rubber_sapling') + event.custom({ type: 'vintageimprovements:vacuumizing', ingredients: [{ tag: 'tfg:rubber_leaves' }], @@ -590,6 +592,14 @@ function registerVintageImprovementsRecipes(event) { processingTime: 150 }).id('tfg:vi/vacuumizing/latex_from_rubber_leaves') + event.custom({ + type: 'vintageimprovements:vacuumizing', + ingredients: [{ tag: 'tfg:rubber_plants' }, { item: 'tfc:powder/soda_ash' }, { fluid: 'tfc:salt_water', amount: 50 }], + results: [{ fluid: 'tfg:latex', amount: 50 }], + heatRequirement: "heated", + processingTime: 40 + }).id('tfg:vi/vacuumizing/latex_from_rubber_plants') + // Vulc. latex to raw rubber pulp event.custom({ type: 'vintageimprovements:vacuumizing', From 7cd9cde0b7adf11594fa9c44d225e573b1084859 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 19 May 2025 00:35:14 +0100 Subject: [PATCH 32/53] added circuit to the two different salt waters in the mixer --- CHANGELOG.md | 1 + kubejs/server_scripts/gregtech/recipes.js | 4 ++++ kubejs/server_scripts/tfc/recipes.js | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc6a072c6..c8ea750db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Added chisel recipes for stone walls. @Pyritie - Reduced electricity cost of electric greenhouse. @Pyritie - Added vacuumizer recipe for dandelions and goldenrod to latex. @Pyritie +- Added circuit numbers for the different mixer salt water recipes. @Pyritie - More quest tweaks and fixes. ## [0.9.7] - 17.05.2025 diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index d65f9ae49..20c679511 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -99,6 +99,10 @@ const registerGTCEURecipes = (event) => { .duration(720) .EUt(30) + // Add circuit to gregtech salt water mixer recipe + event.remove({ id: 'gtceu:mixer/salt_water' }) + generateMixerRecipe(event, ['2x #forge:dusts/salt'], Fluid.of('minecraft:water', 1000), [], 1, Fluid.of('gtceu:salt_water', 1000), 40, 7, 64, 'tfg:gtceu/salt_water') + //#endregion //#region Выход: Каменный стержень diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 123b5d7ef..f37e3832f 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -201,7 +201,7 @@ const registerTFCRecipes = (event) => { .id('tfg:tfc/pot/salt') // Salt Water - generateMixerRecipe(event, ['#forge:dusts/salt'], Fluid.of('minecraft:water', 1000), [], null, Fluid.of('tfc:salt_water', 1000), 40, 7, 64, 'tfg:tfc/salt_water') + generateMixerRecipe(event, ['#forge:dusts/salt'], Fluid.of('minecraft:water', 1000), [], 2, Fluid.of('tfc:salt_water', 1000), 40, 7, 64, 'tfg:tfc/salt_water') // Seaweed and kelp From d4365450a3b92357665760e24bc88ba1566fadb0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 19 May 2025 01:24:24 +0100 Subject: [PATCH 33/53] wtf is a dimension tier --- config/gtceu.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/gtceu.yaml b/config/gtceu.yaml index c69e998c1..95ddfbfbf 100644 --- a/config/gtceu.yaml +++ b/config/gtceu.yaml @@ -593,7 +593,7 @@ compat: # Whether dimension markers should show the dimension tier value. # Default: false - showDimensionTier: true + showDimensionTier: false dev: # Debug general events? (will print recipe conficts etc. to server's debug.log) From ef60dfa8d6b4c6681b25ab2207b75ca347032275 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 19 May 2025 01:32:02 +0100 Subject: [PATCH 34/53] moving the multiblock/ore diagram EMI tabs to the front --- config/jei/recipe-category-sort-order.ini | 146 +++++++++++------- .../properties/ae2_item_transformation.json | 2 +- .../category/properties/create_deploying.json | 2 +- .../properties/create_item_application.json | 2 +- .../create_mechanical_crafting.json | 2 +- .../properties/create_sequenced_assembly.json | 2 +- .../properties/createaddition_rolling.json | 2 +- .../properties/firmalife_bowl_pot.json | 2 +- .../category/properties/firmalife_drying.json | 2 +- .../properties/firmalife_mixing_bowl.json | 2 +- .../category/properties/firmalife_oven.json | 2 +- .../properties/firmalife_smoking.json | 2 +- .../properties/firmalife_stomping.json | 2 +- .../category/properties/firmalife_vat.json | 2 +- .../category/properties/greate_crushing.json | 2 +- .../properties/greate_fan_washing.json | 2 +- .../category/properties/greate_milling.json | 2 +- .../category/properties/greate_mixing.json | 2 +- .../category/properties/greate_sawing.json | 2 +- .../properties/gtceu_air_scrubber.json | 2 +- .../properties/gtceu_alloy_blast_smelter.json | 2 +- .../properties/gtceu_alloy_smelter.json | 2 +- .../properties/gtceu_arc_furnace.json | 2 +- .../category/properties/gtceu_assembler.json | 2 +- .../properties/gtceu_assembly_line.json | 2 +- .../category/properties/gtceu_autoclave.json | 2 +- .../gtceu_bedrock_fluid_diagram.json | 2 +- .../emi/category/properties/gtceu_bender.json | 2 +- .../category/properties/gtceu_brewery.json | 2 +- .../emi/category/properties/gtceu_canner.json | 2 +- .../category/properties/gtceu_centrifuge.json | 2 +- .../properties/gtceu_chemical_bath.json | 2 +- .../properties/gtceu_chemical_reactor.json | 2 +- .../properties/gtceu_circuit_assembler.json | 2 +- .../category/properties/gtceu_coke_oven.json | 2 +- .../gtceu_combustion_generator.json | 2 +- .../category/properties/gtceu_compressor.json | 2 +- .../category/properties/gtceu_cracker.json | 2 +- .../emi/category/properties/gtceu_cutter.json | 2 +- .../properties/gtceu_distillation_tower.json | 2 +- .../category/properties/gtceu_distillery.json | 2 +- .../gtceu_electric_blast_furnace.json | 2 +- .../properties/gtceu_electrolyzer.json | 2 +- .../gtceu_electromagnetic_separator.json | 2 +- .../category/properties/gtceu_end_dome.json | 2 +- .../properties/gtceu_evaporation.json | 2 +- .../category/properties/gtceu_extractor.json | 2 +- .../category/properties/gtceu_extruder.json | 2 +- .../category/properties/gtceu_fermenter.json | 2 +- .../properties/gtceu_fluid_heater.json | 2 +- .../properties/gtceu_fluid_solidifier.json | 2 +- .../properties/gtceu_forge_hammer.json | 2 +- .../properties/gtceu_forming_press.json | 2 +- .../properties/gtceu_fusion_reactor.json | 2 +- .../properties/gtceu_gas_collector.json | 2 +- .../properties/gtceu_gas_turbine.json | 2 +- .../category/properties/gtceu_greenhouse.json | 2 +- .../gtceu_implosion_compressor.json | 2 +- .../properties/gtceu_large_boiler.json | 2 +- .../gtceu_large_chemical_reactor.json | 2 +- .../properties/gtceu_laser_engraver.json | 2 +- .../emi/category/properties/gtceu_lathe.json | 2 +- .../category/properties/gtceu_macerator.json | 2 +- .../emi/category/properties/gtceu_mixer.json | 2 +- .../properties/gtceu_multiblock_info.json | 2 +- .../properties/gtceu_nether_dome.json | 2 +- .../properties/gtceu_ore_bathing.json | 2 +- .../properties/gtceu_ore_crushing.json | 2 +- .../properties/gtceu_ore_forging.json | 2 +- .../gtceu_ore_processing_diagram.json | 2 +- .../category/properties/gtceu_ore_washer.json | 2 +- .../emi/category/properties/gtceu_packer.json | 2 +- .../properties/gtceu_plasma_generator.json | 2 +- .../category/properties/gtceu_polarizer.json | 2 +- .../properties/gtceu_pyrolyse_oven.json | 2 +- .../properties/gtceu_research_station.json | 2 +- .../properties/gtceu_rock_breaker.json | 2 +- .../category/properties/gtceu_scanner.json | 2 +- .../emi/category/properties/gtceu_sifter.json | 2 +- .../properties/gtceu_steam_bloomery.json | 2 +- .../properties/gtceu_steam_boiler.json | 2 +- .../properties/gtceu_steam_turbine.json | 2 +- .../properties/gtceu_thermal_centrifuge.json | 2 +- .../properties/gtceu_vacuum_freezer.json | 2 +- .../properties/gtceu_wire_coating.json | 2 +- .../category/properties/gtceu_wiremill.json | 2 +- .../properties/minecraft_crafting.json | 2 +- .../properties/minecraft_smelting.json | 2 +- .../emi/category/properties/tfc_alloying.json | 2 +- .../emi/category/properties/tfc_anvil.json | 2 +- .../properties/tfc_blast_furnace.json | 2 +- .../emi/category/properties/tfc_bloomery.json | 2 +- .../emi/category/properties/tfc_casting.json | 2 +- .../emi/category/properties/tfc_chisel.json | 2 +- .../properties/tfc_clay_knapping.json | 2 +- .../properties/tfc_fire_clay_knapping.json | 2 +- .../category/properties/tfc_glassworking.json | 2 +- .../properties/tfc_goat_horn_knapping.json | 2 +- .../emi/category/properties/tfc_heating.json | 2 +- .../properties/tfc_instant_barrel.json | 2 +- .../properties/tfc_instant_fluid_barrel.json | 2 +- .../emi/category/properties/tfc_jam_pot.json | 2 +- .../properties/tfc_leather_knapping.json | 2 +- .../emi/category/properties/tfc_loom.json | 2 +- .../properties/tfc_pumpkin_knapping.json | 2 +- .../emi/category/properties/tfc_quern.json | 2 +- .../properties/tfc_raw_hide_knapping.json | 2 +- .../properties/tfc_rock_knapping.json | 2 +- .../emi/category/properties/tfc_scraping.json | 2 +- .../properties/tfc_sealed_barrel.json | 2 +- .../emi/category/properties/tfc_sewing.json | 2 +- .../category/properties/tfc_simple_pot.json | 2 +- .../emi/category/properties/tfc_soup_pot.json | 2 +- .../emi/category/properties/tfc_welding.json | 2 +- .../vintageimprovements_centrifugation.json | 2 +- .../vintageimprovements_coiling.json | 2 +- .../vintageimprovements_curving.json | 2 +- .../vintageimprovements_hammering.json | 2 +- .../vintageimprovements_laser_cutting.json | 2 +- .../vintageimprovements_pressurizing.json | 2 +- .../vintageimprovements_turning.json | 2 +- .../vintageimprovements_vacuumizing.json | 2 +- .../vintageimprovements_vibrating.json | 2 +- 123 files changed, 215 insertions(+), 175 deletions(-) diff --git a/config/jei/recipe-category-sort-order.ini b/config/jei/recipe-category-sort-order.ini index 35ae5848a..fc5e13a66 100644 --- a/config/jei/recipe-category-sort-order.ini +++ b/config/jei/recipe-category-sort-order.ini @@ -1,5 +1,10 @@ +gtceu:multiblock_info +gtceu:ore_processing_diagram +gtceu:bedrock_fluid_diagram + minecraft:crafting create:mechanical_crafting + tfc:rock_knapping tfc:clay_knapping tfc:fire_clay_knapping @@ -7,6 +12,7 @@ tfc:leather_knapping tfc:goat_horn_knapping tfc:pumpkin_knapping tfc:raw_hide_knapping + tfc:heating tfc:quern tfc:casting @@ -19,6 +25,7 @@ tfc:sealed_barrel tfc:bloomery tfc:blast_furnace tfc:alloying + tfc:scraping tfc:loom tfc:glassworking @@ -34,88 +41,121 @@ tfc:jam_pot firmalife:bowl_pot firmalife:vat firmalife:stomping + create:deploying create:item_application create:sequenced_assembly + +gtceu:large_boiler +gtceu:steam_boiler +gtceu:coke_oven + +gtceu:combustion_generator +gtceu:gas_turbine +gtceu:plasma_generator +gtceu:steam_turbine + +minecraft:smelting +gtceu:air_scrubber +gtceu:alloy_smelter +gtceu:arc_furnace +gtceu:assembler +gtceu:autoclave createaddition:rolling vintageimprovements:pressurizing +gtceu:bender +gtceu:brewery +gtceu:canner vintageimprovements:centrifugation +gtceu:centrifuge +gtceu:chemical_bath +gtceu:chemical_reactor +gtceu:large_chemical_reactor +gtceu:circuit_assembler +gtceu:compressor greate:sawing +gtceu:cutter +gtceu:distillery +gtceu:distillation_tower +gtceu:electrolyzer +gtceu:electromagnetic_separator vintageimprovements:vacuumizing +gtceu:extractor vintageimprovements:curving +gtceu:extruder +gtceu:fermenter +gtceu:fluid_heater +gtceu:fluid_solidifier +gtceu:forge_hammer +gtceu:forming_press +gtceu:gas_collector vintageimprovements:laser_cutting +gtceu:laser_engraver vintageimprovements:turning +gtceu:lathe greate:milling greate:crushing +gtceu:macerator greate:mixing +gtceu:mixer +gtceu:packer +gtceu:polarizer +gtceu:rock_breaker +gtceu:scanner vintageimprovements:vibrating +gtceu:sifter +gtceu:thermal_centrifuge vintageimprovements:coiling +gtceu:wiremill + +gtceu:alloy_blast_smelter +gtceu:assembly_line +gtceu:cracker +gtceu:electric_blast_furnace +gtceu:end_dome +gtceu:evaporation +gtceu:fusion_reactor +gtceu:greenhouse +gtceu:implosion_compressor +gtceu:nether_dome +gtceu:pyrolyse_oven +gtceu:research_station +gtceu:steam_bloomery +gtceu:vacuum_freezer +gtceu:wire_coating + ae2:item_transformation +gtceu:ore_washer greate:fan_washing +gtceu:ore_crushing +gtceu:ore_forging +gtceu:ore_bathing + +gtceu:chem_dyes +gtceu:ingot_molding +gtceu:arc_furnace_recycling +gtceu:macerator_recycling +gtceu:extractor_recycling ae2:condenser + greate:packing + minecraft:smithing exposure:photograph_printing + rnr:block_mod rnr:mattock greate:block_cutting +framedblocks:framing_saw domum_ornamentum:architects_cutter + +gtceu:programmed_circuit ae2:attunement ae2:entropy create:draining create:spout_filling exposure:photograph_stacking ftbquests:quest -minecraft:anvil -minecraft:blasting -minecraft:brewing -minecraft:campfire -minecraft:compostable -minecraft:fuel -minecraft:furnace -minecraft:smoking -minecraft:stonecutting -ae2:certus_growth -ae2:charger -ae2:inscriber -create:automatic_brewing -create:automatic_packing -create:automatic_shaped -create:automatic_shapeless -create:block_cutting -create:crushing -create:fan_blasting -create:fan_haunting -create:fan_smoking -create:fan_washing -create:milling -create:mixing -create:mystery_conversion -create:packing -create:pressing -create:sandpaper_polishing -create:sawing -create:wood_cutting -createaddition:charging -createaddition:liquid_burning -expatternprovider:circuit_cutter -firmalife:press -firmalife:stinky_soup -ftbquests:loot_crate -greate:automatic_brewing -greate:automatic_packing -greate:automatic_shapeless -greate:fan_haunting -greate:pressing -greate:wood_cutting -jei:information -jumbofurnace:jumbo_furnace_upgrade -jumbofurnace:jumbo_smelting -morered:soldering -tfc:flint_knapping -vintageimprovements:auto_curving -vintageimprovements:auto_smithing -vintageimprovements:grinder_sandpaper_polishing -vintageimprovements:leaves_vibrating -vintageimprovements:polishing -vintageimprovements:unpacking + +emi:info +emi:tag \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/ae2_item_transformation.json b/kubejs/assets/emi/category/properties/ae2_item_transformation.json index 4e9b3f465..99e1fbbc3 100644 --- a/kubejs/assets/emi/category/properties/ae2_item_transformation.json +++ b/kubejs/assets/emi/category/properties/ae2_item_transformation.json @@ -1 +1 @@ -{"ae2:item_transformation":{"order":115}} \ No newline at end of file +{"ae2:item_transformation":{"order":116}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_deploying.json b/kubejs/assets/emi/category/properties/create_deploying.json index 20831d890..f7de0861a 100644 --- a/kubejs/assets/emi/category/properties/create_deploying.json +++ b/kubejs/assets/emi/category/properties/create_deploying.json @@ -1 +1 @@ -{"create:deploying":{"order":36}} \ No newline at end of file +{"create:deploying":{"order":39}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_item_application.json b/kubejs/assets/emi/category/properties/create_item_application.json index 59372e4c6..758199fac 100644 --- a/kubejs/assets/emi/category/properties/create_item_application.json +++ b/kubejs/assets/emi/category/properties/create_item_application.json @@ -1 +1 @@ -{"create:item_application":{"order":37}} \ No newline at end of file +{"create:item_application":{"order":40}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_mechanical_crafting.json b/kubejs/assets/emi/category/properties/create_mechanical_crafting.json index ce3743f5f..77ae2811e 100644 --- a/kubejs/assets/emi/category/properties/create_mechanical_crafting.json +++ b/kubejs/assets/emi/category/properties/create_mechanical_crafting.json @@ -1 +1 @@ -{"create:mechanical_crafting":{"order":1}} \ No newline at end of file +{"create:mechanical_crafting":{"order":4}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/create_sequenced_assembly.json b/kubejs/assets/emi/category/properties/create_sequenced_assembly.json index c138df577..f650f1b39 100644 --- a/kubejs/assets/emi/category/properties/create_sequenced_assembly.json +++ b/kubejs/assets/emi/category/properties/create_sequenced_assembly.json @@ -1 +1 @@ -{"create:sequenced_assembly":{"order":38}} \ No newline at end of file +{"create:sequenced_assembly":{"order":41}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/createaddition_rolling.json b/kubejs/assets/emi/category/properties/createaddition_rolling.json index 83b6b2d7d..3f4ba3919 100644 --- a/kubejs/assets/emi/category/properties/createaddition_rolling.json +++ b/kubejs/assets/emi/category/properties/createaddition_rolling.json @@ -1 +1 @@ -{"createaddition:rolling":{"order":52}} \ No newline at end of file +{"createaddition:rolling":{"order":55}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_bowl_pot.json b/kubejs/assets/emi/category/properties/firmalife_bowl_pot.json index c944d18b2..a1378ab18 100644 --- a/kubejs/assets/emi/category/properties/firmalife_bowl_pot.json +++ b/kubejs/assets/emi/category/properties/firmalife_bowl_pot.json @@ -1 +1 @@ -{"firmalife:bowl_pot":{"order":33}} \ No newline at end of file +{"firmalife:bowl_pot":{"order":36}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_drying.json b/kubejs/assets/emi/category/properties/firmalife_drying.json index d3590332c..ca265c608 100644 --- a/kubejs/assets/emi/category/properties/firmalife_drying.json +++ b/kubejs/assets/emi/category/properties/firmalife_drying.json @@ -1 +1 @@ -{"firmalife:drying":{"order":26}} \ No newline at end of file +{"firmalife:drying":{"order":29}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_mixing_bowl.json b/kubejs/assets/emi/category/properties/firmalife_mixing_bowl.json index e6ee8ccc6..e2cda9689 100644 --- a/kubejs/assets/emi/category/properties/firmalife_mixing_bowl.json +++ b/kubejs/assets/emi/category/properties/firmalife_mixing_bowl.json @@ -1 +1 @@ -{"firmalife:mixing_bowl":{"order":27}} \ No newline at end of file +{"firmalife:mixing_bowl":{"order":30}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_oven.json b/kubejs/assets/emi/category/properties/firmalife_oven.json index 297cc42c0..16fb93986 100644 --- a/kubejs/assets/emi/category/properties/firmalife_oven.json +++ b/kubejs/assets/emi/category/properties/firmalife_oven.json @@ -1 +1 @@ -{"firmalife:oven":{"order":28}} \ No newline at end of file +{"firmalife:oven":{"order":31}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_smoking.json b/kubejs/assets/emi/category/properties/firmalife_smoking.json index cc057cbc9..5d12b9e8f 100644 --- a/kubejs/assets/emi/category/properties/firmalife_smoking.json +++ b/kubejs/assets/emi/category/properties/firmalife_smoking.json @@ -1 +1 @@ -{"firmalife:smoking":{"order":29}} \ No newline at end of file +{"firmalife:smoking":{"order":32}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_stomping.json b/kubejs/assets/emi/category/properties/firmalife_stomping.json index 9954f2794..ed2a1c059 100644 --- a/kubejs/assets/emi/category/properties/firmalife_stomping.json +++ b/kubejs/assets/emi/category/properties/firmalife_stomping.json @@ -1 +1 @@ -{"firmalife:stomping":{"order":35}} \ No newline at end of file +{"firmalife:stomping":{"order":38}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/firmalife_vat.json b/kubejs/assets/emi/category/properties/firmalife_vat.json index bc04a31db..a9e8f8045 100644 --- a/kubejs/assets/emi/category/properties/firmalife_vat.json +++ b/kubejs/assets/emi/category/properties/firmalife_vat.json @@ -1 +1 @@ -{"firmalife:vat":{"order":34}} \ No newline at end of file +{"firmalife:vat":{"order":37}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_crushing.json b/kubejs/assets/emi/category/properties/greate_crushing.json index 4c51484a6..cb85263a8 100644 --- a/kubejs/assets/emi/category/properties/greate_crushing.json +++ b/kubejs/assets/emi/category/properties/greate_crushing.json @@ -1 +1 @@ -{"greate:crushing":{"order":85}} \ No newline at end of file +{"greate:crushing":{"order":88}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_fan_washing.json b/kubejs/assets/emi/category/properties/greate_fan_washing.json index 9e4a32636..9162993ce 100644 --- a/kubejs/assets/emi/category/properties/greate_fan_washing.json +++ b/kubejs/assets/emi/category/properties/greate_fan_washing.json @@ -1 +1 @@ -{"greate:fan_washing":{"order":117}} \ No newline at end of file +{"greate:fan_washing":{"order":118}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_milling.json b/kubejs/assets/emi/category/properties/greate_milling.json index 269c685c6..a48ed6f04 100644 --- a/kubejs/assets/emi/category/properties/greate_milling.json +++ b/kubejs/assets/emi/category/properties/greate_milling.json @@ -1 +1 @@ -{"greate:milling":{"order":84}} \ No newline at end of file +{"greate:milling":{"order":87}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_mixing.json b/kubejs/assets/emi/category/properties/greate_mixing.json index 07bf35df1..c042e7a67 100644 --- a/kubejs/assets/emi/category/properties/greate_mixing.json +++ b/kubejs/assets/emi/category/properties/greate_mixing.json @@ -1 +1 @@ -{"greate:mixing":{"order":87}} \ No newline at end of file +{"greate:mixing":{"order":90}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/greate_sawing.json b/kubejs/assets/emi/category/properties/greate_sawing.json index d17229396..4b9b4376e 100644 --- a/kubejs/assets/emi/category/properties/greate_sawing.json +++ b/kubejs/assets/emi/category/properties/greate_sawing.json @@ -1 +1 @@ -{"greate:sawing":{"order":64}} \ No newline at end of file +{"greate:sawing":{"order":67}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_air_scrubber.json b/kubejs/assets/emi/category/properties/gtceu_air_scrubber.json index f15cbd28e..a3f8ab96b 100644 --- a/kubejs/assets/emi/category/properties/gtceu_air_scrubber.json +++ b/kubejs/assets/emi/category/properties/gtceu_air_scrubber.json @@ -1 +1 @@ -{"gtceu:air_scrubber":{"order":47}} \ No newline at end of file +{"gtceu:air_scrubber":{"order":50}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_alloy_blast_smelter.json b/kubejs/assets/emi/category/properties/gtceu_alloy_blast_smelter.json index 17dbdbcc3..05b6fac73 100644 --- a/kubejs/assets/emi/category/properties/gtceu_alloy_blast_smelter.json +++ b/kubejs/assets/emi/category/properties/gtceu_alloy_blast_smelter.json @@ -1 +1 @@ -{"gtceu:alloy_blast_smelter":{"order":99}} \ No newline at end of file +{"gtceu:alloy_blast_smelter":{"order":101}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_alloy_smelter.json b/kubejs/assets/emi/category/properties/gtceu_alloy_smelter.json index a400797b6..85db15835 100644 --- a/kubejs/assets/emi/category/properties/gtceu_alloy_smelter.json +++ b/kubejs/assets/emi/category/properties/gtceu_alloy_smelter.json @@ -1 +1 @@ -{"gtceu:alloy_smelter":{"order":48}} \ No newline at end of file +{"gtceu:alloy_smelter":{"order":51}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_arc_furnace.json b/kubejs/assets/emi/category/properties/gtceu_arc_furnace.json index 99c0d6531..8ebf9b83d 100644 --- a/kubejs/assets/emi/category/properties/gtceu_arc_furnace.json +++ b/kubejs/assets/emi/category/properties/gtceu_arc_furnace.json @@ -1 +1 @@ -{"gtceu:arc_furnace":{"order":49}} \ No newline at end of file +{"gtceu:arc_furnace":{"order":52}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_assembler.json b/kubejs/assets/emi/category/properties/gtceu_assembler.json index 8153a0683..a8df6c8b5 100644 --- a/kubejs/assets/emi/category/properties/gtceu_assembler.json +++ b/kubejs/assets/emi/category/properties/gtceu_assembler.json @@ -1 +1 @@ -{"gtceu:assembler":{"order":50}} \ No newline at end of file +{"gtceu:assembler":{"order":53}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_assembly_line.json b/kubejs/assets/emi/category/properties/gtceu_assembly_line.json index eb7b74284..7ae4802af 100644 --- a/kubejs/assets/emi/category/properties/gtceu_assembly_line.json +++ b/kubejs/assets/emi/category/properties/gtceu_assembly_line.json @@ -1 +1 @@ -{"gtceu:assembly_line":{"order":100}} \ No newline at end of file +{"gtceu:assembly_line":{"order":102}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_autoclave.json b/kubejs/assets/emi/category/properties/gtceu_autoclave.json index 120fb04e6..cb332d93e 100644 --- a/kubejs/assets/emi/category/properties/gtceu_autoclave.json +++ b/kubejs/assets/emi/category/properties/gtceu_autoclave.json @@ -1 +1 @@ -{"gtceu:autoclave":{"order":51}} \ No newline at end of file +{"gtceu:autoclave":{"order":54}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_bedrock_fluid_diagram.json b/kubejs/assets/emi/category/properties/gtceu_bedrock_fluid_diagram.json index 921ec9200..dd9f61c4f 100644 --- a/kubejs/assets/emi/category/properties/gtceu_bedrock_fluid_diagram.json +++ b/kubejs/assets/emi/category/properties/gtceu_bedrock_fluid_diagram.json @@ -1 +1 @@ -{"gtceu:bedrock_fluid_diagram":{"order":121}} \ No newline at end of file +{"gtceu:bedrock_fluid_diagram":{"order":2}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_bender.json b/kubejs/assets/emi/category/properties/gtceu_bender.json index c033f4214..7024a7d7b 100644 --- a/kubejs/assets/emi/category/properties/gtceu_bender.json +++ b/kubejs/assets/emi/category/properties/gtceu_bender.json @@ -1 +1 @@ -{"gtceu:bender":{"order":54}} \ No newline at end of file +{"gtceu:bender":{"order":57}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_brewery.json b/kubejs/assets/emi/category/properties/gtceu_brewery.json index bd06acdf3..4e8bbd8a2 100644 --- a/kubejs/assets/emi/category/properties/gtceu_brewery.json +++ b/kubejs/assets/emi/category/properties/gtceu_brewery.json @@ -1 +1 @@ -{"gtceu:brewery":{"order":55}} \ No newline at end of file +{"gtceu:brewery":{"order":58}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_canner.json b/kubejs/assets/emi/category/properties/gtceu_canner.json index ce3bc39b4..e8c40a5c4 100644 --- a/kubejs/assets/emi/category/properties/gtceu_canner.json +++ b/kubejs/assets/emi/category/properties/gtceu_canner.json @@ -1 +1 @@ -{"gtceu:canner":{"order":56}} \ No newline at end of file +{"gtceu:canner":{"order":59}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_centrifuge.json b/kubejs/assets/emi/category/properties/gtceu_centrifuge.json index dc5152af3..275263a7b 100644 --- a/kubejs/assets/emi/category/properties/gtceu_centrifuge.json +++ b/kubejs/assets/emi/category/properties/gtceu_centrifuge.json @@ -1 +1 @@ -{"gtceu:centrifuge":{"order":58}} \ No newline at end of file +{"gtceu:centrifuge":{"order":61}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_chemical_bath.json b/kubejs/assets/emi/category/properties/gtceu_chemical_bath.json index 73292975e..7b089aec8 100644 --- a/kubejs/assets/emi/category/properties/gtceu_chemical_bath.json +++ b/kubejs/assets/emi/category/properties/gtceu_chemical_bath.json @@ -1 +1 @@ -{"gtceu:chemical_bath":{"order":59}} \ No newline at end of file +{"gtceu:chemical_bath":{"order":62}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_chemical_reactor.json b/kubejs/assets/emi/category/properties/gtceu_chemical_reactor.json index e489d82e0..1d7f7d7dd 100644 --- a/kubejs/assets/emi/category/properties/gtceu_chemical_reactor.json +++ b/kubejs/assets/emi/category/properties/gtceu_chemical_reactor.json @@ -1 +1 @@ -{"gtceu:chemical_reactor":{"order":60}} \ No newline at end of file +{"gtceu:chemical_reactor":{"order":63}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_circuit_assembler.json b/kubejs/assets/emi/category/properties/gtceu_circuit_assembler.json index 7917cc1bf..8a002a681 100644 --- a/kubejs/assets/emi/category/properties/gtceu_circuit_assembler.json +++ b/kubejs/assets/emi/category/properties/gtceu_circuit_assembler.json @@ -1 +1 @@ -{"gtceu:circuit_assembler":{"order":62}} \ No newline at end of file +{"gtceu:circuit_assembler":{"order":65}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_coke_oven.json b/kubejs/assets/emi/category/properties/gtceu_coke_oven.json index 2eba7ec28..86fcc83fe 100644 --- a/kubejs/assets/emi/category/properties/gtceu_coke_oven.json +++ b/kubejs/assets/emi/category/properties/gtceu_coke_oven.json @@ -1 +1 @@ -{"gtceu:coke_oven":{"order":41}} \ No newline at end of file +{"gtceu:coke_oven":{"order":44}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_combustion_generator.json b/kubejs/assets/emi/category/properties/gtceu_combustion_generator.json index f9d93c660..44ac18c92 100644 --- a/kubejs/assets/emi/category/properties/gtceu_combustion_generator.json +++ b/kubejs/assets/emi/category/properties/gtceu_combustion_generator.json @@ -1 +1 @@ -{"gtceu:combustion_generator":{"order":42}} \ No newline at end of file +{"gtceu:combustion_generator":{"order":45}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_compressor.json b/kubejs/assets/emi/category/properties/gtceu_compressor.json index 8b7b2ae07..21c40778c 100644 --- a/kubejs/assets/emi/category/properties/gtceu_compressor.json +++ b/kubejs/assets/emi/category/properties/gtceu_compressor.json @@ -1 +1 @@ -{"gtceu:compressor":{"order":63}} \ No newline at end of file +{"gtceu:compressor":{"order":66}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_cracker.json b/kubejs/assets/emi/category/properties/gtceu_cracker.json index f2abc7326..59a1346b6 100644 --- a/kubejs/assets/emi/category/properties/gtceu_cracker.json +++ b/kubejs/assets/emi/category/properties/gtceu_cracker.json @@ -1 +1 @@ -{"gtceu:cracker":{"order":101}} \ No newline at end of file +{"gtceu:cracker":{"order":103}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_cutter.json b/kubejs/assets/emi/category/properties/gtceu_cutter.json index ec6f62d40..8772df02b 100644 --- a/kubejs/assets/emi/category/properties/gtceu_cutter.json +++ b/kubejs/assets/emi/category/properties/gtceu_cutter.json @@ -1 +1 @@ -{"gtceu:cutter":{"order":65}} \ No newline at end of file +{"gtceu:cutter":{"order":68}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_distillation_tower.json b/kubejs/assets/emi/category/properties/gtceu_distillation_tower.json index 5e2b77b85..2590ab0e2 100644 --- a/kubejs/assets/emi/category/properties/gtceu_distillation_tower.json +++ b/kubejs/assets/emi/category/properties/gtceu_distillation_tower.json @@ -1 +1 @@ -{"gtceu:distillation_tower":{"order":67}} \ No newline at end of file +{"gtceu:distillation_tower":{"order":70}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_distillery.json b/kubejs/assets/emi/category/properties/gtceu_distillery.json index e5652f68b..c72bb67af 100644 --- a/kubejs/assets/emi/category/properties/gtceu_distillery.json +++ b/kubejs/assets/emi/category/properties/gtceu_distillery.json @@ -1 +1 @@ -{"gtceu:distillery":{"order":66}} \ No newline at end of file +{"gtceu:distillery":{"order":69}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_electric_blast_furnace.json b/kubejs/assets/emi/category/properties/gtceu_electric_blast_furnace.json index cc9a50b3d..f463238a2 100644 --- a/kubejs/assets/emi/category/properties/gtceu_electric_blast_furnace.json +++ b/kubejs/assets/emi/category/properties/gtceu_electric_blast_furnace.json @@ -1 +1 @@ -{"gtceu:electric_blast_furnace":{"order":102}} \ No newline at end of file +{"gtceu:electric_blast_furnace":{"order":104}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_electrolyzer.json b/kubejs/assets/emi/category/properties/gtceu_electrolyzer.json index 3983bcf57..0e3ae0fc5 100644 --- a/kubejs/assets/emi/category/properties/gtceu_electrolyzer.json +++ b/kubejs/assets/emi/category/properties/gtceu_electrolyzer.json @@ -1 +1 @@ -{"gtceu:electrolyzer":{"order":68}} \ No newline at end of file +{"gtceu:electrolyzer":{"order":71}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_electromagnetic_separator.json b/kubejs/assets/emi/category/properties/gtceu_electromagnetic_separator.json index 3353ce44c..25e79ebfa 100644 --- a/kubejs/assets/emi/category/properties/gtceu_electromagnetic_separator.json +++ b/kubejs/assets/emi/category/properties/gtceu_electromagnetic_separator.json @@ -1 +1 @@ -{"gtceu:electromagnetic_separator":{"order":69}} \ No newline at end of file +{"gtceu:electromagnetic_separator":{"order":72}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_end_dome.json b/kubejs/assets/emi/category/properties/gtceu_end_dome.json index e5e354445..fa138bf21 100644 --- a/kubejs/assets/emi/category/properties/gtceu_end_dome.json +++ b/kubejs/assets/emi/category/properties/gtceu_end_dome.json @@ -1 +1 @@ -{"gtceu:end_dome":{"order":103}} \ No newline at end of file +{"gtceu:end_dome":{"order":105}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_evaporation.json b/kubejs/assets/emi/category/properties/gtceu_evaporation.json index 1bb56fa94..4bf48aec7 100644 --- a/kubejs/assets/emi/category/properties/gtceu_evaporation.json +++ b/kubejs/assets/emi/category/properties/gtceu_evaporation.json @@ -1 +1 @@ -{"gtceu:evaporation":{"order":104}} \ No newline at end of file +{"gtceu:evaporation":{"order":106}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_extractor.json b/kubejs/assets/emi/category/properties/gtceu_extractor.json index 2645d7a69..cb0e66ef0 100644 --- a/kubejs/assets/emi/category/properties/gtceu_extractor.json +++ b/kubejs/assets/emi/category/properties/gtceu_extractor.json @@ -1 +1 @@ -{"gtceu:extractor":{"order":71}} \ No newline at end of file +{"gtceu:extractor":{"order":74}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_extruder.json b/kubejs/assets/emi/category/properties/gtceu_extruder.json index 1681f410f..df4c0c322 100644 --- a/kubejs/assets/emi/category/properties/gtceu_extruder.json +++ b/kubejs/assets/emi/category/properties/gtceu_extruder.json @@ -1 +1 @@ -{"gtceu:extruder":{"order":73}} \ No newline at end of file +{"gtceu:extruder":{"order":76}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fermenter.json b/kubejs/assets/emi/category/properties/gtceu_fermenter.json index 05d97a4ea..05ff8f121 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fermenter.json +++ b/kubejs/assets/emi/category/properties/gtceu_fermenter.json @@ -1 +1 @@ -{"gtceu:fermenter":{"order":74}} \ No newline at end of file +{"gtceu:fermenter":{"order":77}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fluid_heater.json b/kubejs/assets/emi/category/properties/gtceu_fluid_heater.json index 4949928d9..c6b7694ba 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fluid_heater.json +++ b/kubejs/assets/emi/category/properties/gtceu_fluid_heater.json @@ -1 +1 @@ -{"gtceu:fluid_heater":{"order":75}} \ No newline at end of file +{"gtceu:fluid_heater":{"order":78}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fluid_solidifier.json b/kubejs/assets/emi/category/properties/gtceu_fluid_solidifier.json index b42d78134..d8ccdae53 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fluid_solidifier.json +++ b/kubejs/assets/emi/category/properties/gtceu_fluid_solidifier.json @@ -1 +1 @@ -{"gtceu:fluid_solidifier":{"order":76}} \ No newline at end of file +{"gtceu:fluid_solidifier":{"order":79}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_forge_hammer.json b/kubejs/assets/emi/category/properties/gtceu_forge_hammer.json index 9a0d30153..5f8de7e86 100644 --- a/kubejs/assets/emi/category/properties/gtceu_forge_hammer.json +++ b/kubejs/assets/emi/category/properties/gtceu_forge_hammer.json @@ -1 +1 @@ -{"gtceu:forge_hammer":{"order":77}} \ No newline at end of file +{"gtceu:forge_hammer":{"order":80}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_forming_press.json b/kubejs/assets/emi/category/properties/gtceu_forming_press.json index 8cd427508..bb66e456c 100644 --- a/kubejs/assets/emi/category/properties/gtceu_forming_press.json +++ b/kubejs/assets/emi/category/properties/gtceu_forming_press.json @@ -1 +1 @@ -{"gtceu:forming_press":{"order":78}} \ No newline at end of file +{"gtceu:forming_press":{"order":81}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json b/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json index f783ab266..c659152f0 100644 --- a/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json +++ b/kubejs/assets/emi/category/properties/gtceu_fusion_reactor.json @@ -1 +1 @@ -{"gtceu:fusion_reactor":{"order":105}} \ No newline at end of file +{"gtceu:fusion_reactor":{"order":107}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_gas_collector.json b/kubejs/assets/emi/category/properties/gtceu_gas_collector.json index 5d8b15bd0..60863bad2 100644 --- a/kubejs/assets/emi/category/properties/gtceu_gas_collector.json +++ b/kubejs/assets/emi/category/properties/gtceu_gas_collector.json @@ -1 +1 @@ -{"gtceu:gas_collector":{"order":79}} \ No newline at end of file +{"gtceu:gas_collector":{"order":82}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_gas_turbine.json b/kubejs/assets/emi/category/properties/gtceu_gas_turbine.json index 0c41a44c0..de066578a 100644 --- a/kubejs/assets/emi/category/properties/gtceu_gas_turbine.json +++ b/kubejs/assets/emi/category/properties/gtceu_gas_turbine.json @@ -1 +1 @@ -{"gtceu:gas_turbine":{"order":43}} \ No newline at end of file +{"gtceu:gas_turbine":{"order":46}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_greenhouse.json b/kubejs/assets/emi/category/properties/gtceu_greenhouse.json index 965454f57..2d738eabc 100644 --- a/kubejs/assets/emi/category/properties/gtceu_greenhouse.json +++ b/kubejs/assets/emi/category/properties/gtceu_greenhouse.json @@ -1 +1 @@ -{"gtceu:greenhouse":{"order":106}} \ No newline at end of file +{"gtceu:greenhouse":{"order":108}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json b/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json index eea2fa330..5475a327e 100644 --- a/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json +++ b/kubejs/assets/emi/category/properties/gtceu_implosion_compressor.json @@ -1 +1 @@ -{"gtceu:implosion_compressor":{"order":107}} \ No newline at end of file +{"gtceu:implosion_compressor":{"order":109}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_large_boiler.json b/kubejs/assets/emi/category/properties/gtceu_large_boiler.json index b6a186d4e..8f4750686 100644 --- a/kubejs/assets/emi/category/properties/gtceu_large_boiler.json +++ b/kubejs/assets/emi/category/properties/gtceu_large_boiler.json @@ -1 +1 @@ -{"gtceu:large_boiler":{"order":39}} \ No newline at end of file +{"gtceu:large_boiler":{"order":42}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_large_chemical_reactor.json b/kubejs/assets/emi/category/properties/gtceu_large_chemical_reactor.json index 3df7b1702..360256a9f 100644 --- a/kubejs/assets/emi/category/properties/gtceu_large_chemical_reactor.json +++ b/kubejs/assets/emi/category/properties/gtceu_large_chemical_reactor.json @@ -1 +1 @@ -{"gtceu:large_chemical_reactor":{"order":61}} \ No newline at end of file +{"gtceu:large_chemical_reactor":{"order":64}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_laser_engraver.json b/kubejs/assets/emi/category/properties/gtceu_laser_engraver.json index 01070af78..a054cf146 100644 --- a/kubejs/assets/emi/category/properties/gtceu_laser_engraver.json +++ b/kubejs/assets/emi/category/properties/gtceu_laser_engraver.json @@ -1 +1 @@ -{"gtceu:laser_engraver":{"order":81}} \ No newline at end of file +{"gtceu:laser_engraver":{"order":84}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_lathe.json b/kubejs/assets/emi/category/properties/gtceu_lathe.json index ac36dfe73..d491bff1f 100644 --- a/kubejs/assets/emi/category/properties/gtceu_lathe.json +++ b/kubejs/assets/emi/category/properties/gtceu_lathe.json @@ -1 +1 @@ -{"gtceu:lathe":{"order":83}} \ No newline at end of file +{"gtceu:lathe":{"order":86}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_macerator.json b/kubejs/assets/emi/category/properties/gtceu_macerator.json index 2ab296fe2..f0d47e3dc 100644 --- a/kubejs/assets/emi/category/properties/gtceu_macerator.json +++ b/kubejs/assets/emi/category/properties/gtceu_macerator.json @@ -1 +1 @@ -{"gtceu:macerator":{"order":86}} \ No newline at end of file +{"gtceu:macerator":{"order":89}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_mixer.json b/kubejs/assets/emi/category/properties/gtceu_mixer.json index 868901a68..9e11ce785 100644 --- a/kubejs/assets/emi/category/properties/gtceu_mixer.json +++ b/kubejs/assets/emi/category/properties/gtceu_mixer.json @@ -1 +1 @@ -{"gtceu:mixer":{"order":88}} \ No newline at end of file +{"gtceu:mixer":{"order":91}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_multiblock_info.json b/kubejs/assets/emi/category/properties/gtceu_multiblock_info.json index 96d0e327e..c3a0575d0 100644 --- a/kubejs/assets/emi/category/properties/gtceu_multiblock_info.json +++ b/kubejs/assets/emi/category/properties/gtceu_multiblock_info.json @@ -1 +1 @@ -{"gtceu:multiblock_info":{"order":98}} \ No newline at end of file +{"gtceu:multiblock_info":{"order":0}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_nether_dome.json b/kubejs/assets/emi/category/properties/gtceu_nether_dome.json index a2a8bd88c..6913309e3 100644 --- a/kubejs/assets/emi/category/properties/gtceu_nether_dome.json +++ b/kubejs/assets/emi/category/properties/gtceu_nether_dome.json @@ -1 +1 @@ -{"gtceu:nether_dome":{"order":108}} \ No newline at end of file +{"gtceu:nether_dome":{"order":110}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json b/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json index db972d01d..f0cb8ad1c 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_bathing.json @@ -1 +1 @@ -{"gtceu:ore_bathing":{"order":120}} \ No newline at end of file +{"gtceu:ore_bathing":{"order":121}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json b/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json index a2361e5cc..8c102ee65 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_crushing.json @@ -1 +1 @@ -{"gtceu:ore_crushing":{"order":118}} \ No newline at end of file +{"gtceu:ore_crushing":{"order":119}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_forging.json b/kubejs/assets/emi/category/properties/gtceu_ore_forging.json index 8d9ddc9c2..6644bdeeb 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_forging.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_forging.json @@ -1 +1 @@ -{"gtceu:ore_forging":{"order":119}} \ No newline at end of file +{"gtceu:ore_forging":{"order":120}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_processing_diagram.json b/kubejs/assets/emi/category/properties/gtceu_ore_processing_diagram.json index 7a757c621..b6850202b 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_processing_diagram.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_processing_diagram.json @@ -1 +1 @@ -{"gtceu:ore_processing_diagram":{"order":114}} \ No newline at end of file +{"gtceu:ore_processing_diagram":{"order":1}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_ore_washer.json b/kubejs/assets/emi/category/properties/gtceu_ore_washer.json index 92e9e0780..385a7da24 100644 --- a/kubejs/assets/emi/category/properties/gtceu_ore_washer.json +++ b/kubejs/assets/emi/category/properties/gtceu_ore_washer.json @@ -1 +1 @@ -{"gtceu:ore_washer":{"order":116}} \ No newline at end of file +{"gtceu:ore_washer":{"order":117}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_packer.json b/kubejs/assets/emi/category/properties/gtceu_packer.json index fe77bb29f..628fe1bdd 100644 --- a/kubejs/assets/emi/category/properties/gtceu_packer.json +++ b/kubejs/assets/emi/category/properties/gtceu_packer.json @@ -1 +1 @@ -{"gtceu:packer":{"order":89}} \ No newline at end of file +{"gtceu:packer":{"order":92}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_plasma_generator.json b/kubejs/assets/emi/category/properties/gtceu_plasma_generator.json index 47b77400b..1fb2bbcbf 100644 --- a/kubejs/assets/emi/category/properties/gtceu_plasma_generator.json +++ b/kubejs/assets/emi/category/properties/gtceu_plasma_generator.json @@ -1 +1 @@ -{"gtceu:plasma_generator":{"order":44}} \ No newline at end of file +{"gtceu:plasma_generator":{"order":47}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_polarizer.json b/kubejs/assets/emi/category/properties/gtceu_polarizer.json index 933dde423..a2261a060 100644 --- a/kubejs/assets/emi/category/properties/gtceu_polarizer.json +++ b/kubejs/assets/emi/category/properties/gtceu_polarizer.json @@ -1 +1 @@ -{"gtceu:polarizer":{"order":90}} \ No newline at end of file +{"gtceu:polarizer":{"order":93}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json b/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json index 3c26583a1..ecf6ef859 100644 --- a/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json +++ b/kubejs/assets/emi/category/properties/gtceu_pyrolyse_oven.json @@ -1 +1 @@ -{"gtceu:pyrolyse_oven":{"order":109}} \ No newline at end of file +{"gtceu:pyrolyse_oven":{"order":111}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_research_station.json b/kubejs/assets/emi/category/properties/gtceu_research_station.json index 23b515284..8bfef83da 100644 --- a/kubejs/assets/emi/category/properties/gtceu_research_station.json +++ b/kubejs/assets/emi/category/properties/gtceu_research_station.json @@ -1 +1 @@ -{"gtceu:research_station":{"order":110}} \ No newline at end of file +{"gtceu:research_station":{"order":112}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_rock_breaker.json b/kubejs/assets/emi/category/properties/gtceu_rock_breaker.json index e2949da4a..c74f1b82e 100644 --- a/kubejs/assets/emi/category/properties/gtceu_rock_breaker.json +++ b/kubejs/assets/emi/category/properties/gtceu_rock_breaker.json @@ -1 +1 @@ -{"gtceu:rock_breaker":{"order":91}} \ No newline at end of file +{"gtceu:rock_breaker":{"order":94}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_scanner.json b/kubejs/assets/emi/category/properties/gtceu_scanner.json index d57311eff..8aff8e118 100644 --- a/kubejs/assets/emi/category/properties/gtceu_scanner.json +++ b/kubejs/assets/emi/category/properties/gtceu_scanner.json @@ -1 +1 @@ -{"gtceu:scanner":{"order":92}} \ No newline at end of file +{"gtceu:scanner":{"order":95}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_sifter.json b/kubejs/assets/emi/category/properties/gtceu_sifter.json index 3a7c2f5f2..645a45e22 100644 --- a/kubejs/assets/emi/category/properties/gtceu_sifter.json +++ b/kubejs/assets/emi/category/properties/gtceu_sifter.json @@ -1 +1 @@ -{"gtceu:sifter":{"order":94}} \ No newline at end of file +{"gtceu:sifter":{"order":97}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json b/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json index b71706d99..ebb04c75b 100644 --- a/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json +++ b/kubejs/assets/emi/category/properties/gtceu_steam_bloomery.json @@ -1 +1 @@ -{"gtceu:steam_bloomery":{"order":111}} \ No newline at end of file +{"gtceu:steam_bloomery":{"order":113}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_steam_boiler.json b/kubejs/assets/emi/category/properties/gtceu_steam_boiler.json index 9f36bb1ed..92b9d5433 100644 --- a/kubejs/assets/emi/category/properties/gtceu_steam_boiler.json +++ b/kubejs/assets/emi/category/properties/gtceu_steam_boiler.json @@ -1 +1 @@ -{"gtceu:steam_boiler":{"order":40}} \ No newline at end of file +{"gtceu:steam_boiler":{"order":43}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_steam_turbine.json b/kubejs/assets/emi/category/properties/gtceu_steam_turbine.json index 90fca1f35..4ca793414 100644 --- a/kubejs/assets/emi/category/properties/gtceu_steam_turbine.json +++ b/kubejs/assets/emi/category/properties/gtceu_steam_turbine.json @@ -1 +1 @@ -{"gtceu:steam_turbine":{"order":45}} \ No newline at end of file +{"gtceu:steam_turbine":{"order":48}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_thermal_centrifuge.json b/kubejs/assets/emi/category/properties/gtceu_thermal_centrifuge.json index 6d7cd343f..c7e288b5b 100644 --- a/kubejs/assets/emi/category/properties/gtceu_thermal_centrifuge.json +++ b/kubejs/assets/emi/category/properties/gtceu_thermal_centrifuge.json @@ -1 +1 @@ -{"gtceu:thermal_centrifuge":{"order":95}} \ No newline at end of file +{"gtceu:thermal_centrifuge":{"order":98}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json b/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json index df61bc1fb..57cef1151 100644 --- a/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json +++ b/kubejs/assets/emi/category/properties/gtceu_vacuum_freezer.json @@ -1 +1 @@ -{"gtceu:vacuum_freezer":{"order":112}} \ No newline at end of file +{"gtceu:vacuum_freezer":{"order":114}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_wire_coating.json b/kubejs/assets/emi/category/properties/gtceu_wire_coating.json index ba464e3ad..cc9d5a5ac 100644 --- a/kubejs/assets/emi/category/properties/gtceu_wire_coating.json +++ b/kubejs/assets/emi/category/properties/gtceu_wire_coating.json @@ -1 +1 @@ -{"gtceu:wire_coating":{"order":113}} \ No newline at end of file +{"gtceu:wire_coating":{"order":115}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/gtceu_wiremill.json b/kubejs/assets/emi/category/properties/gtceu_wiremill.json index 777cb345a..f67023b37 100644 --- a/kubejs/assets/emi/category/properties/gtceu_wiremill.json +++ b/kubejs/assets/emi/category/properties/gtceu_wiremill.json @@ -1 +1 @@ -{"gtceu:wiremill":{"order":97}} \ No newline at end of file +{"gtceu:wiremill":{"order":100}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/minecraft_crafting.json b/kubejs/assets/emi/category/properties/minecraft_crafting.json index 0b37af1f0..46e3b5a5c 100644 --- a/kubejs/assets/emi/category/properties/minecraft_crafting.json +++ b/kubejs/assets/emi/category/properties/minecraft_crafting.json @@ -1 +1 @@ -{"minecraft:crafting":{"order":0}} \ No newline at end of file +{"minecraft:crafting":{"order":3}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/minecraft_smelting.json b/kubejs/assets/emi/category/properties/minecraft_smelting.json index 7003fb45e..0e1b5742e 100644 --- a/kubejs/assets/emi/category/properties/minecraft_smelting.json +++ b/kubejs/assets/emi/category/properties/minecraft_smelting.json @@ -1 +1 @@ -{"minecraft:smelting":{"order":46}} \ No newline at end of file +{"minecraft:smelting":{"order":49}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_alloying.json b/kubejs/assets/emi/category/properties/tfc_alloying.json index 14a19218a..1e9ac5675 100644 --- a/kubejs/assets/emi/category/properties/tfc_alloying.json +++ b/kubejs/assets/emi/category/properties/tfc_alloying.json @@ -1 +1 @@ -{"tfc:alloying":{"order":20}} \ No newline at end of file +{"tfc:alloying":{"order":23}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_anvil.json b/kubejs/assets/emi/category/properties/tfc_anvil.json index 0e9d424a8..77b78d7a2 100644 --- a/kubejs/assets/emi/category/properties/tfc_anvil.json +++ b/kubejs/assets/emi/category/properties/tfc_anvil.json @@ -1 +1 @@ -{"tfc:anvil":{"order":12}} \ No newline at end of file +{"tfc:anvil":{"order":15}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_blast_furnace.json b/kubejs/assets/emi/category/properties/tfc_blast_furnace.json index b33929218..23350c055 100644 --- a/kubejs/assets/emi/category/properties/tfc_blast_furnace.json +++ b/kubejs/assets/emi/category/properties/tfc_blast_furnace.json @@ -1 +1 @@ -{"tfc:blast_furnace":{"order":19}} \ No newline at end of file +{"tfc:blast_furnace":{"order":22}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_bloomery.json b/kubejs/assets/emi/category/properties/tfc_bloomery.json index e4a0c59ed..2018b1a9d 100644 --- a/kubejs/assets/emi/category/properties/tfc_bloomery.json +++ b/kubejs/assets/emi/category/properties/tfc_bloomery.json @@ -1 +1 @@ -{"tfc:bloomery":{"order":18}} \ No newline at end of file +{"tfc:bloomery":{"order":21}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_casting.json b/kubejs/assets/emi/category/properties/tfc_casting.json index 0e9ef8a2f..dbffba346 100644 --- a/kubejs/assets/emi/category/properties/tfc_casting.json +++ b/kubejs/assets/emi/category/properties/tfc_casting.json @@ -1 +1 @@ -{"tfc:casting":{"order":11}} \ No newline at end of file +{"tfc:casting":{"order":14}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_chisel.json b/kubejs/assets/emi/category/properties/tfc_chisel.json index ec24ab3fc..bfc2ff619 100644 --- a/kubejs/assets/emi/category/properties/tfc_chisel.json +++ b/kubejs/assets/emi/category/properties/tfc_chisel.json @@ -1 +1 @@ -{"tfc:chisel":{"order":24}} \ No newline at end of file +{"tfc:chisel":{"order":27}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_clay_knapping.json b/kubejs/assets/emi/category/properties/tfc_clay_knapping.json index 347ab841d..020fb754f 100644 --- a/kubejs/assets/emi/category/properties/tfc_clay_knapping.json +++ b/kubejs/assets/emi/category/properties/tfc_clay_knapping.json @@ -1 +1 @@ -{"tfc:clay_knapping":{"order":3}} \ No newline at end of file +{"tfc:clay_knapping":{"order":6}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_fire_clay_knapping.json b/kubejs/assets/emi/category/properties/tfc_fire_clay_knapping.json index 5dadd7dee..757d8e15b 100644 --- a/kubejs/assets/emi/category/properties/tfc_fire_clay_knapping.json +++ b/kubejs/assets/emi/category/properties/tfc_fire_clay_knapping.json @@ -1 +1 @@ -{"tfc:fire_clay_knapping":{"order":4}} \ No newline at end of file +{"tfc:fire_clay_knapping":{"order":7}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_glassworking.json b/kubejs/assets/emi/category/properties/tfc_glassworking.json index 9d9a0ed38..6ad426a66 100644 --- a/kubejs/assets/emi/category/properties/tfc_glassworking.json +++ b/kubejs/assets/emi/category/properties/tfc_glassworking.json @@ -1 +1 @@ -{"tfc:glassworking":{"order":23}} \ No newline at end of file +{"tfc:glassworking":{"order":26}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_goat_horn_knapping.json b/kubejs/assets/emi/category/properties/tfc_goat_horn_knapping.json index fc35edcbb..fa4f5e4e5 100644 --- a/kubejs/assets/emi/category/properties/tfc_goat_horn_knapping.json +++ b/kubejs/assets/emi/category/properties/tfc_goat_horn_knapping.json @@ -1 +1 @@ -{"tfc:goat_horn_knapping":{"order":6}} \ No newline at end of file +{"tfc:goat_horn_knapping":{"order":9}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_heating.json b/kubejs/assets/emi/category/properties/tfc_heating.json index c533ffb4a..783bc261e 100644 --- a/kubejs/assets/emi/category/properties/tfc_heating.json +++ b/kubejs/assets/emi/category/properties/tfc_heating.json @@ -1 +1 @@ -{"tfc:heating":{"order":9}} \ No newline at end of file +{"tfc:heating":{"order":12}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_instant_barrel.json b/kubejs/assets/emi/category/properties/tfc_instant_barrel.json index 1dabd0805..8e6cc69a1 100644 --- a/kubejs/assets/emi/category/properties/tfc_instant_barrel.json +++ b/kubejs/assets/emi/category/properties/tfc_instant_barrel.json @@ -1 +1 @@ -{"tfc:instant_barrel":{"order":15}} \ No newline at end of file +{"tfc:instant_barrel":{"order":18}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_instant_fluid_barrel.json b/kubejs/assets/emi/category/properties/tfc_instant_fluid_barrel.json index f59ec0724..b46b96c77 100644 --- a/kubejs/assets/emi/category/properties/tfc_instant_fluid_barrel.json +++ b/kubejs/assets/emi/category/properties/tfc_instant_fluid_barrel.json @@ -1 +1 @@ -{"tfc:instant_fluid_barrel":{"order":16}} \ No newline at end of file +{"tfc:instant_fluid_barrel":{"order":19}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_jam_pot.json b/kubejs/assets/emi/category/properties/tfc_jam_pot.json index 95c9a89d5..fe912d77f 100644 --- a/kubejs/assets/emi/category/properties/tfc_jam_pot.json +++ b/kubejs/assets/emi/category/properties/tfc_jam_pot.json @@ -1 +1 @@ -{"tfc:jam_pot":{"order":32}} \ No newline at end of file +{"tfc:jam_pot":{"order":35}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_leather_knapping.json b/kubejs/assets/emi/category/properties/tfc_leather_knapping.json index 9f4e87a39..6649c4c36 100644 --- a/kubejs/assets/emi/category/properties/tfc_leather_knapping.json +++ b/kubejs/assets/emi/category/properties/tfc_leather_knapping.json @@ -1 +1 @@ -{"tfc:leather_knapping":{"order":5}} \ No newline at end of file +{"tfc:leather_knapping":{"order":8}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_loom.json b/kubejs/assets/emi/category/properties/tfc_loom.json index 95ec833ae..230874f68 100644 --- a/kubejs/assets/emi/category/properties/tfc_loom.json +++ b/kubejs/assets/emi/category/properties/tfc_loom.json @@ -1 +1 @@ -{"tfc:loom":{"order":22}} \ No newline at end of file +{"tfc:loom":{"order":25}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_pumpkin_knapping.json b/kubejs/assets/emi/category/properties/tfc_pumpkin_knapping.json index 5e779e061..af409a188 100644 --- a/kubejs/assets/emi/category/properties/tfc_pumpkin_knapping.json +++ b/kubejs/assets/emi/category/properties/tfc_pumpkin_knapping.json @@ -1 +1 @@ -{"tfc:pumpkin_knapping":{"order":7}} \ No newline at end of file +{"tfc:pumpkin_knapping":{"order":10}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_quern.json b/kubejs/assets/emi/category/properties/tfc_quern.json index 586de25b4..cbad02381 100644 --- a/kubejs/assets/emi/category/properties/tfc_quern.json +++ b/kubejs/assets/emi/category/properties/tfc_quern.json @@ -1 +1 @@ -{"tfc:quern":{"order":10}} \ No newline at end of file +{"tfc:quern":{"order":13}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_raw_hide_knapping.json b/kubejs/assets/emi/category/properties/tfc_raw_hide_knapping.json index 8073c1148..203b2a773 100644 --- a/kubejs/assets/emi/category/properties/tfc_raw_hide_knapping.json +++ b/kubejs/assets/emi/category/properties/tfc_raw_hide_knapping.json @@ -1 +1 @@ -{"tfc:raw_hide_knapping":{"order":8}} \ No newline at end of file +{"tfc:raw_hide_knapping":{"order":11}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_rock_knapping.json b/kubejs/assets/emi/category/properties/tfc_rock_knapping.json index 03c60a072..f88f47aa5 100644 --- a/kubejs/assets/emi/category/properties/tfc_rock_knapping.json +++ b/kubejs/assets/emi/category/properties/tfc_rock_knapping.json @@ -1 +1 @@ -{"tfc:rock_knapping":{"order":2}} \ No newline at end of file +{"tfc:rock_knapping":{"order":5}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_scraping.json b/kubejs/assets/emi/category/properties/tfc_scraping.json index a73746536..82cce97ba 100644 --- a/kubejs/assets/emi/category/properties/tfc_scraping.json +++ b/kubejs/assets/emi/category/properties/tfc_scraping.json @@ -1 +1 @@ -{"tfc:scraping":{"order":21}} \ No newline at end of file +{"tfc:scraping":{"order":24}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_sealed_barrel.json b/kubejs/assets/emi/category/properties/tfc_sealed_barrel.json index 6aaa75ebc..54cff0d71 100644 --- a/kubejs/assets/emi/category/properties/tfc_sealed_barrel.json +++ b/kubejs/assets/emi/category/properties/tfc_sealed_barrel.json @@ -1 +1 @@ -{"tfc:sealed_barrel":{"order":17}} \ No newline at end of file +{"tfc:sealed_barrel":{"order":20}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_sewing.json b/kubejs/assets/emi/category/properties/tfc_sewing.json index d8020bc81..fc38b9817 100644 --- a/kubejs/assets/emi/category/properties/tfc_sewing.json +++ b/kubejs/assets/emi/category/properties/tfc_sewing.json @@ -1 +1 @@ -{"tfc:sewing":{"order":25}} \ No newline at end of file +{"tfc:sewing":{"order":28}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_simple_pot.json b/kubejs/assets/emi/category/properties/tfc_simple_pot.json index 2b472d7e3..3768d1146 100644 --- a/kubejs/assets/emi/category/properties/tfc_simple_pot.json +++ b/kubejs/assets/emi/category/properties/tfc_simple_pot.json @@ -1 +1 @@ -{"tfc:simple_pot":{"order":30}} \ No newline at end of file +{"tfc:simple_pot":{"order":33}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_soup_pot.json b/kubejs/assets/emi/category/properties/tfc_soup_pot.json index 083256f49..db160e656 100644 --- a/kubejs/assets/emi/category/properties/tfc_soup_pot.json +++ b/kubejs/assets/emi/category/properties/tfc_soup_pot.json @@ -1 +1 @@ -{"tfc:soup_pot":{"order":31}} \ No newline at end of file +{"tfc:soup_pot":{"order":34}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/tfc_welding.json b/kubejs/assets/emi/category/properties/tfc_welding.json index 7f75cfff3..b74292c54 100644 --- a/kubejs/assets/emi/category/properties/tfc_welding.json +++ b/kubejs/assets/emi/category/properties/tfc_welding.json @@ -1 +1 @@ -{"tfc:welding":{"order":13}} \ No newline at end of file +{"tfc:welding":{"order":16}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_centrifugation.json b/kubejs/assets/emi/category/properties/vintageimprovements_centrifugation.json index 2ba4b9619..ebde2eb47 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_centrifugation.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_centrifugation.json @@ -1 +1 @@ -{"vintageimprovements:centrifugation":{"order":57}} \ No newline at end of file +{"vintageimprovements:centrifugation":{"order":60}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_coiling.json b/kubejs/assets/emi/category/properties/vintageimprovements_coiling.json index 52f6084ce..6ca9b80a2 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_coiling.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_coiling.json @@ -1 +1 @@ -{"vintageimprovements:coiling":{"order":96}} \ No newline at end of file +{"vintageimprovements:coiling":{"order":99}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_curving.json b/kubejs/assets/emi/category/properties/vintageimprovements_curving.json index e69d16ed8..816920460 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_curving.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_curving.json @@ -1 +1 @@ -{"vintageimprovements:curving":{"order":72}} \ No newline at end of file +{"vintageimprovements:curving":{"order":75}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_hammering.json b/kubejs/assets/emi/category/properties/vintageimprovements_hammering.json index 49bda6c6d..ba82ab583 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_hammering.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_hammering.json @@ -1 +1 @@ -{"vintageimprovements:hammering":{"order":14}} \ No newline at end of file +{"vintageimprovements:hammering":{"order":17}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_laser_cutting.json b/kubejs/assets/emi/category/properties/vintageimprovements_laser_cutting.json index 329d088fe..eb05a6a1e 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_laser_cutting.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_laser_cutting.json @@ -1 +1 @@ -{"vintageimprovements:laser_cutting":{"order":80}} \ No newline at end of file +{"vintageimprovements:laser_cutting":{"order":83}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_pressurizing.json b/kubejs/assets/emi/category/properties/vintageimprovements_pressurizing.json index dc0a3efd6..87b9e0a25 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_pressurizing.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_pressurizing.json @@ -1 +1 @@ -{"vintageimprovements:pressurizing":{"order":53}} \ No newline at end of file +{"vintageimprovements:pressurizing":{"order":56}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_turning.json b/kubejs/assets/emi/category/properties/vintageimprovements_turning.json index f6a4c1a83..ab9a67e61 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_turning.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_turning.json @@ -1 +1 @@ -{"vintageimprovements:turning":{"order":82}} \ No newline at end of file +{"vintageimprovements:turning":{"order":85}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_vacuumizing.json b/kubejs/assets/emi/category/properties/vintageimprovements_vacuumizing.json index 588ce3ae8..3f3013841 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_vacuumizing.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_vacuumizing.json @@ -1 +1 @@ -{"vintageimprovements:vacuumizing":{"order":70}} \ No newline at end of file +{"vintageimprovements:vacuumizing":{"order":73}} \ No newline at end of file diff --git a/kubejs/assets/emi/category/properties/vintageimprovements_vibrating.json b/kubejs/assets/emi/category/properties/vintageimprovements_vibrating.json index acabeb183..e3d7dd753 100644 --- a/kubejs/assets/emi/category/properties/vintageimprovements_vibrating.json +++ b/kubejs/assets/emi/category/properties/vintageimprovements_vibrating.json @@ -1 +1 @@ -{"vintageimprovements:vibrating":{"order":93}} \ No newline at end of file +{"vintageimprovements:vibrating":{"order":96}} \ No newline at end of file From 2e87b0556354e04ed517156629e10bf44bac6316 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 19 May 2025 01:38:47 +0100 Subject: [PATCH 35/53] why were portals turned back on --- defaultconfigs/tfc-server.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaultconfigs/tfc-server.toml b/defaultconfigs/tfc-server.toml index c3d4f07d6..ed61e46f0 100644 --- a/defaultconfigs/tfc-server.toml +++ b/defaultconfigs/tfc-server.toml @@ -6,7 +6,7 @@ familiarityDecayLimit = 0.3 [general] # # Enable nether portal creation - enableNetherPortals = true + enableNetherPortals = false # # Forces a number of game rules to specific values. # naturalRegeneration = false (Health regen is much slower and not tied to extra saturation) From 23fb1251d35167af2c54fc4775f903a48f8bbb91 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 19 May 2025 02:19:24 +0100 Subject: [PATCH 36/53] added configs for diggerhelmet --- config/diggerhelmet-common.toml | 37 +++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 config/diggerhelmet-common.toml diff --git a/config/diggerhelmet-common.toml b/config/diggerhelmet-common.toml new file mode 100644 index 000000000..dd93a63e7 --- /dev/null +++ b/config/diggerhelmet-common.toml @@ -0,0 +1,37 @@ + +["AutoDrinker Settings"] + #The amount of fluid in millibuckets consumed per use + #Range: 1 ~ 1000 + drink_mb = 25 + #Default cooldown time in ticks (20 ticks = 1 second) + #Range: 1 ~ 1000 + default_cooldown = 100 + +["MiningSpeedModifier Settings"] + #Multiplier for pickaxe mining speed + #Range: 1.0 ~ 10.0 + pickaxe_multiplier = 2.5 + #Multiplier for shovel mining speed + #Range: 1.0 ~ 10.0 + shovel_multiplier = 1.8 + +["Zombie Candle Settings"] + #Enable/disable spawning of zombies with a candle + enable_zombie_candle = false + #Chance of a zombie spawning with a candle (0.0 - 1.0) + #Range: 0.0 ~ 1.0 + zombie_candle_chance = 0.2 + +["Candle Slime Settings"] + #Enable/disable spawning of slimes with a candle + enable_candle_slime = false + #Chance of a slime spawning with a candle (0.0 - 1.0) + #Range: 0.0 ~ 1.0 + candle_slime_spawn_chance = 0.5 + #Minimum Y level for candle slime spawn + #Range: 0 ~ 256 + candle_slime_min_y = 50 + #Maximum Y level for candle slime spawn + #Range: 0 ~ 256 + candle_slime_max_y = 70 + From 35ff6141f0ea0d810d5444fe045c6b3904996eee Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 19 May 2025 02:19:48 +0100 Subject: [PATCH 37/53] few more quest tweaks --- .../quests/chapters/questsmetallurgy.snbt | 20 +++++++++++++++++-- .../quests/chapters/questsstoneage.snbt | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/config/ftbquests/quests/chapters/questsmetallurgy.snbt b/config/ftbquests/quests/chapters/questsmetallurgy.snbt index 59d0386e7..cce2c779b 100644 --- a/config/ftbquests/quests/chapters/questsmetallurgy.snbt +++ b/config/ftbquests/quests/chapters/questsmetallurgy.snbt @@ -478,8 +478,6 @@ } { dependencies: [ - "5301A38F7EA81140" - "5E186CD5E83BFDF0" "72F1C122FC26229C" "31CE13462759950C" "5A936E9BCF30AA3D" @@ -493,6 +491,7 @@ id: "71DAE9C9C0192316" item: "tfc:fire_clay" type: "item" + weak_nbt_match: true }] title: "{quests.metal_age.fire_clay.title}" x: 17.5d @@ -619,6 +618,23 @@ optional_task: true type: "item" } + { + count: 12L + id: "012401052AF71561" + item: { + Count: 12 + ForgeCaps: { + "tfc:item_heat": { + heat: 0.0f + ticks: 0L + } + } + id: "gtceu:wrought_iron_plate" + } + optional_task: true + type: "item" + weak_nbt_match: true + } ] title: "{quests.metal_age.fire_bricks.title}" x: 20.5d diff --git a/config/ftbquests/quests/chapters/questsstoneage.snbt b/config/ftbquests/quests/chapters/questsstoneage.snbt index 8920810bd..9f6d6f74c 100644 --- a/config/ftbquests/quests/chapters/questsstoneage.snbt +++ b/config/ftbquests/quests/chapters/questsstoneage.snbt @@ -1809,7 +1809,7 @@ Count: 1 ForgeCaps: { "tfc:food": { - creationDate: 10908000L + creationDate: -9223372036854775808L traits: [ ] } } From f9c2a5f70dc1734de563286970f73e5aa75ccfb1 Mon Sep 17 00:00:00 2001 From: Spicy Noodles <93035068+SpicyNoodle5@users.noreply.github.com> Date: Mon, 19 May 2025 02:26:39 +0100 Subject: [PATCH 38/53] Add extra small gear anvil recipes (#1041) * Add extra small gear anvil recipes * Update recipes.metals.js Signed-off-by: Pyritie --------- Signed-off-by: Pyritie Co-authored-by: Pyritie --- kubejs/server_scripts/tfc/recipes.metals.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/tfc/recipes.metals.js b/kubejs/server_scripts/tfc/recipes.metals.js index b5c35b9ff..d060eabcd 100644 --- a/kubejs/server_scripts/tfc/recipes.metals.js +++ b/kubejs/server_scripts/tfc/recipes.metals.js @@ -279,6 +279,9 @@ function registerTFCMetalsRecipes(event) { event.recipes.tfc.anvil('gtceu:small_steel_gear', '#forge:ingots/steel', ['hit_last', 'shrink_second_last', 'draw_third_last']) .tier(4) .id('tfc:anvil/small_steel_gear') + event.recipes.tfc.anvil('gtceu:small_iron_gear', '#forge:ingots/iron', ['hit_last', 'shrink_second_last', 'draw_third_last']) + .tier(2) + .id('tfc:anvil/small_iron_gear') event.recipes.tfc.anvil('gtceu:small_brass_gear', '#forge:ingots/brass', ['hit_last', 'shrink_second_last', 'draw_third_last']) .tier(2) .id('tfc:anvil/small_brass_gear') @@ -291,6 +294,9 @@ function registerTFCMetalsRecipes(event) { event.recipes.tfc.anvil('gtceu:small_black_bronze_gear', '#forge:ingots/black_bronze', ['hit_last', 'shrink_second_last', 'draw_third_last']) .tier(2) .id('tfc:anvil/small_black_bronze_gear') + event.recipes.tfc.anvil('gtceu:small_red_alloy_gear', '#forge:ingots/red_alloy', ['hit_last', 'shrink_second_last', 'draw_third_last']) + .tier(2) + .id('tfc:anvil/small_red_alloy_gear') // Cast iron -> Raw Iron Bloom event.recipes.tfc.bloomery('tfc:raw_iron_bloom', 'minecraft:charcoal', Fluid.of('gtceu:iron', 144), 15000) @@ -330,4 +336,4 @@ function registerTFCMetalsRecipes(event) { .EUt(GTValues.VA[GTValues.LV]) })}) //#endregion -} \ No newline at end of file +} From 22a7870259dd748a9be071670ee8dc526a26e76e Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 19 May 2025 02:32:04 +0100 Subject: [PATCH 39/53] pakku --- pakku-lock.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index bb085a4c1..7354cf5c3 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -2463,7 +2463,7 @@ "files": [ { "type": "curseforge", - "file_name": "diggerhelmet-1.20.1-1.0.0.18.jar", + "file_name": "diggerhelmet-1.20.1-1.0.0.19.jar", "mc_versions": [ "1.20.1" ], @@ -2472,20 +2472,20 @@ "forge" ], "release_type": "beta", - "url": "https://edge.forgecdn.net/files/6429/110/diggerhelmet-1.20.1-1.0.0.18.jar", - "id": "6429110", + "url": "https://edge.forgecdn.net/files/6536/317/diggerhelmet-1.20.1-1.0.0.19.jar", + "id": "6536317", "parent_id": "1243596", "hashes": { - "sha1": "2020d274cfb18c26c1ee079bf45673e781a6bae5", - "md5": "fa685357a3a22e9b946d00d3f5ad1c65" + "sha1": "a0e14d39f0e390df58569b3fd4dd58bd25b5cb2c", + "md5": "8a0c4e65772389d552ddfde1f1ff0f21" }, "required_dependencies": [ "302973", - "388172", - "309927" + "309927", + "388172" ], - "size": 163250, - "date_published": "2025-04-16T13:29:52.010Z" + "size": 166512, + "date_published": "2025-05-16T17:31:26.657Z" } ] }, @@ -3767,7 +3767,7 @@ "files": [ { "type": "curseforge", - "file_name": "Firmalife-1.20.1-2.1.18.jar", + "file_name": "Firmalife-1.20.1-2.1.19.jar", "mc_versions": [ "1.20.1" ], @@ -3776,18 +3776,18 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6438/438/Firmalife-1.20.1-2.1.18.jar", - "id": "6438438", + "url": "https://edge.forgecdn.net/files/6539/645/Firmalife-1.20.1-2.1.19.jar", + "id": "6539645", "parent_id": "453394", "hashes": { - "sha1": "de9ec2980e5f09a28415e489aa24eec5840a010d", - "md5": "1275fd720bd36ed1144e558d8c395267" + "sha1": "10a33eb2e568207ade545676ea744cb6b429d8cf", + "md5": "f84e578a7cc607a70c33ed1972e55767" }, "required_dependencies": [ "302973" ], - "size": 4597517, - "date_published": "2025-04-19T02:24:56.657Z" + "size": 4601850, + "date_published": "2025-05-17T16:15:39.383Z" } ] }, From 884a94433426fbdff75405a7a1073a0293b0f955 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Mon, 19 May 2025 20:13:42 +0500 Subject: [PATCH 40/53] CHANGELOG --- CHANGELOG.md | 3 +++ pakku.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8ea750db..b9901be5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## [Unreleased] ### Changes + +## [0.9.8] - 19.05.2025 +### Changes - Changed to a different mod to claim/forceload chunks - use Ctrl+M to open the interface. @Xikaro - Fixed a bug where sometimes, materials would fail to load and a lot of recipes would break. (#1028) @Pyritie - Changes to entity loot tables, so now butchery knife gives more meat drops but nothing else. (#1035) @Pyritie diff --git a/pakku.json b/pakku.json index 7755d7b50..33066bf48 100644 --- a/pakku.json +++ b/pakku.json @@ -1,6 +1,6 @@ { "name": "TerraFirmaGreg-Modern", - "version": "0.9.7", + "version": "0.9.8", "description": "An innovative modpack that contains GregTech and TerraFirmaCraft on 1.20.x.", "author": "Exception, Xikaro", "overrides": [ From e7fefe3b1a764f03e8c16cb1f28ae5f3121003bb Mon Sep 17 00:00:00 2001 From: Xikaro Date: Mon, 19 May 2025 20:16:10 +0500 Subject: [PATCH 41/53] Update mods --- mods | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods b/mods index 4b13e86b3..a79d69aaf 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit 4b13e86b338571820b4c21d8a1d2dc807d5e04ff +Subproject commit a79d69aaf9c9988aec6097b1028801500661a8c9 From 53647c30aeba10f938f244164abc6adc815a3677 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 19 May 2025 16:57:26 +0100 Subject: [PATCH 42/53] changed aircraft engine recipes to use the correct tier cables --- kubejs/server_scripts/immersive_aircraft/recipes.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/kubejs/server_scripts/immersive_aircraft/recipes.js b/kubejs/server_scripts/immersive_aircraft/recipes.js index 64977d80f..e3ad2e7ad 100644 --- a/kubejs/server_scripts/immersive_aircraft/recipes.js +++ b/kubejs/server_scripts/immersive_aircraft/recipes.js @@ -340,7 +340,7 @@ function registerImmersiveAircraftRecipes(event) { C: 'gtceu:blue_steel_plate', D: 'gtceu:lv_electric_piston', E: 'immersive_aircraft:engine', - F: 'gtceu:red_alloy_single_cable', + F: 'gtceu:tin_single_cable', G: 'gtceu:lv_electric_pump' }).id('tfg:shaped/lv_aircraft_engine') @@ -376,7 +376,7 @@ function registerImmersiveAircraftRecipes(event) { A: 'vintageimprovements:aluminum_sheet', B: 'gtceu:mv_electric_piston', C: 'immersive_aircraft:engine', - D: 'gtceu:aluminium_single_cable', + D: 'gtceu:copper_single_cable', E: 'gtceu:mv_electric_pump' }).id('tfg:immersive_aircraft/shaped/nether_engine') @@ -408,7 +408,7 @@ function registerImmersiveAircraftRecipes(event) { A: 'gtceu:stainless_steel_plate', B: 'gtceu:hv_electric_piston', C: 'immersive_aircraft:engine', - D: 'gtceu:aluminium_double_cable', + D: 'gtceu:silver_double_cable', E: 'gtceu:hv_electric_pump', }).id('tfg:shaped/hv_aircraft_engine') @@ -419,18 +419,16 @@ function registerImmersiveAircraftRecipes(event) { GTMaterials.Silver, GTMaterials.Steel, GTMaterials.Gold, - GTMaterials.Aluminium, GTMaterials.TinAlloy, GTMaterials.WroughtIron ], [ createMaterialsToResults(TagPrefix.dust, TagPrefix.ingot, 14), createMaterialsToResults(TagPrefix.dust, TagPrefix.ingot, 9), - createMaterialsToResults(TagPrefix.dust, TagPrefix.ingot, 4), + createMaterialsToResults(TagPrefix.dust, TagPrefix.ingot, 5), createMaterialsToResults(TagPrefix.dust, TagPrefix.ingot, 3), createMaterialsToResults(TagPrefix.dust, TagPrefix.ingot, 1), createMaterialsToResults(TagPrefix.dust, TagPrefix.ingot, 1), createMaterialsToResults(TagPrefix.dust, TagPrefix.ingot, 1), - createMaterialsToResults(TagPrefix.dust, TagPrefix.ingot, 1), ]) ) From f2c47c69812c706c214978516c6e4941b9d427d2 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Tue, 20 May 2025 20:08:29 +0500 Subject: [PATCH 43/53] Update ranks.snbt --- defaultconfigs/ftbranks/ranks.snbt | 32 +++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/defaultconfigs/ftbranks/ranks.snbt b/defaultconfigs/ftbranks/ranks.snbt index 16cfe32af..fd653fba8 100644 --- a/defaultconfigs/ftbranks/ranks.snbt +++ b/defaultconfigs/ftbranks/ranks.snbt @@ -3,24 +3,42 @@ name: "Player" power: 1 condition: "always_active" - ftbranks.name_format: "{name}" + ftbranks.name_format: "&a{name}" ftbchunks.max_claimed: 50 ftbchunks.max_force_loaded: 3 + ftbchunks.chunk_load_offline: false command.trashcan: true + command.enderchest: false } vip: { name: "VIP" power: 50 - ftbranks.name_format: "&b{name}&r" - ftbchunks.max_claimed: 150 + ftbranks.name_format: "&e{name}" + ftbchunks.max_claimed: 200 + ftbchunks.max_force_loaded: 5 + ftbchunks.chunk_load_offline: true + } + moderator_girl: { + name: "Moderator" + power: 51 + ftbranks.name_format: "&d{name}" + ftbchunks.max_claimed: 200 + ftbchunks.max_force_loaded: 5 + } + moderator: { + name: "Moderator" + power: 51 + ftbranks.name_format: "&b{name}" + ftbchunks.max_claimed: 200 ftbchunks.max_force_loaded: 5 } admin: { name: "Admin" power: 1000 - condition: "op" - ftbranks.name_format: "&c{name}&r" - ftbchunks.max_claimed: 1000 - ftbchunks.max_force_loaded: 10 + xaero.pac_admin_mode: true + xaero.pac_server_claims: true + ftbranks.name_format: "&c{name}&c" + ftbchunks.max_claimed: 10000 + ftbchunks.max_force_loaded: 10000 } } From d4e4059d6809449815b8c556f039d8a9f652ae7d Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 20 May 2025 23:32:09 +0100 Subject: [PATCH 44/53] added greate to pakku \o/ --- pakku-lock.json | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/pakku-lock.json b/pakku-lock.json index 7354cf5c3..7bc6689b5 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -4138,46 +4138,50 @@ ] }, { - "pakku_id": "JYHQVYwIGQYRij0G", + "pakku_id": "ByQ927ZgDddtDJUH", "pakku_links": [ - "9W4FCgljktwrd38M" + "2wSbyvuI5uFxrZW6", + "0r9Ghrm3IbrHUVzA" ], "type": "MOD", "side": "BOTH", "slug": { - "modrinth": "greate" + "modrinth": "greate", + "curseforge": "greate" }, "name": { - "modrinth": "Greate" + "modrinth": "Greate", + "curseforge": "Greate" }, "id": { - "modrinth": "8wDcQuht" + "modrinth": "8wDcQuht", + "curseforge": "901996" }, "files": [ { - "type": "modrinth", + "type": "curseforge", "file_name": "greate-0.0.38.jar", "mc_versions": [ "1.20.1" ], "loaders": [ - "forge", - "neoforge" + "neoforge", + "forge" ], "release_type": "alpha", - "url": "https://cdn.modrinth.com/data/8wDcQuht/versions/jfXaHhi2/greate-0.0.38.jar", - "id": "jfXaHhi2", - "parent_id": "8wDcQuht", + "url": "https://edge.forgecdn.net/files/6550/719/greate-0.0.38.jar", + "id": "6550719", + "parent_id": "901996", "hashes": { - "sha512": "53a5d9985b31660cac20a708ceb13b1855ae5c3f948c9adf242c37fa6f19b9f03b51a3f566696a922039ecad2a7d6afce962f40f1bae181032d972aca0779d44", - "sha1": "4b3cde954b102e5f5c4b940a42220c2979a5eb70" + "sha1": "4b3cde954b102e5f5c4b940a42220c2979a5eb70", + "md5": "7e7693ac859d986f9b4f5b67185431f2" }, "required_dependencies": [ - "7tG215v7", - "LNytGWDc" + "890405", + "328085" ], "size": 1514248, - "date_published": "2025-02-09T16:31:14.824605Z" + "date_published": "2025-05-20T16:20:12.547Z" } ] }, From b33abc5ba8572a9116084cd8b93dc76368ef40b1 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 21 May 2025 12:23:04 +0100 Subject: [PATCH 45/53] fixes #1053 --- kubejs/server_scripts/createdeco/tags.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kubejs/server_scripts/createdeco/tags.js b/kubejs/server_scripts/createdeco/tags.js index 4c305ebe0..853de5e72 100644 --- a/kubejs/server_scripts/createdeco/tags.js +++ b/kubejs/server_scripts/createdeco/tags.js @@ -15,6 +15,9 @@ const registerCreatedecoItemTags = (event) => { metalBars.forEach(metalBars => { event.add('tfg:metal_bars', `createdeco:${metalBars}_bars`) event.add('tfg:metal_bars', `createdeco:${metalBars}_bars_overlay`) + // The bars are missing mineable tags for some reason + event.add('minecraft:mineable/pickaxe', `createdeco:${metalBars}_bars`) + event.add('minecraft:mineable/pickaxe', `createdeco:${metalBars}_bars_overlay`) }); event.add("createdeco:internal/plates/iron_plates", "#forge:plates/wrought_iron") From f36b590c4e688a0c9557dcfa47766a3b0fc7231f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 21 May 2025 12:33:18 +0100 Subject: [PATCH 46/53] fixes #1056 --- kubejs/server_scripts/firmalife/recipes.js | 18 ++++++++++++++++- kubejs/server_scripts/tfc/recipes.machines.js | 20 +++++++++---------- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index d044f8479..4deca8cf9 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -447,13 +447,20 @@ const registerFirmaLifeRecipes = (event) => { //#region Смешивание в миске // Тесто для пиццы - event.recipes.gtceu.mixer('firmalife:food/pizza_dough') + event.recipes.gtceu.mixer('firmalife:food/pizza_dough_olive_oil') .itemInputs('firmalife:spice/basil_leaves', '#tfc:foods/dough', 'tfc:powder/salt') .inputFluids(Fluid.of('tfc:olive_oil', 1000)) .itemOutputs('4x firmalife:food/pizza_dough') .duration(300) .EUt(16) + event.recipes.gtceu.mixer('firmalife:food/pizza_dough_soybean_oil') + .itemInputs('firmalife:spice/basil_leaves', '#tfc:foods/dough', 'tfc:powder/salt') + .inputFluids(Fluid.of('firmalife:soybean_oil', 1000)) + .itemOutputs('4x firmalife:food/pizza_dough') + .duration(300) + .EUt(16) + // Vanilla Ice Cream event.recipes.gtceu.mixer('firmalife:food/vanilla_ice_cream') .itemInputs('firmalife:ice_shavings', '#tfc:sweetener', 'firmalife:spice/vanilla') @@ -743,4 +750,13 @@ const registerFirmaLifeRecipes = (event) => { .circuit(5) .EUt(GTValues.VA[GTValues.ULV]) .duration(200) + + event.smelting('firmalife:food/dehydrated_soybeans', 'tfc:food/soybean') + + event.recipes.gtce.fermenter('soybean_oil') + .itemInputs('firmalife:food/soybean_paste') + .inputFluids(Fluid.of('minecraft:water', 100)) + .outputFluids(Fluid.of('firmalife:soybean_oil', 250)) + .EUt(GTValues.VA[GTValues.ULV]) + .duration(600) } diff --git a/kubejs/server_scripts/tfc/recipes.machines.js b/kubejs/server_scripts/tfc/recipes.machines.js index e1a66046e..c2c89daa1 100644 --- a/kubejs/server_scripts/tfc/recipes.machines.js +++ b/kubejs/server_scripts/tfc/recipes.machines.js @@ -320,19 +320,19 @@ function registerTFCMachineRecipes(event) { global.TFC_ALCOHOL.forEach(alcohol => { event.recipes.gtceu.fermenter(`tfg:tfc/vinegar/${alcohol.id.replace(':', '_')}`) - .itemInputs('#tfc:foods/fruits') - .inputFluids(Fluid.of(alcohol.id, 250)) - .outputFluids(Fluid.of('tfc:vinegar', 250)) - .duration(600) - .EUt(28) + .itemInputs('#tfc:foods/fruits') + .inputFluids(Fluid.of(alcohol.id, 250)) + .outputFluids(Fluid.of('tfc:vinegar', 250)) + .duration(600) + .EUt(28) }) event.recipes.gtceu.mixer('tfg:tfc/brine') - .inputFluids(Fluid.of('tfc:salt_water', 900)) - .inputFluids(Fluid.of('tfc:vinegar', 100)) - .outputFluids(Fluid.of('tfc:brine', 1000)) - .duration(100) - .EUt(16) + .inputFluids(Fluid.of('tfc:salt_water', 900)) + .inputFluids(Fluid.of('tfc:vinegar', 100)) + .outputFluids(Fluid.of('tfc:brine', 1000)) + .duration(100) + .EUt(16) //#endregion From ea96a6c825df6b4ff694e463374126be78aa490a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 21 May 2025 12:49:04 +0100 Subject: [PATCH 47/53] implements #1049 --- kubejs/server_scripts/tfc/recipes.machines.js | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/kubejs/server_scripts/tfc/recipes.machines.js b/kubejs/server_scripts/tfc/recipes.machines.js index c2c89daa1..bedbd6941 100644 --- a/kubejs/server_scripts/tfc/recipes.machines.js +++ b/kubejs/server_scripts/tfc/recipes.machines.js @@ -505,4 +505,37 @@ function registerTFCMachineRecipes(event) { .category(GTRecipeCategories.MACERATOR_RECYCLING) .duration(20) .EUt(2) + + // Humus and compost + event.recipes.gtceu.extractor('tfg:humus_from_leaves') + .itemInputs('#minecraft:leaves') + .itemOutputs('tfc:groundcover/humus') + .duration(600) + .EUt(2) + + event.recipes.gtceu.extractor('tfg:humus_from_fallen_leaves') + .itemInputs('#tfc:fallen_leaves') + .itemOutputs('tfc:groundcover/humus') + .duration(600) + .EUt(2) + + event.recipes.gtceu.fermenter('tfg:fertilizer_to_compost') + .itemInputs('gtceu:fertilizer') + .itemOutputs('tfc:compost') + .duration(1200) + .EUt(2) + + const BROWNS = [ '16x #tfc:compost_browns/low', '8x #tfc:compost_browns/medium', '4x #tfc:compost_browns/high' ]; + const GREENS = [ '16x #tfc:compost_greens/low', '8x #tfc:compost_greens/medium', '4x #tfc:compost_greens/high' ]; + + let i = 0; + BROWNS.forEach(brown => { + GREENS.forEach(green => { + event.recipes.gtceu.mixer(`tfg:compost_${i++}`) + .itemInputs(brown, green) + .itemOutputs('tfc:compost') + .duration(1200) + .EUt(2) + }) + }) } From 02d784801e1f995646ef0fe2af8c546b50f0b253 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 21 May 2025 12:54:45 +0100 Subject: [PATCH 48/53] maybe #1051 --- kubejs/server_scripts/create/tags.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/kubejs/server_scripts/create/tags.js b/kubejs/server_scripts/create/tags.js index 71fa54f9e..d1e3d5591 100644 --- a/kubejs/server_scripts/create/tags.js +++ b/kubejs/server_scripts/create/tags.js @@ -80,6 +80,12 @@ const registerCreateBlockTags = (event) => { // Disable bulk blasting event.removeAll('create:fan_processing_catalysts/blasting') + // Waters for bulk washing + event.add('create:fan_processing_catalysts/splashing', 'tfc:fluid/river_water') + event.add('create:fan_processing_catalysts/splashing', 'tfc:fluid/salt_water') + event.add('create:fan_processing_catalysts/splashing', 'tfc:fluid/spring_water') + + // Lets the basin be put on top of a charcoal forge event.add('tfc:forge_invisible_whitelist', 'create:basin') } @@ -96,4 +102,9 @@ const registerCreateFluidTags = (event) => { // Disable bulk blasting event.removeAll('create:fan_processing_catalysts/blasting') + + // Waters for bulk washing + event.add('create:fan_processing_catalysts/splashing', 'tfc:river_water') + event.add('create:fan_processing_catalysts/splashing', 'tfc:salt_water') + event.add('create:fan_processing_catalysts/splashing', 'tfc:spring_water') } From 129b701a40f5e7190f8948d3243cdc0dd3bdec50 Mon Sep 17 00:00:00 2001 From: eso Date: Wed, 21 May 2025 09:14:09 -0700 Subject: [PATCH 49/53] disallow inventory tweaks' sort inventory function in tfc screens (#1045) --- config/invtweaks-client.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/invtweaks-client.toml b/config/invtweaks-client.toml index 0949d0f05..bfe04c8fc 100644 --- a/config/invtweaks-client.toml +++ b/config/invtweaks-client.toml @@ -129,6 +129,10 @@ containerClass = "gripe._90.megacells.menu.MEGAInterfaceMenu" sortRange = "" + [[sorting.containerOverrides]] + containerClass = "net.dries007.tfc.client.screen.*" + sortRange = "" + #Tweaks [tweaks] #Enable auto-refill From b2d535b33b74f65d1ed7fe9c2d62ca03d71254ba Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 21 May 2025 20:40:10 +0100 Subject: [PATCH 50/53] actually fixes #1053 --- kubejs/server_scripts/createdeco/tags.js | 19 ++++++++++++------- kubejs/server_scripts/main_server_script.js | 3 ++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/kubejs/server_scripts/createdeco/tags.js b/kubejs/server_scripts/createdeco/tags.js index 853de5e72..bd5a7cb04 100644 --- a/kubejs/server_scripts/createdeco/tags.js +++ b/kubejs/server_scripts/createdeco/tags.js @@ -1,4 +1,6 @@ -const registerCreatedecoItemTags = (event) => { +const metalBars = ['andesite', 'brass', 'iron', 'copper', 'industrial_iron', 'zinc']; + +const registerCreateDecoItemTags = (event) => { //#region Hidden Items global.CREATEDECO_DISABLED_ITEMS.forEach(item => { @@ -10,14 +12,9 @@ const registerCreatedecoItemTags = (event) => { event.remove('createdeco:internal/blocks/iron_blocks', '#forge:storage_blocks/iron') //#region Apply Tags - const metalBars = ['andesite', 'brass', 'iron', 'copper', 'industrial_iron', 'zinc']; - metalBars.forEach(metalBars => { event.add('tfg:metal_bars', `createdeco:${metalBars}_bars`) event.add('tfg:metal_bars', `createdeco:${metalBars}_bars_overlay`) - // The bars are missing mineable tags for some reason - event.add('minecraft:mineable/pickaxe', `createdeco:${metalBars}_bars`) - event.add('minecraft:mineable/pickaxe', `createdeco:${metalBars}_bars_overlay`) }); event.add("createdeco:internal/plates/iron_plates", "#forge:plates/wrought_iron") @@ -48,4 +45,12 @@ const registerCreatedecoItemTags = (event) => { event.add("createdeco:internal/blocks/zinc_blocks", "#forge:storage_blocks/zinc") event.add("createdeco:internal/blocks/andesite_blocks", "#forge:storage_blocks/tin_alloy") //#endregion -}; \ No newline at end of file +}; + +const registerCreateDecoBlockTags = (event) => { + metalBars.forEach(metalBars => { + // The bars are missing mineable tags for some reason + event.add('minecraft:mineable/pickaxe', `createdeco:${metalBars}_bars`) + event.add('minecraft:mineable/pickaxe', `createdeco:${metalBars}_bars_overlay`) + }); +} \ No newline at end of file diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 0745c3183..dc1538047 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -18,7 +18,7 @@ ServerEvents.tags('item', event => { registerCreateItemTags(event) registerCreateAdditionsItemTags(event) registerCreateConnectedItemTags(event) - registerCreatedecoItemTags(event) + registerCreateDecoItemTags(event) registerDiggerHelmetItemTags(event) registerEndermanOverhaulItemTags(event) registerEveryCompatItemTags(event) @@ -57,6 +57,7 @@ ServerEvents.tags('block', event => { registerComputerCraftBlockTags(event) registerCreateBlockTags(event) registerCreateAdditionsBlockTags(event) + registerCreateDecoBlockTags(event) registerDomumOrnamentumBlockTags(event) registerEndermanOverhaulBlockTags(event) registerExtendedAE2BlockTags(event) From 68acb6b7c1f9b28749d86358d27ba5cefea21007 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 21 May 2025 20:50:37 +0100 Subject: [PATCH 51/53] properly fixes #1049 --- kubejs/server_scripts/tfc/recipes.machines.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/kubejs/server_scripts/tfc/recipes.machines.js b/kubejs/server_scripts/tfc/recipes.machines.js index bedbd6941..bfda4437b 100644 --- a/kubejs/server_scripts/tfc/recipes.machines.js +++ b/kubejs/server_scripts/tfc/recipes.machines.js @@ -520,13 +520,13 @@ function registerTFCMachineRecipes(event) { .EUt(2) event.recipes.gtceu.fermenter('tfg:fertilizer_to_compost') - .itemInputs('gtceu:fertilizer') + .itemInputs('4x gtceu:fertilizer') .itemOutputs('tfc:compost') .duration(1200) .EUt(2) - const BROWNS = [ '16x #tfc:compost_browns/low', '8x #tfc:compost_browns/medium', '4x #tfc:compost_browns/high' ]; - const GREENS = [ '16x #tfc:compost_greens/low', '8x #tfc:compost_greens/medium', '4x #tfc:compost_greens/high' ]; + const BROWNS = [ '16x #tfc:compost_browns_low', '4x #tfc:compost_browns_high' ]; + const GREENS = [ '16x #tfc:compost_greens_low', '4x #tfc:compost_greens_high' ]; let i = 0; BROWNS.forEach(brown => { @@ -538,4 +538,10 @@ function registerTFCMachineRecipes(event) { .EUt(2) }) }) + + event.recipes.gtceu.centrifuge('tfg:soot') + .itemInputs('tfc:soot') + .itemOutputs('#forge:dusts/carbon') + .duration(20) + .EUt(2) } From 4cac0114cd8fb2a5087e40033ee3fbb17f0f607a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 21 May 2025 20:50:49 +0100 Subject: [PATCH 52/53] fixes soybean oil --- kubejs/server_scripts/firmalife/recipes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 4deca8cf9..257b3c329 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -753,7 +753,7 @@ const registerFirmaLifeRecipes = (event) => { event.smelting('firmalife:food/dehydrated_soybeans', 'tfc:food/soybean') - event.recipes.gtce.fermenter('soybean_oil') + event.recipes.gtceu.fermenter('soybean_oil') .itemInputs('firmalife:food/soybean_paste') .inputFluids(Fluid.of('minecraft:water', 100)) .outputFluids(Fluid.of('firmalife:soybean_oil', 250)) From 8b74494747c9f7f333b4bc321bdf278d249d6164 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 21 May 2025 20:57:47 +0100 Subject: [PATCH 53/53] changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9901be5b..f49c31f40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## [Unreleased] ### Changes +- Disabled ability to sort items in the crucible and vessels, which let you stack things that shouldn't be stacked. (#1045) @esotericist +- Other TFC waters also work for bulk washing now. (#1051) @Pyritie +- Added machine recipes for compost and humus. (#1049) @Pyritie +- You can now also use soybean oil to make pizza dough via machines. (#1056) @Pyritie +- Create Deco's metal bars are now breakable with a pickaxe. (#1053) @Pyritie +- Aircraft engine recipes now use the correct tier cables. @Pyritie ## [0.9.8] - 19.05.2025 ### Changes