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

Store distillation input amount in a material tag #194

Merged
merged 2 commits into from
Nov 1, 2022
Merged

Store distillation input amount in a material tag #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
120b765
Store distillation input amount in a material tag
lynxx131 Nov 1, 2022
448b118
Merge branch 'dev-1.18' into distillation_input_amount
Trinsdar Nov 1, 2022
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
7 changes: 3 additions & 4 deletions common/src/main/java/muramasa/antimatter/event/MaterialEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@
import java.util.function.Supplier;

import static muramasa.antimatter.Data.*;
import static muramasa.antimatter.material.MaterialTags.ARMOR;
import static muramasa.antimatter.material.MaterialTags.DISTILL_INTO;
import static muramasa.antimatter.material.MaterialTags.HANDLE;
import static muramasa.antimatter.material.MaterialTags.METAL;
import static muramasa.antimatter.material.MaterialTags.*;

public class MaterialEvent {
private Material material = Data.NULL;
Expand Down Expand Up @@ -146,6 +143,7 @@ public MaterialEvent asFluid(int fuelPower, int temp, boolean canDistill, FluidP
MaterialTags.FUEL_POWER.add(this.material, fuelPower);
MaterialTags.LIQUID_TEMPERATURE.add(this.material, temp);
if (canDistill){
DISTILLATION_FLUID_INPUT_AMOUNT.add(this.material, distillationAmount);
DISTILL_INTO.add(this.material, Arrays.stream(distillationProducts).toList());
}
return this;
Expand All @@ -169,6 +167,7 @@ public MaterialEvent asGas(int fuelPower, int temp, boolean canDistill, FluidPro
MaterialTags.FUEL_POWER.add(this.material, fuelPower);
MaterialTags.GAS_TEMPERATURE.add(this.material, temp);
if (canDistill){
DISTILLATION_FLUID_INPUT_AMOUNT.add(this.material, distillationAmount);
DISTILL_INTO.add(this.material, Arrays.stream(distillationProducts).toList());
}
return this;
Expand Down
1 change: 1 addition & 0 deletions common/src/main/java/muramasa/antimatter/material/MaterialTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ public class MaterialTags {
public static final ListMaterialTag<Material> BYPRODUCTS = new ListMaterialTag<>("byproducts");

public static final ListMaterialTag<FluidProduct> DISTILL_INTO = new ListMaterialTag<>("distill_into");
public static final NumberMaterialTag DISTILLATION_FLUID_INPUT_AMOUNT = new NumberMaterialTag("distillation_fluid_input_amount");


public static final BlockDropMaterialTag<BlockOre> CUSTOM_ORE_DROPS = new BlockDropMaterialTag<>("custom_ore_drops");
Expand Down