added FuelType record

Author: Trinsdar

src/main/java/org/gtreimagined/gt4r/reactor/components/FuelType.java

@@ -0,0 +1,12 @@
+package org.gtreimagined.gt4r.reactor.components;
+
+import org.gtreimagined.gt4r.reactor.Config;
+
+public record FuelType(double energyMult, double heatMult, int pulsesPerTick, boolean isMox, double moxHeatCoefficient, double moxEUCoefficient) {
+
+    public static final FuelType URANIUM = new FuelType(1.0, 4.0, 1, false);
+
+    public FuelType(double energyMult, double heatMult, int pulsesPerTick, boolean isMox){
+        this(energyMult, heatMult, pulsesPerTick, isMox, 2.0, Config.MOX_EU_COEFFICIENT);
+    }
+}

src/main/java/org/gtreimagined/gt4r/reactor/components/adapters/FuelRodAdapter.java

@@ -42,8 +42,8 @@ public ItemStack getItemStack() {
     protected double getEUMultiplier() {
         double mult = Config.ROD_EU_MULTIPLIER;
 
-        if (fuelRod.isMox(itemStack)) {
-            mult *= 1 + fuelRod.getMoxEUCoefficient(itemStack) * reactor.getHeatRatio();
+        if (fuelRod.getFuelType().isMox()) {
+            mult *= 1 + fuelRod.getFuelType().moxEUCoefficient() * reactor.getHeatRatio();
         }
 
         return mult;
@@ -52,8 +52,8 @@ protected double getEUMultiplier() {
     protected double getHeatMultiplier() {
         double mult = Config.ROD_HU_MULTIPLIER;
 
-        if (fuelRod.isMox(itemStack) && reactor.isFluid() && reactor.getHeatRatio() >= 0.5) {
-            mult *= fuelRod.getMoxHeatCoefficient(itemStack);
+        if (fuelRod.getFuelType().isMox() && reactor.isFluid() && reactor.getHeatRatio() >= 0.5) {
+            mult *= fuelRod.getFuelType().moxHeatCoefficient();
         }
 
         return mult;
@@ -71,7 +71,7 @@ public void onHeatTick() {
         }
 
         int pulses = this.getPulseCount();
-        int heat = (int) (fuelRod.getHeatMult(itemStack) * fuelRod.getRodCount(itemStack)
+        int heat = (int) (fuelRod.getFuelType().heatMult() * fuelRod.getRodCount(itemStack)
             * getHeatMultiplier()
             * pulses
             * (pulses + 1)
@@ -111,7 +111,7 @@ public void onEnergyTick() {
         }
 
         int pulses = this.getPulseCount();
-        double energy = fuelRod.getEnergyMult(itemStack) * fuelRod.getRodCount(itemStack) * getEUMultiplier() * pulses;
+        double energy = fuelRod.getFuelType().energyMult() * fuelRod.getRodCount(itemStack) * getEUMultiplier() * pulses;
 
         reactor.addEU(energy);
         fuelRod.applyDamage(itemStack, 1);
@@ -128,7 +128,7 @@ public int getFuelRodCount() {
     }
 
     private int getPulseCount() {
-        int pulses = 1 + this.getFuelRodCount() / 2;
+        int pulses = (1 + (this.getFuelRodCount() / 2)) * this.fuelRod.getFuelType().pulsesPerTick();
 
         for (var dir : InventoryDirection.values()) {
             int x2 = dir.offsetX(x);

src/main/java/org/gtreimagined/gt4r/reactor/item/foreign/ForeignFuelRodItem.java

@@ -5,6 +5,7 @@
 
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import org.gtreimagined.gt4r.reactor.components.FuelType;
 import org.gtreimagined.gt4r.reactor.components.IComponentAdapter;
 import org.gtreimagined.gt4r.reactor.components.IComponentAdapterFactory;
 import org.gtreimagined.gt4r.reactor.components.IReactorGrid;
@@ -15,22 +16,18 @@ public class ForeignFuelRodItem implements IBasicFuelRod, IComponentAdapterFacto
 
     @Nonnull
     protected final Item item;
-    protected final double energyMult;
-    protected final double heatMult;
+    protected final FuelType fuelType;
     protected final int rodCount;
-    protected final boolean isMox;
     protected final int maxHealth;
 
     @Nullable
     protected ItemStack product;
 
-    public ForeignFuelRodItem(@Nonnull Item item, double energyMult, double heatMult, int rodCount, boolean isMox,
-        int maxHealth) {
+    public ForeignFuelRodItem(@Nonnull Item item, FuelType fuelType, int rodCount,
+                              int maxHealth) {
         this.item = item;
-        this.energyMult = energyMult;
-        this.heatMult = heatMult;
+        this.fuelType = fuelType;
         this.rodCount = rodCount;
-        this.isMox = isMox;
         this.maxHealth = maxHealth;
     }
 
@@ -50,25 +47,15 @@ public boolean canAdaptItem(@Nonnull ItemStack itemStack) {
     }
 
     @Override
-    public double getEnergyMult(@Nonnull ItemStack itemStack) {
-        return energyMult;
-    }
-
-    @Override
-    public double getHeatMult(@Nonnull ItemStack itemStack) {
-        return heatMult;
+    public FuelType getFuelType() {
+        return fuelType;
     }
 
     @Override
     public int getRodCount(@Nonnull ItemStack itemStack) {
         return rodCount;
     }
 
-    @Override
-    public boolean isMox(@Nonnull ItemStack itemStack) {
-        return isMox;
-    }
-
     @Override
     public int getRemainingHealth(@Nonnull ItemStack itemStack) {
         return maxHealth - itemStack.getDamageValue();

src/main/java/org/gtreimagined/gt4r/reactor/item/interfaces/IBasicFuelRod.java

@@ -5,29 +5,17 @@
 
 import net.minecraft.world.item.ItemStack;
 import org.gtreimagined.gt4r.reactor.Config;
+import org.gtreimagined.gt4r.reactor.components.FuelType;
 
 public interface IBasicFuelRod {
 
-    public double getEnergyMult(@Nonnull ItemStack itemStack);
+    FuelType getFuelType();
 
-    public double getHeatMult(@Nonnull ItemStack itemStack);
+    int getRodCount(@Nonnull ItemStack itemStack);
 
-    public int getRodCount(@Nonnull ItemStack itemStack);
+    int getRemainingHealth(@Nonnull ItemStack itemStack);
 
-    public boolean isMox(@Nonnull ItemStack itemStack);
-
-    public default double getMoxHeatCoefficient(@Nonnull ItemStack itemStack) {
-        return 2.0;
-    }
-
-    public default double getMoxEUCoefficient(@Nonnull ItemStack itemStack) {
-        return Config.MOX_EU_COEFFICIENT;
-    }
-
-    public int getRemainingHealth(@Nonnull ItemStack itemStack);
-
-    public void applyDamage(@Nonnull ItemStack itemStack, int damage);
-
-    public @Nullable ItemStack getProduct(@Nonnull ItemStack itemStack);
+    void applyDamage(@Nonnull ItemStack itemStack, int damage);
 
+    @Nullable ItemStack getProduct(@Nonnull ItemStack itemStack);
 }