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

[WIP] New train recipes #634

Draft
wants to merge 5 commits into
base: master-ceu
Choose a base branch
from
Draft
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
Binary file added build/buildOut/server.zip
Binary file not shown.
144 changes: 140 additions & 4 deletions groovy/postInit/mod/ImmersiveRailroading.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -129,16 +129,149 @@ mods.gregtech.bender.recipeBuilder()
.outputs(item('immersiverailroading:item_rail_part') * 10)
.duration(200)
.EUt(30)
.buildAndRegister()
.buildAndRegister();

// supersymmetry train parts
log.infoMC("Adding Train Wheels");

//Train wheel steps:
/*
* - Use the forge hammer on 4 double steel sheets to make the unshaped train wheel
* Creating a small wheel:
a. use the lathe to cut it into 4 small wheels
b. use the hammer, saw, and file to work it into 2 small wheels
* Creating the large drive wheel:
a. use the lathe to cut it into 2 drive wheels
b. use the hammer, saw, and file to cut it into 1 drive wheel
*/
mods.gregtech.forge_hammer.recipeBuilder()
.inputs(ore('plateDoubleSteel') * 4)
.outputs(metaitem('train_unshaped_wheel'))
.duration(200)
.EUt(Globals.voltAmps[1])
.buildAndRegister();

mods.gregtech.lathe.recipeBuilder()
.circuitMeta(1)
.inputs(metaitem('train_unshaped_wheel'))
.outputs(metaitem('train_small_wheel') * 4)
.duration(200)
.EUt(Globals.voltAmps[1])
.buildAndRegister();

mods.gregtech.lathe.recipeBuilder()
.circuitMeta(2)
.inputs(metaitem('train_unshaped_wheel'))
.outputs(metaitem('train_drive_wheel') * 2)
.duration(200)
.EUt(Globals.voltAmps[1])
.buildAndRegister();

mods.gregtech.assembler.recipeBuilder()
.inputs(metaitem('train_small_wheel') * 4)
.inputs(metaitem('stickLongSteel') * 2)
.inputs(metaitem('plateSteel') * 2)
.inputs(metaitem('springSteel') * 1)
.outputs(metaitem('train_bogie'))
.duration(200)
.EUt(Globals.voltAmps[1])
.buildAndRegister();

crafting.addShaped("handcraft_train_bogie", metaitem('train_bogie'), [
[metaitem('train_small_wheel'), ore('plateSteel'), metaitem('train_small_wheel')],
[ore('stickLongSteel'), ore('springSteel'), ore('stickLongSteel')],
[metaitem('train_small_wheel'), ore('plateSteel'), metaitem('train_small_wheel')],
]);

