rewrote breeder rods a little

Author: Trinsdar

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

@@ -6,13 +6,13 @@
 
 import java.util.List;
 
-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) {
+public record FuelType(int durability, double energyMult, double heatMult, int pulsesPerTick,  int connectivityPulses, boolean isMox, double explosionMult, double moxHeatCoefficient, double moxEUCoefficient, int breedingHeat, List<int2> pulseArea, List<int2> heatPulseArea) {
     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));
     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));
 
     public static final FuelType URANIUM = new FuelType(10000, 1.0, 4.0, 1, 1, false, 1.0);
 
     public FuelType(int durability, double energyMult, double heatMult, int pulsesPerTick, int connectivityPulses, boolean isMox, double explosionMult){
-        this(durability, energyMult, heatMult, pulsesPerTick, connectivityPulses, isMox, explosionMult, 2.0, Config.MOX_EU_COEFFICIENT, DEFAULT_AREA, DEFAULT_AREA);
+        this(durability, energyMult, heatMult, pulsesPerTick, connectivityPulses, isMox, explosionMult, 2.0, Config.MOX_EU_COEFFICIENT, 3000, DEFAULT_AREA, DEFAULT_AREA);
     }
 }

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

@@ -38,43 +38,25 @@ public ItemStack getItemStack() {
     }
 
     @Override
-    public void onHeatTick(boolean isActive) {
-        if (!isActive) {
-            return;
-        }
-
-        int neighbouringRods = 0;
-
-        for (var dir : InventoryDirection.values()) {
-            int x2 = dir.offsetX(x);
-            int y2 = dir.offsetY(y);
-
-            if (x2 < 0 || y2 < 0 || x2 >= reactor.getWidth() || y2 >= reactor.getHeight()) {
-                continue;
-            }
-
-            var neighbour = reactor.getComponent(x2, y2);
+    public boolean acceptPulse(IComponentAdapter source, boolean heatTick) {
+        if (heatTick) {
+            int heatMultiplier = 1 + reactor.getHullHeat() / breederRod.getFuelType().breedingHeat();
 
-            if (neighbour != null) {
-                neighbouringRods += neighbour.getFuelRodCount();
-            }
-        }
-
-        int heatMultiplier = 1 + reactor.getHullHeat() / breederRod.getReactorHeatDivisor(itemStack)
-            * breederRod.getHeatMultiplier(itemStack);
+            int storedNeutrons = breederRod.getStoredNeutrons(itemStack);
 
-        int storedNeutrons = breederRod.getStoredNeutrons(itemStack);
+            storedNeutrons += heatMultiplier;
 
-        storedNeutrons += neighbouringRods * heatMultiplier;
+            int max = breederRod.getMaxNeutrons(itemStack);
 
-        int max = breederRod.getMaxNeutrons(itemStack);
+            storedNeutrons = Math.min(storedNeutrons, max);
 
-        storedNeutrons = Math.min(storedNeutrons, max);
+            breederRod.setNeutrons(itemStack, storedNeutrons);
 
-        breederRod.setNeutrons(itemStack, storedNeutrons);
-
-        if (storedNeutrons >= max) {
-            reactor.setItem(x, y, breederRod.getProduct(itemStack).copy());
+            if (storedNeutrons >= max) {
+                reactor.setItem(x, y, breederRod.getProduct(itemStack).copy());
+            }
         }
+        return true;
     }
+
 }

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

@@ -6,6 +6,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;
@@ -16,17 +17,14 @@ public class ForeignBreederRodItem implements IBreederRod, IComponentAdapterFact
 
     @Nonnull
     private final Item item;
-
-    private final int heatDivisor, heatMultiplier, maxNeutrons;
+    private final FuelType fuelType;
 
     @Nullable
     private ItemStack product;
 
-    public ForeignBreederRodItem(@Nonnull Item item, int heatDivisor, int heatMultiplier, int maxNeutrons) {
+    public ForeignBreederRodItem(@Nonnull Item item, FuelType fuelType) {
         this.item = item;
-        this.heatDivisor = heatDivisor;
-        this.heatMultiplier = heatMultiplier;
-        this.maxNeutrons = maxNeutrons;
+        this.fuelType = fuelType;
     }
 
     @Override
@@ -45,9 +43,14 @@ public ItemStack getProduct(@Nonnull ItemStack itemStack) {
         return product;
     }
 
+    @Override
+    public FuelType getFuelType() {
+        return fuelType;
+    }
+
     @Override
     public int getMaxNeutrons(@Nonnull ItemStack itemStack) {
-        return maxNeutrons;
+        return fuelType.durability();
     }
 
     @Override
@@ -60,16 +63,6 @@ public void setNeutrons(@Nonnull ItemStack itemStack, int neutrons) {
         itemStack.setDamageValue(neutrons);
     }
 
-    @Override
-    public int getReactorHeatDivisor(@Nonnull ItemStack itemStack) {
-        return heatDivisor;
-    }
-
-    @Override
-    public int getHeatMultiplier(@Nonnull ItemStack itemStack) {
-        return heatMultiplier;
-    }
-
     public void setProduct(@Nullable ItemStack product) {
         this.product = product;
     }

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

@@ -1,21 +1,20 @@
 package org.gtreimagined.gt4r.reactor.item.interfaces;
 
 import net.minecraft.world.item.ItemStack;
+import org.gtreimagined.gt4r.reactor.components.FuelType;
 
 import javax.annotation.Nonnull;
 
 
 public interface IBreederRod {
 
-    public ItemStack getProduct(@Nonnull ItemStack itemStack);
+    ItemStack getProduct(@Nonnull ItemStack itemStack);
 
-    public int getMaxNeutrons(@Nonnull ItemStack itemStack);
+    FuelType getFuelType();
 
-    public int getStoredNeutrons(@Nonnull ItemStack itemStack);
+    int getMaxNeutrons(@Nonnull ItemStack itemStack);
 
-    public void setNeutrons(@Nonnull ItemStack itemStack, int neutrons);
+    int getStoredNeutrons(@Nonnull ItemStack itemStack);
 
-    public int getReactorHeatDivisor(@Nonnull ItemStack itemStack);
-
-    public int getHeatMultiplier(@Nonnull ItemStack itemStack);
+    void setNeutrons(@Nonnull ItemStack itemStack, int neutrons);
 }