Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tooltips, texture updates (and alltheleaks) #1170

Merged
merged 4 commits into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions config/alltheleaks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"preventSearchIgnoredItems": false,
"ingredientDedupe": false,
"resourceLocationDedupe": false
}
6 changes: 3 additions & 3 deletions config/ftbquests/quests/chapters/into_the_microverse.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -1069,7 +1069,7 @@
y: -8.5d
}
{
dependencies: ["555BEBF7FD6012B7"]
dependencies: ["77582C534A994D7C"]
description: [
"With access to &6Crystaltine components&r, &3Auto Crafting Tables&r are now an option for automation of any size of crafting table - including 3x3."
""
Expand Down Expand Up @@ -1117,8 +1117,8 @@
type: "item"
}]
title: "Auto Crafting Tables"
x: -3.0d
y: -8.25d
x: -1.5d
y: -8.0d
}
]
title: "Into The Microverse"
Expand Down
2 changes: 1 addition & 1 deletion config/ftbquests/quests/chapters/late_game.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -2669,7 +2669,7 @@
description: [
"Interestingly enough, &eSculk itself functions great as a biobattery&r, being able to store and quickly release mass amounts of energy. The &3Sculk Charger&r should be able to get you started in taking advantage of it."
""
"To use it, set the recipe in the same way you would for an &3Auto Crafting Table&r, then place an inventory (such as a Barrel) on top, and connect power to &eboth the charger and a nearby pylon&r. Items can be extacted from the charger in any manner."
"[\"They are automated in the same way as Autocrafting tables, refer to \", {\"text\": \"this quest\", \"underlined\": \"true\", \"clickEvent\": { \"action\": \"change_page\", \"value\": \"0DB8063A7972E1C0\" } },\" for how to automate it.\"]"
""
"The charger and pylon themselves &ehave extreme throughput&r, so don't worry about having to wait for it to craft items."
]
Expand Down
54 changes: 54 additions & 0 deletions kubejs/assets/extendedcrafting/models/block/flux_alternator.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"credit": "Made with Blockbench",
"textures": {
"0": "extendedcrafting:block/flux_alternator_base_side",
"1": "extendedcrafting:block/flux_alternator_base_top",
"2": "extendedcrafting:block/redstone_ingot_block",
"3": "extendedcrafting:block/flux_alternator_side",
"4": "extendedcrafting:block/flux_alternator_top",
"particle": "extendedcrafting:block/redstone_ingot_block"
},
"elements": [
{
"name": "Cube",
"from": [0, 0, 0],
"to": [16, 9, 16],
"faces": {
"north": {"uv": [0, 7, 16, 16], "texture": "#0"},
"east": {"uv": [0, 7, 16, 16], "texture": "#0"},
"south": {"uv": [0, 7, 16, 16], "texture": "#0"},
"west": {"uv": [0, 7, 16, 16], "texture": "#0"},
"up": {"uv": [0, 0, 16, 16], "texture": "#1"},
"down": {"uv": [0, 0, 16, 16], "texture": "#2"}
}
},
{
"name": "Cube",
"from": [4, 9, 5],
"to": [12, 16, 11],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 3, 1]},
"faces": {
"north": {"uv": [6, 0, 14, 7], "texture": "#3"},
"east": {"uv": [0, 0, 6, 7], "texture": "#3"},
"south": {"uv": [6, 0, 14, 7], "texture": "#3"},
"west": {"uv": [0, 0, 6, 7], "texture": "#3"},
"up": {"uv": [0, 0, 6, 8], "rotation": 90, "texture": "#4"},
"down": {"uv": [0, 0, 6, 8], "rotation": 90, "texture": "#4"}
}
},
{
"name": "Cube",
"from": [5, 9, 4],
"to": [11, 15.999, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [2, -6, 1]},
"faces": {
"north": {"uv": [0, 0, 6, 7], "texture": "#3"},
"east": {"uv": [6, 0, 14, 7], "texture": "#3"},
"south": {"uv": [0, 0, 6, 7], "texture": "#3"},
"west": {"uv": [6, 0, 14, 7], "texture": "#3"},
"up": {"uv": [6, 0, 14, 6], "rotation": 90, "texture": "#4", "cullface": "up"},
"down": {"uv": [6, 0, 14, 6], "rotation": 90, "texture": "#4"}
}
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"animation": {
"frametime": 20,
"frametime": 80,
"interpolate": true
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"frametime": 10,
"interpolate": true
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"frametime": 80,
"interpolate": true
}
}
Binary file modified kubejs/assets/extendedcrafting/textures/block/flux_crafter_side.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"animation": {
"frametime": 20,
"frametime": 80,
"interpolate": true
}
}
Binary file modified kubejs/assets/extendedcrafting/textures/block/flux_crafter_top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"frametime": 80,
"interpolate": true
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion kubejs/assets/kubejs/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@
"extendedcrafting.auto_flux_crafter.tooltip": "§7Uses large amounts of energy to convert Sculk into Sculk Cores.",
"extendedcrafting.flux_alternator.tooltip": "§7Provides Energy to the Sculk Charger, from up to 3 blocks away.",
"extendedcrafting.auto_table.tooltip.1": "§7Cannot be inserted into!",
"extendedcrafting.auto_table.tooltip.2": "§7Put items in an inventory atop the table instead.",
"extendedcrafting.auto_table.tooltip.2": "§7Read Questbook to see how to automate!",
"kubejs.excitationcoil.tooltip": "§7Used for Crafting.",
"gtceu.terminal.tooltip": "§7Can autobuild multiblocks by shift-right-clicking a controller.",
"gtceu.prospector.tooltip.1": "§7Only shows ores in the immediate vicinity.",
Expand All @@ -470,6 +470,8 @@
"gtceu.wood_pipe_warning.tooltip": "§4Can't hold Steam or other gases!",
"chipped.workbenches.tooltip.1": "§7Recipes can also be performed in the §3Stonecutter§7,",
"chipped.workbenches.tooltip.2": "§7which can be automated with §bAE2§7's §3Molecular Assemblers§7.",
"packagedexcrafting.crafterspeed.tooltip": "Slower than autotables, but can support up to 20 recipes at once.",

