illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove modrinth baguettelib, update greate, add vintage improvements kubejs mod, fix all the greate rose quartz namespace changes

Browse source
This commit is contained in:
Pyritie 2025-12-14 15:35:22 +00:00
parent fe1b8585da
commit eb55f20a43
22 changed files with 224 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kubejs/server_scripts/greate/recipes.js
View file

@ -637,7 +637,6 @@ function registerGreateRecipes(event) {
// #region Belt Connector
// Wood
/*
event.shaped('greate:andesite_alloy_belt_connector', [
'AAA',
'CBC',
@ -677,7 +676,7 @@ function registerGreateRecipes(event) {
event.remove({ id: 'gtceu:shaped/stone_belt_connector' })
TFGHelpers.registerMaterialInfo('greate:stone_belt_connector', { 'air': 1 });
*/
// Rubber
event.shaped('greate:rubber_belt_connector', [
'AAA',
@ -727,7 +726,6 @@ function registerGreateRecipes(event) {
TFGHelpers.registerMaterialInfo('greate:silicone_rubber_belt_connector', { 'silicone_rubber': 3 });
// SBR rubber
/*
event.shaped('greate:styrene_butadiene_rubber_belt_connector', [
'AAA',
'B C'
@ -750,7 +748,6 @@ function registerGreateRecipes(event) {
event.remove({ id: 'gtceu:extractor/extract_styrene_butadiene_rubber_belt_connector' })
TFGHelpers.registerMaterialInfo('greate:styrene_butadiene_rubber_belt_connector', { 'styrene_butadiene_rubber': 3 });
*/
// #endregion
// #region Mixer

14
kubejs/server_scripts/gregtech/recipes.materials.js
View file

@ -799,8 +799,10 @@ function registerGTCEUMetalRecipes(event) {
let chipped = ChemicalHelper.get(TagPrefix.gemChipped, material, 1)
let smallDust = ChemicalHelper.get(TagPrefix.dustSmall, material, 1)
let namespace = material === $GreateMaterials.RoseQuartz ? 'greate' : 'gtceu';
event.recipes.tfc.damage_inputs_shapeless_crafting(event.recipes.minecraft.crafting_shapeless(
`gtceu:${material.getName()}_bud_indicator`, [gem, '#tfc:chisels']))
`${namespace}:${material.getName()}_bud_indicator`, [gem, '#tfc:chisels']))
.id(`shapeless/${material.getName()}_bud_indicator`)
event.shaped(smallDust,
@ -1184,13 +1186,15 @@ function registerGTCEUMetalRecipes(event) {
removeMaceratorRecipe(event, `macerate_iv_${material.getName()}_wirecutter`)
event.remove({ id: `gtceu:arc_furnace/arc_iv_${material.getName()}_wirecutter` })
}
const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials")
forEachMaterial(material => {
// greate moment
if (material === GTMaterials.get("andesite_alloy")
|| material === GTMaterials.get("refined_radiance")
|| material === GTMaterials.get("shadow_steel")
|| material === GTMaterials.get("chromatic_compound")
if (material === $GreateMaterials.AndesiteAlloy
|| material === $GreateMaterials.RefinedRadiance
|| material === $GreateMaterials.ShadowSteel
|| material === $GreateMaterials.ChromaticCompound
|| material === GTMaterials.DamascusSteel)
{ return; }

1
kubejs/server_scripts/tfc/tags.js
View file

@ -70,6 +70,7 @@ function registerTFCItemTags(event) {
"framedblocks:framed_hammer",
"framedblocks:framed_key",
"mcw_tfc_aio:roofing_hammer",
"mcw_tfc_aio:pliers",
"tfclunchbox:lunchbox",
"tfclunchbox:cooling_lunchbox",
"tfclunchbox:electric_lunchbox",

2
kubejs/server_scripts/tfg/json_tool.armor_trim.js
View file

@ -48,7 +48,7 @@ const materials = [
{materialName: 'red_garnet_tfc', nameColor: '#710910', itemName: 'gtceu:exquisite_red_garnet_gem', indexNumber: 0.177},
{materialName: 'yellow_garnet_tfc', nameColor: '#bbc207', itemName: 'gtceu:exquisite_yellow_garnet_gem', indexNumber: 0.178},
{materialName: 'monazite_tfc', nameColor: '#9eb576', itemName: 'gtceu:exquisite_monazite_gem', indexNumber: 0.179},
{materialName: 'rose_quartz_tfc', nameColor: '#ba3458', itemName: 'gtceu:exquisite_rose_quartz_gem', indexNumber: 0.161},
{materialName: 'rose_quartz_tfc', nameColor: '#ba3458', itemName: 'greate:exquisite_rose_quartz_gem', indexNumber: 0.161},
{materialName: 'fluix_tfc', nameColor: '#53458d', itemName: 'tfg:exquisite_fluix_gem', indexNumber: 0.162},
//Metals
{materialName: 'silver_tfc', nameColor: '#d8d8f4', itemName: 'vintageimprovements:silver_sheet', indexNumber: 0.162},

33
kubejs/server_scripts/tfg/ores_and_materials/loot.ores.js
View file

@ -34,8 +34,7 @@ const STONE_TYPES_TO_COBBLE = {
permafrost: 'gtceu:ice_dust'
}
const registerTFGOreLoots = (event) => {
const registerTFGOreLoots = (event) => {
// Have to define these here because normal loot table jsons don't support checking for hammers
// Crush raw rock into cobble
@ -61,8 +60,10 @@ const registerTFGOreLoots = (event) => {
LootEntry.of('tfg:rock/cobble_blackstone'),
LootEntry.of('tfc:powder/native_gold')
)
// Go through all materials
const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials")
forEachMaterial(material => {
if (material.hasProperty(PropertyKey.ORE)) {
@ -72,6 +73,9 @@ const registerTFGOreLoots = (event) => {
let sawDrop = ChemicalHelper.get(TagPrefix.gem, material, 1)
let bud = `gtceu:${material.getName()}_bud_indicator`;
if (material === $GreateMaterials.RoseQuartz) {
bud = 'greate:rose_quartz_bud_indicator';
}
event.addBlockLootModifier(bud)
.matchMainHand("tfc:gem_saw")
@ -89,23 +93,25 @@ const registerTFGOreLoots = (event) => {
// I LOVE LOOTJS I LOVE LOOTJS I LOVE LOOTJS
let rawOreBlock = `:${ChemicalHelper.get(TagPrefix.rawOreBlock, material, 1).getItem()}`;
if (material === GTMaterials.Copper || material === GTMaterials.Gold || material === GTMaterials.Iron) {
rawOreBlock = `minecraft${ rawOreBlock}`;
rawOreBlock = `minecraft${rawOreBlock}`;
} else if (material === TFGHelpers.getMaterial('desh')
|| material === TFGHelpers.getMaterial('ostrum')
|| material === TFGHelpers.getMaterial('calorite')) {
rawOreBlock = `ad_astra${ rawOreBlock}`;
rawOreBlock = `ad_astra${rawOreBlock}`;
} else if (material === $GreateMaterials.RoseQuartz) {
rawOreBlock = `greate${rawOreBlock}`;
} else {
rawOreBlock = `gtceu${ rawOreBlock}`;
rawOreBlock = `gtceu${rawOreBlock}`;
}
event.addBlockLootModifier(rawOreBlock)
.removeLoot(ItemFilter.ALWAYS_TRUE)
.addWeightedLoot([4, 6],
[
richRawOre.withChance(0.2),
normalRawOre.withChance(0.6),
poorRawOre.withChance(0.2)
]);
[
richRawOre.withChance(0.2),
normalRawOre.withChance(0.6),
poorRawOre.withChance(0.2)
]);
// Stone ores
global.ORE_BEARING_STONES.forEach(stoneType => {
@ -121,9 +127,10 @@ const registerTFGOreLoots = (event) => {
}
let stoneTypeDust = ChemicalHelper.get(TagPrefix.dust, stoneTypeMaterial, 1)
let namespace = material === $GreateMaterials.RoseQuartz ? 'greate' : 'gtceu';
// break with pickaxe/mining hammer/drill/mining machine
event.addBlockLootModifier(`gtceu:${stoneType}_${material.getName()}_ore`)
event.addBlockLootModifier(`${namespace}:${stoneType}_${material.getName()}_ore`)
.removeLoot(ItemFilter.ALWAYS_TRUE)
.addWeightedLoot([
richRawOre.withChance(0.2),
@ -135,7 +142,7 @@ const registerTFGOreLoots = (event) => {
)
// break with hammer
event.addBlockLootModifier(`gtceu:${stoneType}_${material.getName()}_ore`)
event.addBlockLootModifier(`${namespace}:${stoneType}_${material.getName()}_ore`)
.matchMainHand('#forge:tools/hammers')
.addLoot(STONE_TYPES_TO_COBBLE[stoneType]);
})

8
kubejs/server_scripts/tfg/ores_and_materials/recipes.quartzes.js
View file

@ -6,8 +6,8 @@ function registerTFGQuartzRecipes(event) {
event.remove({ id: 'gtceu:autoclave/autoclave_dust_rose_quartz_water' })
event.remove({ id: 'gtceu:autoclave/autoclave_dust_rose_quartz_distilled' })
generateMixerRecipe(event, ['gtceu:nether_quartz_dust', '8x minecraft:redstone'], [], '9x gtceu:rose_quartz_dust', 2, [], 180, 60, 64, 'rose_quartz_dust_mixing')
generateMixerRecipe(event, ['gtceu:tiny_nether_quartz_dust', '8x gtceu:tiny_redstone_dust'], [], 'gtceu:rose_quartz_dust', 2, [], 20, 60, 64, 'tiny_rose_quartz_dust_mixing')
generateMixerRecipe(event, ['gtceu:nether_quartz_dust', '8x minecraft:redstone'], [], '9x #forge:dusts/rose_quartz', 2, [], 180, 60, 64, 'rose_quartz_dust_mixing')
generateMixerRecipe(event, ['gtceu:tiny_nether_quartz_dust', '8x gtceu:tiny_redstone_dust'], [], '#forge:dusts/rose_quartz', 2, [], 20, 60, 64, 'tiny_rose_quartz_dust_mixing')
event.recipes.gtceu.autoclave("autoclave_dust_rose_quartz_ice")
.itemInputs('#forge:dusts/rose_quartz')
@ -17,8 +17,8 @@ function registerTFGQuartzRecipes(event) {
.EUt(120)
event.recipes.gtceu.electrolyzer('electrolyze_rose_quartz_dust')
.itemInputs('9x gtceu:rose_quartz_dust')
.itemOutputs('1x gtceu:nether_quartz_dust', '8x minecraft:redstone')
.itemInputs('9x #forge:dusts/rose_quartz')
.itemOutputs('1x #forge:dusts/nether_quartz', '8x minecraft:redstone')
.duration(7 * 20)
.EUt(60)
//#endregion

18
kubejs/server_scripts/tfg/recipes.temporary.js
View file

@ -10,6 +10,24 @@ function registerTFGTemporaryRecipes(event) {
event.shapeless('tfg:ostrum_linear_accelerator', 'gtceu:ostrum_linear_accelerator')
event.shapeless('greate:rose_quartz_dust', 'gtceu:rose_quartz_dust')
event.shapeless('greate:tiny_rose_quartz_dust', 'gtceu:tiny_rose_quartz_dust')
event.shapeless('greate:small_rose_quartz_dust', 'gtceu:small_rose_quartz_dust')
event.shapeless('greate:poor_raw_rose_quartz', 'gtceu:poor_raw_rose_quartz')
event.shapeless('greate:raw_rose_quartz', 'gtceu:raw_rose_quartz')
event.shapeless('greate:rich_raw_rose_quartz', 'gtceu:rich_raw_rose_quartz')
event.shapeless('greate:chipped_rose_quartz_gem', 'gtceu:chipped_rose_quartz_gem')
event.shapeless('greate:flawed_rose_quartz_gem', 'gtceu:flawed_rose_quartz_gem')
event.shapeless('greate:flawless_rose_quartz_gem', 'gtceu:flawless_rose_quartz_gem')
event.shapeless('greate:exquisite_rose_quartz_gem', 'gtceu:exquisite_rose_quartz_gem')
event.shapeless('greate:pure_rose_quartz_dust', 'gtceu:pure_rose_quartz_dust')
event.shapeless('greate:impure_rose_quartz_dust', 'gtceu:impure_rose_quartz_dust')
event.shapeless('greate:purified_rose_quartz_ore', 'gtceu:purified_rose_quartz_ore')
event.shapeless('greate:crushed_rose_quartz_ore', 'gtceu:crushed_rose_quartz_ore')
event.shapeless('greate:refined_rose_quartz_ore', 'gtceu:refined_rose_quartz_ore')
event.shapeless('greate:rose_quartz_lens', 'gtceu:rose_quartz_lens')
event.shapeless('greate:rose_quartz_plate', 'gtceu:rose_quartz_plate')
// TODO: remove nether/ender air in 0.12

60
kubejs/server_scripts/vintage_improvements/recipes.js
View file

@ -258,9 +258,9 @@ function registerVintageImprovementsRecipes(event) {
})
// #endregion
const $GreateMaterials = Java.loadClass("electrolyte.greate.registry.GreateMaterials")
forEachMaterial(material => {
if (material == GTMaterials.get("andesite_alloy"))
if (material == $GreateMaterials.AndesiteAlloy)
return;
const ingotItem = ChemicalHelper.get(TagPrefix.ingot, material, 1);
@ -330,38 +330,18 @@ function registerVintageImprovementsRecipes(event) {
let highYield = material.hasFlag(MaterialFlags.HIGH_SIFTER_OUTPUT)
// aaaaargh I hate these custom type recipes
let gem = `gtceu:${material.getName()}_gem`;
if (material === GTMaterials.Coal)
gem = 'minecraft:coal'
else if (material === GTMaterials.Diamond)
gem = 'minecraft:diamond'
else if (material === GTMaterials.Emerald)
gem = 'minecraft:emerald'
else if (material === GTMaterials.Lapis)
gem = 'minecraft:lapis_lazuli'
else if (material === GTMaterials.NetherQuartz)
gem = 'minecraft:quartz'
else if (material === GTMaterials.Amethyst)
gem = 'minecraft:amethyst_shard'
else if (material === GTMaterials.CertusQuartz)
gem = 'ae2:certus_quartz_crystal'
else if (material === TFGHelpers.getMaterial('rose_quartz'))
gem = 'create:rose_quartz'
event.custom({
type: 'vintageimprovements:vibrating',
ingredients: [{ item: `gtceu:purified_${material.getName()}_ore` }],
results: [
{ item: `gtceu:exquisite_${material.getName()}_gem`, chance: highYield ? 0.05 : 0.03 },
{ item: `gtceu:flawless_${material.getName()}_gem`, chance: highYield ? 0.15 : 0.10 },
{ item: gem, chance: highYield ? 0.50 : 0.35 },
{ item: `gtceu:pure_${material.getName()}_dust`, chance: highYield ? 0.25 : 0.50 },
{ item: `gtceu:flawed_${material.getName()}_gem`, chance: highYield ? 0.20 : 0.25 },
{ item: `gtceu:chipped_${material.getName()}_gem`, chance: highYield ? 0.30 : 0.35 }
],
processingTime: 200 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER
}).id(`tfg:vi/vibrating/${material.getName()}`)
event.recipes.vintageimprovements.vibrating(
[
Item.of(ChemicalHelper.get(TagPrefix.gemExquisite, material, 1)).withChance(highYield ? 0.05 : 0.03),
Item.of(ChemicalHelper.get(TagPrefix.gemFlawless, material, 1)).withChance(highYield ? 0.15 : 0.10),
Item.of(ChemicalHelper.get(TagPrefix.gem, material, 1)).withChance(highYield ? 0.50 : 0.35),
Item.of(ChemicalHelper.get(TagPrefix.dustPure, material, 1)).withChance(highYield ? 0.25 : 0.50),
Item.of(ChemicalHelper.get(TagPrefix.gemFlawed, material, 1)).withChance(highYield ? 0.20 : 0.25),
Item.of(ChemicalHelper.get(TagPrefix.gemChipped, material, 1)).withChance(highYield ? 0.30 : 0.35)
],
ChemicalHelper.get(TagPrefix.crushedPurified, material, 1))
.processingTime(200 * global.VINTAGE_IMPROVEMENTS_DURATION_MULTIPLIER)
.id(`tfg:vi/vibrating/${material.getName()}`)
}
// #endregion
@ -465,7 +445,7 @@ function registerVintageImprovementsRecipes(event) {
event.custom({
type: 'vintageimprovements:polishing',
ingredients: [{ tag: 'forge:exquisite_gems/rose_quartz' }],
results: [{ item: 'gtceu:rose_quartz_lens' }, { item: 'gtceu:rose_quartz_dust', count: 2 }],
results: [ChemicalHelper.get(TagPrefix.lens, $GreateMaterials.RoseQuartz, 1), ChemicalHelper.get(TagPrefix.dust, $GreateMaterials.RoseQuartz, 2)],
speed_limits: 1,
processingTime: 100
}).id(`tfg:vi/lathe/rose_quartz_lens`)
@ -473,7 +453,7 @@ function registerVintageImprovementsRecipes(event) {
event.custom({
type: 'vintageimprovements:polishing',
ingredients: [{ tag: 'forge:exquisite_gems/diamond' }],
results: [{ item: 'gtceu:diamond_lens' }, { item: 'gtceu:diamond_dust', count: 2 }],
results: [ChemicalHelper.get(TagPrefix.lens, GTMaterials.Diamond, 1), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Diamond, 2)],
speed_limits: 1,
processingTime: 100
}).id(`tfg:vi/lathe/diamond_lens`)
@ -481,7 +461,7 @@ function registerVintageImprovementsRecipes(event) {
event.custom({
type: 'vintageimprovements:polishing',
ingredients: [{ tag: 'forge:exquisite_gems/emerald' }],
results: [{ item: 'gtceu:emerald_lens' }, { item: 'gtceu:emerald_dust', count: 2 }],
results: [ChemicalHelper.get(TagPrefix.lens, GTMaterials.Emerald, 1), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Emerald, 2)],
speed_limits: 1,
processingTime: 100
}).id(`tfg:vi/lathe/emerald_lens`)
@ -489,7 +469,7 @@ function registerVintageImprovementsRecipes(event) {
event.custom({
type: 'vintageimprovements:polishing',
ingredients: [{ tag: 'forge:exquisite_gems/ruby' }],
results: [{ item: 'gtceu:ruby_lens' }, { item: 'gtceu:ruby_dust', count: 2 }],
results: [ChemicalHelper.get(TagPrefix.lens, GTMaterials.Ruby, 1), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Ruby, 2)],
speed_limits: 1,
processingTime: 100
}).id(`tfg:vi/lathe/ruby_lens`)
@ -497,7 +477,7 @@ function registerVintageImprovementsRecipes(event) {
event.custom({
type: 'vintageimprovements:polishing',
ingredients: [{ tag: 'forge:exquisite_gems/sapphire' }],
results: [{ item: 'gtceu:sapphire_lens' }, { item: 'gtceu:sapphire_dust', count: 2 }],
results: [ChemicalHelper.get(TagPrefix.lens, GTMaterials.Sapphire, 1), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Sapphire, 2)],
speed_limits: 1,
processingTime: 100
}).id(`tfg:vi/lathe/sapphire_lens`)
@ -505,7 +485,7 @@ function registerVintageImprovementsRecipes(event) {
event.custom({
type: 'vintageimprovements:polishing',
ingredients: [{ tag: 'forge:exquisite_gems/amethyst' }],
results: [{ item: 'gtceu:amethyst_lens' }, { item: 'gtceu:amethyst_dust', count: 2 }],
results: [ChemicalHelper.get(TagPrefix.lens, GTMaterials.Amethyst, 1), ChemicalHelper.get(TagPrefix.dust, GTMaterials.Amethyst, 2)],
speed_limits: 1,
processingTime: 100
}).id(`tfg:vi/lathe/amethyst_lens`)