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

Jump to bottom

Pipe Rebalancing Proposal #3082

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

Pipe Rebalancing Proposal #3082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
23440c6
small comment to start draft PR for discussion
Volence Sep 6, 2024
9ca4ada
Merge branch 'master' into pipe-balancing
Dream-Master Sep 6, 2024
6c30ffd
Merge branch 'master' into pipe-balancing
Dream-Master Sep 6, 2024
e170a2b
Merge branch 'master' into pipe-balancing
Dream-Master Sep 6, 2024
bf5b832
Merge branch 'GTNewHorizons:master' into pipe-balancing
Volence Sep 14, 2024
2515179
Reorganize pipes into LoaderMetaTileEntities and start cleanup of the…
Volence Sep 19, 2024
d645192
Move the rest of the materials to LoaderMetaTileEntities, organize th…
Volence Sep 20, 2024
23e78bc
Change some IDs around
Volence Sep 20, 2024
c0f0683
Adjust item pipe throughput
Volence Sep 20, 2024
f4aec1c
Adjust numbers for fluid pipes. Fix some issues with item pipe number
Volence Sep 20, 2024
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
1 change: 0 additions & 1 deletion src/main/java/goodgenerator/loader/Loaders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,6 @@ public static void GTMetaTileRegister() {
MetaTileEntityIDs.ComponentAssemblyLine.ID,
"ComponentAssemblyLine",
"Component Assembly Line").getStackForm(1L);
CrackRecipeAdder.registerPipe(MetaTileEntityIDs.PipeIncoloy903.ID, GGMaterial.incoloy903, 15000, 8000, true);
CrackRecipeAdder.registerWire(MetaTileEntityIDs.WireSignalium.ID, GGMaterial.signalium, 12, 131072, 16, true);
CrackRecipeAdder.registerWire(MetaTileEntityIDs.WireLumiium.ID, GGMaterial.lumiium, 8, 524288, 64, true);
Loaders.AMForge = new AntimatterForge(
Expand Down
156 changes: 0 additions & 156 deletions src/main/java/goodgenerator/util/CrackRecipeAdder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes;
import static gregtech.api.recipe.RecipeMaps.distilleryRecipes;
import static gregtech.api.recipe.RecipeMaps.extruderRecipes;
import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
import static gregtech.api.recipe.RecipeMaps.wiremillRecipes;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
import static gregtech.api.util.GTRecipeBuilder.TICKS;
Expand All @@ -23,7 +22,6 @@
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import gregtech.api.metatileentity.implementations.MTECable;
import gregtech.api.metatileentity.implementations.MTEFluid;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTRecipeBuilder;
import gregtech.api.util.GTUtility;
Expand Down Expand Up @@ -186,160 +184,6 @@ public static FluidStack copyFluidWithAmount(FluidStack fluid, int amount) {
return new FluidStack(fluid.getFluid(), amount);
}

public static void registerPipe(int ID, Werkstoff material, int flow, int temp, boolean gas) {
String unName = material.getDefaultName()
.replace(" ", "_");
String Name = material.getDefaultName();
GTOreDictUnificator.registerOre(
OrePrefixes.pipeTiny.get(material.getBridgeMaterial()),
new MTEFluid(
ID,
"GT_Pipe_" + unName + "_Tiny",
"Tiny " + Name + " Fluid Pipe",
0.25F,
material.getBridgeMaterial(),
flow / 6,
temp,
gas).getStackForm(1L));
GTOreDictUnificator.registerOre(
OrePrefixes.pipeSmall.get(material.getBridgeMaterial()),
new MTEFluid(
ID + 1,
"GT_Pipe_" + unName + "_Small",
"Small " + Name + " Fluid Pipe",
0.375F,
material.getBridgeMaterial(),
flow / 3,
temp,
gas).getStackForm(1L));
GTOreDictUnificator.registerOre(
OrePrefixes.pipeMedium.get(material.getBridgeMaterial()),
new MTEFluid(
ID + 2,
"GT_Pipe_" + unName,
Name + " Fluid Pipe",
0.5F,
material.getBridgeMaterial(),
flow,
temp,
gas).getStackForm(1L));
GTOreDictUnificator.registerOre(
OrePrefixes.pipeLarge.get(material.getBridgeMaterial()),
new MTEFluid(
ID + 3,
"GT_Pipe_" + unName + "_Large",
"Large " + Name + " Fluid Pipe",
0.75F,
material.getBridgeMaterial(),
flow * 2,
temp,
gas).getStackForm(1L));
GTOreDictUnificator.registerOre(
OrePrefixes.pipeHuge.get(material.getBridgeMaterial()),
new MTEFluid(
ID + 4,
"GT_Pipe_" + unName + "_Huge",
"Huge " + Name + " Fluid Pipe",
0.875F,
material.getBridgeMaterial(),
flow * 4,
temp,
gas).getStackForm(1L));
GTValues.RA.stdBuilder()
.itemInputs(material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Pipe_Tiny.get(0))
.itemOutputs(material.get(OrePrefixes.pipeTiny, 2))
.duration(
material.getStats()
.getMass() * TICKS)
.eut(TierEU.RECIPE_MV)
.addTo(extruderRecipes);
GTValues.RA.stdBuilder()
.itemInputs(material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Pipe_Small.get(0))
.itemOutputs(material.get(OrePrefixes.pipeSmall, 1))
.duration(
material.getStats()
.getMass() * 2
* TICKS)
.eut(TierEU.RECIPE_MV)
.addTo(extruderRecipes);
GTValues.RA.stdBuilder()
.itemInputs(material.get(OrePrefixes.ingot, 3), ItemList.Shape_Extruder_Pipe_Medium.get(0))
.itemOutputs(material.get(OrePrefixes.pipeMedium, 1))
.duration(
material.getStats()
.getMass() * 6
* TICKS)
.eut(TierEU.RECIPE_MV)
.addTo(extruderRecipes);
GTValues.RA.stdBuilder()
.itemInputs(material.get(OrePrefixes.ingot, 6), ItemList.Shape_Extruder_Pipe_Large.get(0))
.itemOutputs(material.get(OrePrefixes.pipeLarge, 1))
.duration(
material.getStats()
.getMass() * 12
* TICKS)
.eut(TierEU.RECIPE_MV)
.addTo(extruderRecipes);
GTValues.RA.stdBuilder()
.itemInputs(material.get(OrePrefixes.ingot, 12), ItemList.Shape_Extruder_Pipe_Huge.get(0))
.itemOutputs(material.get(OrePrefixes.pipeHuge, 1))
.duration(
material.getStats()
.getMass() * 24
* TICKS)
.eut(TierEU.RECIPE_MV)
.addTo(extruderRecipes);
GTValues.RA.stdBuilder()
.itemInputs(ItemList.Shape_Mold_Pipe_Tiny.get(0))
.fluidInputs(material.getMolten(72))
.itemOutputs(material.get(OrePrefixes.pipeTiny, 1))
.duration(
material.getStats()
.getMass() * TICKS)
.eut(TierEU.RECIPE_LV)
.addTo(fluidSolidifierRecipes);
GTValues.RA.stdBuilder()
.itemInputs(ItemList.Shape_Mold_Pipe_Small.get(0))
.fluidInputs(material.getMolten(144))
.itemOutputs(material.get(OrePrefixes.pipeSmall, 1))
.duration(
material.getStats()
.getMass() * 2
* TICKS)
.eut(TierEU.RECIPE_LV)
.addTo(fluidSolidifierRecipes);
GTValues.RA.stdBuilder()
.itemInputs(ItemList.Shape_Mold_Pipe_Medium.get(0))
.fluidInputs(material.getMolten(432))
.itemOutputs(material.get(OrePrefixes.pipeMedium, 1))
.duration(
material.getStats()
.getMass() * 6
* TICKS)
.eut(TierEU.RECIPE_LV)
.addTo(fluidSolidifierRecipes);
GTValues.RA.stdBuilder()
.itemInputs(ItemList.Shape_Mold_Pipe_Large.get(0))
.fluidInputs(material.getMolten(864))
.itemOutputs(material.get(OrePrefixes.pipeLarge, 1))
.duration(
material.getStats()
.getMass() * 12
* TICKS)
.eut(TierEU.RECIPE_LV)
.addTo(fluidSolidifierRecipes);
GTValues.RA.stdBuilder()
.itemInputs(ItemList.Shape_Mold_Pipe_Huge.get(0))
.fluidInputs(material.getMolten(1728))
.itemOutputs(material.get(OrePrefixes.pipeHuge, 1))
.duration(
material.getStats()
.getMass() * 24
* TICKS)
.eut(TierEU.RECIPE_LV)
.addTo(fluidSolidifierRecipes);
}

public static void registerWire(int ID, Werkstoff material, int aAmperage, int aVoltage, int aLoss, boolean cover) {
String unName = material.getDefaultName()
.replace(" ", "_")
Expand Down
Loading