Globals.solders.each { key, val ->
mods.gregtech.assembler.recipeBuilder()
.inputs(item('gregtech:machine', 2) * 1) // high pressure solid fuel boiler
.inputs(item('gregtech:boiler_casing', 1) * 4)
.inputs(item('gregtech:boiler_firebox_casing', 1) * 4)
.inputs(metaitem('steam.piston') * 2)
.inputs(metaitem('drum.steel'))
.outputs(metaitem('train_steam_boiler'))
.duration(200)
.EUt(Globals.voltAmps[1])
.buildAndRegister();

// steam trains
// small(er) steam locomotive
TagCompound tag = new TagCompound();

tag.setString("defID", "rolling_stock/locomotives/rodgers_460.json");
tag.setFloat("gauge", (float) Gauges.STANDARD);

cam72cam.mod.item.ItemStack is = new cam72cam.mod.item.ItemStack(IRItems.ITEM_ROLLING_STOCK, 1);
is.setTagCompound(tag);

// 4-6-0 wheel config
SuSyRecipeMaps.RAILROAD_ENGINEERING_STATION_RECIPES.recipeBuilder()
.circuitMeta(1)
.inputs(metaitem('train_steam_boiler'))
.inputs(metaitem('train_bogie'))
.inputs(metaitem('train_drive_wheel') * 6)
.inputs(ore('plateSteel') * 24)
.inputs(ore('stickLongSteel') * 6)
.inputs(item('minecraft:glass') * 2)
.inputs(ore('boltSteel') * 48)
.outputs(is.internal)
.EUt(30)
.duration(200)
.buildAndRegister();

// large steam locomotive
tag = new TagCompound();

tag.setString("defID", "rolling_stock/locomotives/k4_pacific.json");
tag.setFloat("gauge", (float) Gauges.STANDARD);

is = new cam72cam.mod.item.ItemStack(IRItems.ITEM_ROLLING_STOCK, 1);
is.setTagCompound(tag);

// 4-6-2 wheel config
SuSyRecipeMaps.RAILROAD_ENGINEERING_STATION_RECIPES.recipeBuilder()
.circuitMeta(1)
.inputs(metaitem('train_steam_boiler') * 2)
.inputs(metaitem('train_bogie'))
.inputs(metaitem('train_drive_wheel') * 6)
.inputs(metaitem('train_small_wheel') * 2)
.inputs(ore('plateSteel') * 32)
.inputs(ore('stickLongSteel') * 7)
.inputs(item('minecraft:glass') * 2)
.inputs(ore('boltSteel') * 64)
.outputs(is.internal)
.EUt(30)
.duration(200)
.buildAndRegister();

// steam freight car
tag = new TagCompound();

TagCompound tag = new TagCompound();
tag.setString("defID", "rolling_stock/freight/usra_boxcar_classrr40.json");
tag.setFloat("gauge", (float) Gauges.STANDARD);

is = new cam72cam.mod.item.ItemStack(IRItems.ITEM_ROLLING_STOCK, 1);
is.setTagCompound(tag);

SuSyRecipeMaps.RAILROAD_ENGINEERING_STATION_RECIPES.recipeBuilder()
.circuitMeta(1)
.inputs(metaitem('train_bogie') * 2)
.inputs(ore('plateSteel') * 16)
.inputs(ore('boltSteel') * 32)
.outputs(is.internal)
.EUt(30)
.duration(200)
.buildAndRegister();

// monorail trains (soldered)
Globals.solders.each { key, val ->
// monorail locomotive
tag = new TagCompound();

tag.setString("defID", "rolling_stock/locomotives/monorail_engine.json");
tag.setFloat("gauge", (float) Gauges.STANDARD);

cam72cam.mod.item.ItemStack is = new cam72cam.mod.item.ItemStack(IRItems.ITEM_ROLLING_STOCK, 1);
is = new cam72cam.mod.item.ItemStack(IRItems.ITEM_ROLLING_STOCK, 1);
is.setTagCompound(tag);

SuSyRecipeMaps.RAILROAD_ENGINEERING_STATION_RECIPES.recipeBuilder()
Expand All @@ -157,6 +290,7 @@ Globals.solders.each { key, val ->
.duration(400)
.buildAndRegister();

// monorail freight car
TagCompound tag2 = new TagCompound();

tag2.setString("defID", "rolling_stock/freight/monorail_item.json");
Expand All @@ -178,6 +312,7 @@ Globals.solders.each { key, val ->

TagCompound tag3 = new TagCompound();

// monorail passenger car
tag3.setString("defID", "rolling_stock/passenger/monorail_passenger.json");
tag3.setFloat("gauge", (float) Gauges.STANDARD);

Expand All @@ -198,6 +333,7 @@ Globals.solders.each { key, val ->

TagCompound tag4 = new TagCompound();

// monorail fluid car
tag4.setString("defID", "rolling_stock/tank/monorail_fluid.json");
tag4.setFloat("gauge", (float) Gauges.STANDARD);

Expand Down
6 changes: 6 additions & 0 deletions groovy/preInit/RegisterMetaItems.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,12 @@ eventManager.listen {

customMetaItems.addItem(300, "mylar")

customMetaItems.addItem(301, "train_unshaped_wheel")
customMetaItems.addItem(302, "train_small_wheel")
customMetaItems.addItem(303, "train_drive_wheel")
customMetaItems.addItem(304, "train_bogie")
customMetaItems.addItem(305, "train_steam_boiler")

customMetaItems.addItem(1000, "chunk.magnetite")
customMetaItems.addItem(1001, "hot_iron_rod")
customMetaItems.addItem(1002, "voltaic_pile").setMaxStackSize(1);
Expand Down
6 changes: 6 additions & 0 deletions resources/gregtech/models/item/metaitems/train_bogie.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gregtech:items/metaitems/train_bogie"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gregtech:items/metaitems/train_drive_wheel"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gregtech:items/metaitems/train_small_wheel"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gregtech:items/metaitems/train_steam_boiler"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gregtech:items/metaitems/train_unshaped_wheel"
}
}
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.
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.
5 changes: 5 additions & 0 deletions resources/langfiles/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -1865,6 +1865,11 @@ metaitem.bound_leather.name=Bound Leather

metaitem.vacuum_tube_components.name=Vacuum Tube Components
metaitem.mylar.name=Thin Mylar Sheet
metaitem.train_unshaped_wheel.name=Unshaped Train Wheel
metaitem.train_small_wheel.name=Small Train Wheel
metaitem.train_drive_wheel.name=Train Drive Wheel
metaitem.train_bogie.name=Train Bogie
metaitem.train_steam_boiler.name=Train Steam Boiler

metaitem.circuit.gooware_processor.name=Gooware Processor
metaitem.circuit.gooware_processor.tooltip=Reaction-Diffusion Computation/n§2ZPM-tier Circuit
Expand Down