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.

Sign up for GitHub

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

Fix AE2 Grinder Recipe + BoP Mud Recipe Cleanup #1257

Merged
merged 5 commits into from
Feb 2, 2025
Merged

Fix AE2 Grinder Recipe + BoP Mud Recipe Cleanup #1257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2293aa6
Fix AE2 Grinding Recipe not Taking into Account of OreMultiplier
littlecube8152 Jan 30, 2025
8ef098a
Unify BoP Mud Related Recipes
littlecube8152 Jan 30, 2025
ce4ae9a
Cleanup
littlecube8152 Jan 30, 2025
45e7e96
Minor change and clean up
littlecube8152 Jan 30, 2025
24f9f94
Nerf coal deposit grinding
littlecube8152 Jan 31, 2025
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
122 changes: 64 additions & 58 deletions groovy/postInit/gameplay/StartingAge.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import appeng.api.features.IGrinderRecipeBuilder;
import net.minecraftforge.event.world.BlockEvent;
import gregtech.api.GTValues;
import gregtech.common.blocks.BlockSurfaceRock;
import gregtech.api.unification.material.properties.PropertyKey

final IGrinderRegistry reg = AEApi.instance().registries().grinder();

Expand All @@ -19,14 +20,6 @@ event_manager.listen { BlockEvent.HarvestDropsEvent event ->

log.infoMC("Running StartingAge.groovy...")

def name_removals = [
"biomesoplenty:mud_from_dirt"
]

for (item in name_removals) {
crafting.remove(item);
}

mods.jei.ingredient.yeet(
item('minecraft:stone_sword'),
item('minecraft:stone_shovel'),
Expand All @@ -40,15 +33,6 @@ crafting.replaceShapeless("gregtech:clay_ball_to_dust", metaitem('dustClay'), [
ore('ingotClay')
])

crafting.addShapeless("gregtech:mud_block_to_ball", item('biomesoplenty:mudball') * 4, [
item('biomesoplenty:mud')
])

crafting.addShapeless("gregtech:mud_from_dirt", item('biomesoplenty:mud'), [
fluid('water') * 1000,
ore('dirt')
])

// 8 * compressed clay
crafting.addShaped("gregtech:compressed_clay_8", item('gregtech:meta_item_1', 349) * 8, [
[ore('ingotClay'), ore('ingotClay'), ore('ingotClay')],
Expand Down Expand Up @@ -136,7 +120,7 @@ crafting.replaceShaped("gregtech:sword_flint", item('gregtech:sword').withNbt(['
[ore("stickWood"), ore('twine'), null]
])

//Magnetite Chunk Crafting
// Magnetite Chunk Crafting
crafting.addShapeless("magnetite_chunk", metaitem('chunk.magnetite'), [ore('oreMagnetite'), ore('rock')]);
crafting.addShapeless("magnetite_chunk_1", metaitem('chunk.magnetite'), [ore('oreVanadiumMagnetite'), ore('rock')]);

Expand All @@ -146,51 +130,73 @@ crafting.replaceShaped("appliedenergistics2:misc/grindstone", item('appliedenerg
[ore('cobblestone'), ore('cobblestone'), ore('cobblestone')]
])

def GrindstoneMap = [
'gregtech:ore_acanthite_0': "crushedAcanthite",
'gregtech:ore_anglesite_0': "crushedAnglesite",
'gregtech:ore_sphalerite_0': "crushedSphalerite",
'gregtech:ore_chlorapatite_0': "crushedChlorapatite",
'gregtech:ore_fluorapatite_0': "crushedFluorapatite",
'gregtech:ore_arsenopyrite_0': "crushedArsenopyrite",
'gregtech:ore_pyrite_0': "crushedPyrite",
'gregtech:ore_banded_iron_0': "crushedBandedIron",
'gregtech:ore_magnetite_0': "crushedMagnetite",
'gregtech:ore_bornite_0': "crushedBornite",
'gregtech:ore_chalcopyrite_0': "crushedChalcopyrite",
'susy:resource_block:2': "dustSalt",
'susy:resource_block:3': "dustSalt",
'susy:resource_block:4': "dustSalt",
'susy:resource_block:5': "dustSalt",
'susy:resource_block:15': "dustCoal",
'gregtech:ore_cassiterite_0': "crushedCassiterite",
'gregtech:ore_cerussite_0': "crushedCerussite",
'gregtech:ore_cinnabar_0': "crushedCinnabar",
'gregtech:ore_stibnite_0': "crushedStibnite",
'gregtech:ore_coal_0': "crushedCoal",
'gregtech:ore_fluorite_0': "crushedFluorite",
'gregtech:ore_galena_0': "crushedGalena",
'gregtech:ore_lapis_0': "crushedLapis",
'gregtech:ore_lazurite_0': "crushedLazurite",
'gregtech:ore_sodalite_0': "crushedSodalite",
'gregtech:ore_lignite_0': "crushedLignite",
'gregtech:ore_malachite_0': "crushedMalachite",
'gregtech:ore_proustite_0': "crushedProustite",
'gregtech:ore_pyrolusite_0': "crushedPyrolusite",
'gregtech:ore_realgar_0': "crushedRealgar",
'gregtech:ore_redstone_0': "crushedRedstone",
'gregtech:ore_saltpeter_0': "crushedSaltpeter",
'gregtech:ore_chalcocite_0': "crushedChalcocite",
'gregtech:ore_enargite_0': "crushedEnargite",
'gregtech:ore_tetrahedrite_0': "crushedTetrahedrite",
'gregtech:ore_anthracite_0': "crushedAnthracite"
// AE2 Grindstone Ore Processing
def GrindstoneOreList = [
'acanthite',
'anglesite',
'sphalerite',
'chlorapatite',
'fluorapatite',
'arsenopyrite',
'pyrite',
'banded_iron',
'magnetite',
'bornite',
'chalcopyrite',
'cassiterite',
'cerussite',
'cinnabar',
'stibnite',
'coal',
'fluorite',
'galena',
'lapis',
'lazurite',
'sodalite',
'lignite',
'malachite',
'proustite',
'pyrolusite',
'realgar',
'redstone',
'saltpeter',
'chalcocite',
'enargite',
'tetrahedrite',
'anthracite'
]

def GrindstoneDepositMap = [
'susy:resource_block:2': metaitem("dustSalt") * 3,
'susy:resource_block:3': metaitem("dustSalt") * 3,
'susy:resource_block:4': metaitem("dustSalt") * 3,
'susy:resource_block:5': metaitem("dustSalt") * 3,
'susy:resource_block:15': metaitem("dustCoal") * 12,
]

for (key in GrindstoneMap) {
for (mat_name in GrindstoneOreList)
{
final IGrinderRecipeBuilder builder = reg.builder();
def mat = material(mat_name)
def mat_cap = mat.toCamelCaseString()
mat_cap = mat_cap.substring(0, 1).toUpperCase() + mat_cap.substring(1);

log.info(mat)
log.info(mat_cap)
log.info(mat.oreMultiplier())

builder.withInput(item("gregtech:ore_" + mat + "_0") * 2)
builder.withOutput(metaitem('crushed' + mat_cap) * (int)(mat.oreMultiplier() * 3))
builder.withTurns(5)

reg.addRecipe(builder.build())
}

for (key in GrindstoneDepositMap) {
final IGrinderRecipeBuilder builder = reg.builder();

builder.withInput(item(key.getKey()) * 2)
builder.withOutput(metaitem(key.getValue()) * 3)
builder.withOutput(key.getValue())
builder.withTurns(5)

reg.addRecipe(builder.build())
Expand Down
19 changes: 17 additions & 2 deletions groovy/postInit/mod/BiomesOPlenty.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
crafting.replaceShaped("biomesoplenty:mud_from_dirt", item('biomesoplenty:mud'),
[[ore('dirt'), fluid('water') * 1000]]);

def name_removals = [
"biomesoplenty:mud_from_dirt"
]

for (item in name_removals) {
crafting.remove(item);
}

crafting.addShapeless("gregtech:mud_block_to_ball", item('biomesoplenty:mudball') * 4, [
item('biomesoplenty:mud')
])

crafting.addShapeless("gregtech:mud_from_dirt", item('biomesoplenty:mud'), [
fluid('water') * 1000,
ore('dirt')
])

item('biomesoplenty:mudball').Item.setMaxStackSize(64)