Skip to content

Commit e1f8d82

Browse files
committed
reorded params in FuelType and added a couple more params
1 parent 0417365 commit e1f8d82

File tree

1 file changed

+10
-4
lines changed
  • src/main/java/org/gtreimagined/gt4r/reactor/components

1 file changed

+10
-4
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
package org.gtreimagined.gt4r.reactor.components;
22

3+
import com.google.common.collect.ImmutableList;
4+
import muramasa.antimatter.util.int2;
35
import org.gtreimagined.gt4r.reactor.Config;
46

5-
public record FuelType(double energyMult, double heatMult, int pulsesPerTick, boolean isMox, int durability, double explosionMult, double moxHeatCoefficient, double moxEUCoefficient) {
7+
import java.util.List;
68

7-
public static final FuelType URANIUM = new FuelType(1.0, 4.0, 1, false, 10000, 1.0);
9+
public record FuelType(int durability, double energyMult, double heatMult, int pulsesPerTick, int connectivityPulses, boolean isMox, double explosionMult, double moxHeatCoefficient, double moxEUCoefficient, List<int2> pulseArea, List<int2> heatPulseArea) {
10+
public static final List<int2> DEFAULT_AREA = ImmutableList.of(new int2(-1, 0), new int2(1, 0), new int2(0, -1), new int2(0, 1));
11+
public static final List<int2> LARGE_PULSES_AREA = ImmutableList.of(new int2(-1, 0), new int2(1, 0), new int2(0, -1), new int2(0, 1), new int2(-1, -1), new int2(1, -1), new int2(-1, 1), new int2(1, 1));
812

9-
public FuelType(double energyMult, double heatMult, int pulsesPerTick, boolean isMox, int durability, double explosionMult){
10-
this(energyMult, heatMult, pulsesPerTick, isMox, durability, explosionMult, 2.0, Config.MOX_EU_COEFFICIENT);
13+
public static final FuelType URANIUM = new FuelType(10000, 1.0, 4.0, 1, 1, false, 1.0);
14+
15+
public FuelType(int durability, double energyMult, double heatMult, int pulsesPerTick, int connectivityPulses, boolean isMox, double explosionMult){
16+
this(durability, energyMult, heatMult, pulsesPerTick, connectivityPulses, isMox, explosionMult, 2.0, Config.MOX_EU_COEFFICIENT, DEFAULT_AREA, DEFAULT_AREA);
1117
}
1218
}

0 commit comments

Comments
 (0)