Skip to content
Open
Show file tree
Hide file tree
Changes from 6 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
2 changes: 1 addition & 1 deletion config/ftbquests/quests/chapters/3__electrical_age.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -7528,7 +7528,7 @@
type: "item"
}
]
x: 21.0d
x: 16.5d
y: 12.0d
}
{
Expand Down
2 changes: 1 addition & 1 deletion config/ftbquests/quests/chapters/4__digital_age.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -4330,7 +4330,7 @@
}
{
dependencies: ["759E99871B529567"]
description: ["While powerful, the &aBoss Crusher&r isn't perfect. Killing the &cWither&r doesn't produce a pristine &dNether Star&r as if you killed it normally. Instead you only will receive &2500mB&r of &2Impure Liquid Nether Star&r per &dWither model&r. This will need to be purified before it can be used."]
description: ["While powerful, the &aBoss Crusher&r isn't perfect. Killing the &cWither&r doesn't produce a pristine &dNether Star&r as if you killed it normally. Instead you only will receive &21250mB&r of &2Impure Liquid Nether Star&r per &dWither model&r. This will need to be purified before it can be used."]
id: "181D80626F6D57FB"
rewards: [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,8 @@
{ item: "ironchests:netherite_barrel" }
{ item: "ironchests:crystal_barrel" }
{ item: "ironchests:gold_barrel" }
{ item: "ironchests:diamond_barrel" }
{ item: "ironchests:diamond_barrel" },
{ count: 2, item: "ae2things:disk_housing" }
]
title: "Chapter 3 Rare Rewards"
use_title: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ Ponder.registry((event) => {
addText(scene, 120, 'Hatches can only go on the same layer as the controller', PonderPalette.WHITE, [6.0, 3.0, 8.0]);

buildUpSlice(scene, size.width, size.depth, 3, 19, 1);
addText(scene, 120, 'You\re going to want to use the wrench preview for this one...', PonderPalette.BLUE, [5.0, 3.0, 8.0]);
addText(scene, 120, 'You\'re going to want to use the wrench preview for this one...', PonderPalette.BLUE, [5.0, 3.0, 8.0]);
});
})
30 changes: 26 additions & 4 deletions kubejs/client_scripts/rei.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ REIEvents.hide('item', e => {
tr('heliumplasma'),
tr('helium3'),
tr('helium'),
tr('titanium_small_dust'),
tr('alloy_smelter'),
tr('iron_alloy_furnace'),
tr('saw_dust'),
Expand Down Expand Up @@ -194,11 +193,14 @@ REIEvents.hide('item', e => {
tr('insulated_gold_cable'),
tr('insulated_hv_cable'),
tr('superconductor_cable'),
tr('steel_small_dust'),
tr('wire_mill'),
tr('rock_cutter'),
tr('clay_dust'),
tr('clay_small_dust'),
tr('sapphire_plate'),
tr('yellow_garnet_plate'),
tr('ruby_plate'),
tr('redstone_plate'),
tr('red_garnet_plate'),
tr('quartz_small_dust'),
vh('wooden_hammer'),
vh('stone_hammer'),
vh('ender_hammer'),
Expand All @@ -210,6 +212,26 @@ REIEvents.hide('item', e => {
vh('slime_hammer')
];
REI_DELETED_ITEMS.forEach(id => e.hide(id));

// -- TR UNUSED (SMALL)DUST -- //
const DUST_NAMES = [
'yellow_garnet',
'uvarovite',
'phosphorous',
'olivine',
'grossular',
'olivine',
'flint',
'ender_eye',
'basalt',
'andradite',
'phosphorous',
'clay'
];
DUST_NAMES.forEach(clayName => {
e.hide(tr(`${clayName}_dust`));
e.hide(tr(`${clayName}_small_dust`));
});
});

REIEvents.removeCategories(e => {
Expand Down
8 changes: 6 additions & 2 deletions kubejs/client_scripts/tooltips.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,16 @@ ItemEvents.tooltip(e => {
];

// -- ADD TOOLTIP TO ALL MACHINES IN LIST -- //
const ADDED_BY_STATECH = Text.gold('Added by StaTech Industry');
CUSTOM_MACHINES.forEach(item => {
e.addAdvanced(item, (item, adv, text) => {
text.add(Text.gold('Added by StaTech Industry'));
text.remove(ADDED_BY_STATECH);
text.add(ADDED_BY_STATECH);
});
});
e.addAdvanced(kj('clear_glass'), (item, adv, text) => {
text.add(Text.yellow('Completely see through when placed'));
const SEE_THROUGH = Text.yellow('Completely see through when placed');
text.remove(SEE_THROUGH);
text.add(SEE_THROUGH);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ ServerEvents.recipes(e => {
mi('materials/emerald/compressor/main'),
mi('materials/tungstensteel/compressor/main'),
mi('compat/techreborn/compressor/_c_zinc_ingots_to_techreborn_zinc_plate'),
mi('compat/techreborn/compressor/_c_sapphire_dusts_to_techreborn_sapphire_plate'),
mi('compat/techreborn/compressor/_c_ruby_dusts_to_techreborn_ruby_plate'),
mi('compat/techreborn/compressor/minecraft_redstone_block_to_techreborn_redstone_plate'),
mi('compat/techreborn/compressor/techreborn_red_garnet_dust_to_techreborn_red_garnet_plate'),
mi('compressor/calorite_ingot_to_plate'),
mi('vanilla_recipes/compressor/paper_with_sugarcane'),
mi('compressor/desh_ingot_to_plate'),
Expand Down
39 changes: 38 additions & 1 deletion kubejs/server_scripts/mods/techreborn.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,18 @@ ServerEvents.recipes(e => {
tr('crafting_table/armor/quantum_leggings'),
tr('crafting_table/armor/quantum_boots'),
tr('crafting_table/uu_matter/ore/iridium_ore'),
tr('crafting_table/uu_matter/ore/deepslate_iridium_ore')
tr('crafting_table/uu_matter/ore/deepslate_iridium_ore'),
//unused small dusts
tr('scrapbox/auto/yellow_garnet_small_dust'),
tr('scrapbox/auto/uvarovite_small_dust'),
tr('scrapbox/auto/phosphorous_small_dust'),
tr('scrapbox/auto/olivine_small_dust'),
tr('scrapbox/auto/grossular_small_dust'),
tr('scrapbox/auto/flint_small_dust'),
tr('scrapbox/auto/ender_eye_small_dust'),
tr('scrapbox/auto/basalt_small_dust'),
tr('scrapbox/auto/andradite_small_dust'),
tr('scrapbox/auto/phosphorous_small_dust')
];
DELETED_RECIPES.forEach(id => e.remove({id: id}));

Expand Down Expand Up @@ -897,6 +908,32 @@ ServerEvents.recipes(e => {
// -- LEAD INGOT FROM GALENA DUST -- //
e.smelting(mi('lead_ingot'), tr('galena_dust'), 0.7);
e.blasting(mi('lead_ingot'), tr('galena_dust'), 0.7);

// -- MISSING DUST FROM SMALL DUST -- //
e.shapeless(mi('tungsten_dust'), [
tr('tungsten_small_dust'),
tr('tungsten_small_dust'),
tr('tungsten_small_dust'),
tr('tungsten_small_dust')
]);
e.shapeless(mi('electrum_dust'), [
tr('electrum_small_dust'),
tr('electrum_small_dust'),
tr('electrum_small_dust'),
tr('electrum_small_dust')
]);
e.shapeless(mi('chromium_dust'), [
tr('chrome_small_dust'),
tr('chrome_small_dust'),
tr('chrome_small_dust'),
tr('chrome_small_dust')
]);
e.shapeless(mi('invar_dust'), [
tr('invar_small_dust'),
tr('invar_small_dust'),
tr('invar_small_dust'),
tr('invar_small_dust')
]);
});

ServerEvents.tags('item', e => {
Expand Down
3 changes: 2 additions & 1 deletion kubejs/startup_scripts/statech/food.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ StartupEvents.registry('item', e => {
e.create('bottle_cap')
.displayName('Bottle Cap')
.rarity('Epic')
.tooltip('§aSome far-off land might have\nused this as currency');
.tooltip('§aSome far-off land might have')
.tooltip('§aused this as currency');

e.create('nuka_cola')
.displayName('Nuka Cola')
Expand Down