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

More GT Multis and some miscellaneous bits #2196

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open
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
12 changes: 11 additions & 1 deletion kubejs/assets/gtceu/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
{
"block.gtceu.neocube": "NeoForging Cuboid",
"gtceu.neocube": "NeoCube",
"block.gtceu.neural_node": "Neural Network Node",
"gtceu.neural_node": "Neural Network Node",
"block.gtceu.ore_processing_plant": "Ore Processing Plant",
"gtceu.ore_processing_plant": "Ore Processing Plant",
"gtceu.ore_bathing_plant": "Ore Chemical Washing Plant",
"gtceu.ore_sifting_plant": "Ore Sifting Plant",
"block.gtceu.apiary_i": "Apiary MK I",
"gtceu.apiary_i": "Apiary MK I",
"block.gtceu.apiary_ii": "Apiary MK II",
Expand Down Expand Up @@ -35,5 +41,9 @@
"block.gtceu.luv_world_data_scanner": "§dElite Dimension Scanner II",
"block.gtceu.zpm_world_data_scanner": "§cElite Dimension Scanner III",
"block.gtceu.uv_world_data_scanner": "§3Ultimate Dimension Scanner",
"block.gtceu.uhv_world_data_scanner": "§4Ultra Dimension Scanner"
"block.gtceu.uhv_world_data_scanner": "§4Ultra Dimension Scanner",
"material.gtceu.alltheneutronium": "AllTheNeutronium",
"material.gtceu.vibtronium": "Vibtronium",
"material.gtceu.unobtronium": "Unobtronium",
"material.gtceu.molten_piglich_heart": "Molten Piglich Heart"
}
5 changes: 5 additions & 0 deletions kubejs/client_scripts/tooltips.js
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,11 @@ ItemEvents.tooltip(allthemods => {
Text.of('Not an AssLine... A NeoCube')
]
)
allthemods.add('gtceu:neural_node',
[
Text.of('Self-Aware')
]
)
allthemods.add('gtceu:advanced_large_chemical_reactor',
[
Text.of('ALCR a LCR that can parallelize.')
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
5 changes: 4 additions & 1 deletion kubejs/data/forge/loot_modifiers/global_loot_modifiers.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
"modpack:warden_wannabee",
"modpack:wilden_chimera_wannabee",
"modpack:chicken_wannabee",
"modpack:turtle_wannabee"
"modpack:turtle_wannabee",
"modpack:gaia_guardian_wannabee",
"modpack:gaia_guardian_2_wannabee",
"modpack:chaos_guardian_wannabee"
]
}
28 changes: 28 additions & 0 deletions kubejs/data/modpack/loot_modifiers/chaos_guardian_wannabee.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"conditions": [
{
"condition": "forge:loot_table_id",
"loot_table_id": "draconicevolution:entities/draconic_guardian"
},
{
"condition": "productivelib:killed_by_uuid",
"uuid": "bf699a99-b67c-35dc-981f-fb67fe089dbd"
}
],
"type": "productivelib:ingredient_modifier",
"chance": 0.05,
"addition": [
{
"item": "draconicevolution:dragon_heart"
},
{
"item": "draconicevolution:small_chaos_frag"
},
{
"item": "draconicevolution:awakened_draconium_nugget"
},
{
"item": "draconicevolution:draconium_nugget"
}
]
}
46 changes: 46 additions & 0 deletions kubejs/data/modpack/loot_modifiers/gaia_guardian_2_wannabee.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"conditions": [
{
"condition": "forge:loot_table_id",
"loot_table_id": "botania:gaia_guardian_2"
},
{
"condition": "productivelib:killed_by_uuid",
"uuid": "bf699a99-b67c-35dc-981f-fb67fe089dbd"
}
],
"type": "productivelib:ingredient_modifier",
"chance": 0.05,
"addition": [
{
"item": "botania:life_essence"
},
{
"item": "botania:blacker_lotus"
},
{
"item": "mythicbotany:fimbultyr_tablet"
},
{
"item": "botania:rune_lust"
},
{
"item": "botania:rune_gluttony"
},
{
"item": "botania:rune_greed"
},
{
"item": "botania:rune_sloth"
},
{
"item": "botania:rune_wrath"
},
{
"item": "botania:rune_envy"
},
{
"item": "botania:rune_pride"
}
]
}
61 changes: 61 additions & 0 deletions kubejs/data/modpack/loot_modifiers/gaia_guardian_wannabee.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"conditions": [
{
"condition": "forge:loot_table_id",
"loot_table_id": "botania:gaia_guardian"
},
{
"condition": "productivelib:killed_by_uuid",
"uuid": "bf699a99-b67c-35dc-981f-fb67fe089dbd"
}
],
"type": "productivelib:ingredient_modifier",
"chance": 0.01,
"addition": [
{
"item": "botania:life_essence"
},
{
"item": "botania:black_lotus"
},
{
"item": "botania:overgrowth_seed"
},
{
"item": "botania:manasteel_ingot"
},
{
"item": "botania:mana_pearl"
},
{
"item": "botania:mana_diamond"
},
{
"item": "botania:rune_water"
},
{
"item": "botania:rune_fire"
},
{
"item": "botania:rune_earth"
},
{
"item": "botania:rune_air"
},
{
"item": "botania:rune_mana"
},
{
"item": "botania:rune_spring"
},
{
"item": "botania:rune_summer"
},
{
"item": "botania:rune_autumn"
},
{
"item": "botania:rune_winter"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,9 @@
"twigs": [
"twigs:azalea_flowers"
],
"nethersdelight": [
"nethersdelight:mimicarnation"
],
"supplementaries": [
"supplementaries:wild_flax"
]
Expand Down
26 changes: 23 additions & 3 deletions kubejs/server_scripts/mods/gtceu/apiary_recipes.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// priority: 10
// This File has been authored by AllTheMods Staff, or a Community contributor for use in AllTheMods - AllTheMods 9.
// As all AllTheMods packs are licensed under All Rights Reserved, this file is not allowed to be used in any public packs not released by the AllTheMods Team, without explicit permission.

Expand Down Expand Up @@ -90,6 +91,10 @@ ServerEvents.recipes(allthemods => {
// flower is the flower block/tag/item/fluid
// outputs looks like [ { item: 'minecraft:dirt', chance: 10000 }, { item: 'minecraft:egg', chance: 4000 } ]

if (flower == Item.empty && !(flower instanceof $FluidStackJS || flower instanceof Array)) {
console.log("flower is null for " + id)
}

for (let i = 1; i < 33; i++) {
let recipeBuilder = allthemods.recipes.gtceu.apiary_ii(id + '/circuit_' + i.toString())
.circuit(i)
Expand All @@ -113,7 +118,7 @@ ServerEvents.recipes(allthemods => {
}
}
})
if (flower instanceof $FluidStackJS) {
if (flower instanceof $FluidStackJS || (flower instanceof Array && flower[0] instanceof $FluidStackJS)) {
recipeBuilder.notConsumableFluid(flower)
} else {
recipeBuilder.notConsumable(flower)
Expand Down Expand Up @@ -277,20 +282,35 @@ ServerEvents.recipes(allthemods => {
}) // end of loop over all results

let flowerThing
let flowerArray = []
if (index != -1) { // e.g. we found the bee's JSON file
if (beeData.hasOwnProperty('flowerFluid')) {
flower = beeData.flowerFluid
if (beeType == "oily") { // special case, I couldn't figure out fluid tags
flower = "thermal:crude_oil"
flowerArray = [Fluid.of(flower, 1000), Fluid.of("pneumaticcraft:oil", 1000)]
} else if (beeType == "salty") {
flower = "mekanism:brine" // I think the salty bee should use brine as a flower and not water
}
recipeBuilder.notConsumableFluid(Fluid.of(flower, 1000))
flowerThing = Fluid.of(flower, 1000)
if (flowerArray.length > 0) {
recipeBuilder.notConsumableFluid(flowerArray)
flowerThing = flowerArray
} else {
recipeBuilder.notConsumableFluid(Fluid.of(flower, 1000))
flowerThing = Fluid.of(flower, 1000)
}
// recipeBuilder.notConsumableFluid(Fluid.of(flower, 1000))
// flowerThing = Fluid.of(flower, 1000)
} else if (beeData.hasOwnProperty('flowerBlock')) {
flower = beeData.flowerBlock
if (beeType == "chocolate") { // special case, listed as minecraft:cocoa in PB for some reason
flower = "minecraft:cocoa_beans"
} else if (beeType == "molybdenum") {
flower = "gtceu:molybdenum_block"
} else if (beeType == "palladium") {
flower = "gtceu:palladium_block"
} else if (beeType == "neodymium") {
flower = "gtceu:neodymium_block"
}
recipeBuilder.notConsumable(Item.of(flower))
flowerThing = Item.of(flower)
Expand Down
Loading