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

Add methods to change a material's composition #2630

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Add methods to change a material's composition #2630

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
db59e0d
Add methods to change a material's composition
Rundas01 Sep 30, 2024
e77fd4a
java 17 moment
Rundas01 Oct 1, 2024
7f53a3f
final fix
Rundas01 Oct 1, 2024
ccd3371
Merge branch 'master' into change-components
Rundas01 Oct 4, 2024
f456895
Merge branch 'master' into change-components
Rundas01 Oct 7, 2024
c25f49a
Implemented brachy's requested changes
Rundas01 Oct 8, 2024
5920afe
Merge branch 'master' into change-components
Rundas01 Oct 9, 2024
fcfd321
Merge branch 'master' into change-components
Rundas01 Oct 12, 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
36 changes: 34 additions & 2 deletions src/main/java/gregtech/api/unification/material/Material.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,22 @@
import gregtech.api.unification.material.info.MaterialFlag;
import gregtech.api.unification.material.info.MaterialFlags;
import gregtech.api.unification.material.info.MaterialIconSet;
import gregtech.api.unification.material.properties.*;
import gregtech.api.unification.material.properties.BlastProperty;
import gregtech.api.unification.material.properties.DustProperty;
import gregtech.api.unification.material.properties.FluidPipeProperties;
import gregtech.api.unification.material.properties.FluidProperty;
import gregtech.api.unification.material.properties.GemProperty;
import gregtech.api.unification.material.properties.IMaterialProperty;
import gregtech.api.unification.material.properties.IngotProperty;
import gregtech.api.unification.material.properties.ItemPipeProperties;
import gregtech.api.unification.material.properties.MaterialProperties;
import gregtech.api.unification.material.properties.OreProperty;
import gregtech.api.unification.material.properties.PolymerProperty;
import gregtech.api.unification.material.properties.PropertyKey;
import gregtech.api.unification.material.properties.RotorProperty;
import gregtech.api.unification.material.properties.ToolProperty;
import gregtech.api.unification.material.properties.WireProperties;
import gregtech.api.unification.material.properties.WoodProperty;
import gregtech.api.unification.material.registry.MaterialRegistry;
import gregtech.api.unification.stack.MaterialStack;
import gregtech.api.util.FluidTooltipUtil;
Expand All @@ -35,7 +50,11 @@
import stanhebben.zenscript.annotations.ZenMethod;
import stanhebben.zenscript.annotations.ZenOperator;

import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.function.Consumer;
import java.util.function.UnaryOperator;

Expand Down Expand Up @@ -110,6 +129,14 @@ public Material setFormula(String formula, boolean withFormatting) {
return this;
}

@ZenMethod
public Material setComponents(MaterialStack... components) {
this.materialInfo.setComponents(components);
this.chemicalFormula = null;
brachy84 marked this conversation as resolved.
Show resolved Hide resolved
this.chemicalFormula = calculateChemicalFormula();
return this;
}

public ImmutableList<MaterialStack> getMaterialComponents() {
return materialInfo.componentList;
}
Expand Down Expand Up @@ -1172,5 +1199,10 @@ private void verifyInfo(MaterialProperties p, boolean averageRGB) {
}
}
}

public MaterialInfo setComponents(MaterialStack... components) {
this.componentList = ImmutableList.copyOf(Arrays.asList(components));
return this;
}
}
}