"tempad.tempad.tooltip": "§6Uses Monipennies as fuel"
}

3 changes: 3 additions & 0 deletions kubejs/client_scripts/JEI.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ JEIEvents.hideItems(event => {
event.hide([Item.of('extendedcrafting:recipe_maker', '{Shapeless:0b,Type:"CraftTweaker"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:tin"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:copper"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:iron"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:coal"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:steel"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:invar"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:silver"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:platinum"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:lead"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:glowstone"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:lapis_lazuli"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:electrum"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:redstone"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:aluminum"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:diamond"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:nickel"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:gold"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:emerald"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:bronze"}')])
event.hide(['extendedcrafting:enhanced_ender_catalyst', 'extendedcrafting:enhanced_redstone_catalyst', 'extendedcrafting:enhanced_redstone_component', 'extendedcrafting:enhanced_ender_component', 'extendedcrafting:ender_component', 'extendedcrafting:black_iron_block', 'extendedcrafting:black_iron_ingot', 'extendedcrafting:redstone_ingot_block', 'extendedcrafting:redstone_ingot', 'extendedcrafting:enhanced_redstone_ingot_block', 'extendedcrafting:enhanced_redstone_ingot', 'extendedcrafting:ender_ingot_block', 'extendedcrafting:ender_ingot', 'extendedcrafting:enhanced_ender_ingot_block', 'extendedcrafting:enhanced_ender_ingot', 'extendedcrafting:ender_star_block', 'extendedcrafting:ender_star', 'extendedcrafting:flux_star_block', 'extendedcrafting:flux_star', 'extendedcrafting:frame', 'extendedcrafting:compressor', 'extendedcrafting:ender_alternator', 'extendedcrafting:ender_crafter', 'extendedcrafting:auto_ender_crafter', 'extendedcrafting:flux_crafter', 'extendedcrafting:black_iron_slate', 'extendedcrafting:ender_catalyst'])
event.hide(['extendedcrafting:black_iron_nugget', 'extendedcrafting:redstone_nugget', 'extendedcrafting:enhanced_redstone_nugget', 'extendedcrafting:ender_nugget', 'extendedcrafting:enhanced_ender_nugget'])

// PEX
event.hide('packagedexcrafting:ender_crafter')

//Thermal
event.hide(['thermal:dynamo_stirling', 'thermal:dynamo_gourmand', 'thermal:dynamo_disenchantment', 'thermal:dynamo_lapidary', 'systeams:numismatic_boiler', 'systeams:magmatic_boiler', 'systeams:compression_boiler', 'systeams:gourmand_boiler', 'systeams:lapidary_boiler', 'systeams:disenchantment_boiler'])
Expand Down
9 changes: 8 additions & 1 deletion kubejs/client_scripts/tooltips.js
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,14 @@ ItemEvents.tooltip(tooltip => {
text.add(2, Text.translatable('chipped.workbenches.tooltip.2'))
})


// Note about PEX crafter speed
tooltip.add([
'packagedexcrafting:advanced_crafter',
'packagedexcrafting:elite_crafter',
'packagedexcrafting:ultimate_crafter',
'packagedexexcrafting:epic_crafter'
], Text.translatable("packagedexcrafting.crafterspeed.tooltip"))

// Tempad
if (Platform.isLoaded('tempad')) {
tooltip.add('tempad:tempad', Text.translatable("tempad.tempad.tooltip"))
Expand Down
2 changes: 2 additions & 0 deletions kubejs/server_scripts/Early_Game.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ ServerEvents.recipes(event => {
H: 'gtceu:ulv_machine_hull'
}
).id('gtceu:shaped/pyrolyse_oven')
event.remove({ id: 'gtceu:arc_furnace/arc_pyrolyse_oven' })
event.remove({ id: 'gtceu:macerator/macerate_pyrolyse_oven' })

//Toolbelts
event.replaceInput({ output: 'toolbelt:pouch' }, 'minecraft:gold_ingot', 'gtceu:steel_ingot')
Expand Down
5 changes: 5 additions & 0 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -1005,6 +1005,11 @@
"projectID": 1059350,
"required": true
},
{
"fileID": 5936734,
"projectID": 1091339,
"required": true
},
{
"fileID": 4646817,
"projectID": 296996,
Expand Down