Nuclear fission

.github/workflows/nuclear_test_release.yml

@@ -1,4 +1,4 @@
-name: Nuclear Test Release
+name: Java CI with Gradle on main Commit
 
 on:
   push:

gradle.properties

@@ -7,7 +7,7 @@ modGroup = gregtech
 
 # Version of your mod.
 # This field can be left empty if you want your mod's version to be determined by the latest git tag instead.
-modVersion = 2.8.7-beta
+modVersion = 2.9.0-beta
 
 # Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version)
 includeMCVersionJar = true

src/main/java/gregtech/api/capability/GregtechDataCodes.java

@@ -148,6 +148,9 @@ public static int assignId() {
     public static final int LOCK_OBJECT_HOLDER = assignId();
     public static final int CACHED_CWU = assignId();
 
+    // Fission Hatches
+    public static final int LOCK_UPDATE = assignId();
+
     // NBT Keys
 
     // From MetaTileEntityHolder
@@ -170,6 +173,10 @@ public static int assignId() {
     public static final int UPDATE_SOUND = assignId();
     public static final int UPDATE_RADIUS = assignId();
 
+    // Fission Reactor
+    public static int SYNC_REACTOR_STATS = assignId();
+    public static int SYNC_LOCKING_STATE = assignId();
+
     // ME Parts
     public static final int UPDATE_AUTO_PULL = assignId();
     public static final int UPDATE_ONLINE_STATUS = assignId();

src/main/java/gregtech/api/capability/ICoolantHandler.java

@@ -0,0 +1,15 @@
+package gregtech.api.capability;
+
+import gregtech.api.capability.impl.LockableFluidTank;
+import gregtech.api.unification.material.Material;
+
+import net.minecraftforge.fluids.Fluid;
+
+public interface ICoolantHandler extends ILockableHandler<Fluid> {
+
+    Material getCoolant();
+
+    void setCoolant(Material material);
+
+    LockableFluidTank getFluidTank();
+}

src/main/java/gregtech/api/capability/IFuelRodHandler.java

@@ -0,0 +1,24 @@
+package gregtech.api.capability;
+
+import gregtech.api.items.itemhandlers.LockableItemStackHandler;
+import gregtech.api.nuclear.fission.components.FuelRod;
+import gregtech.api.unification.material.Material;
+
+import net.minecraft.item.ItemStack;
+
+public interface IFuelRodHandler extends ILockableHandler<ItemStack> {
+
+    Material getFuel();
+
+    void setFuel(Material material);
+
+    Material getPartialFuel();
+
+    // Set the fuel type that's currently being processed by the reactor, and succeeds in doing so only if it is a
+    // fission fuel. Returns true if the partial fuel changed.
+    boolean setPartialFuel(Material material);
+
+    void setInternalFuelRod(FuelRod rod);
+
+    LockableItemStackHandler getStackHandler();
+}

src/main/java/gregtech/api/capability/ILockableHandler.java

@@ -0,0 +1,10 @@
+package gregtech.api.capability;
+
+public interface ILockableHandler<T> {
+
+    void setLock(boolean isLocked);
+
+    boolean isLocked();
+
+    T getLockedObject();
+}

src/main/java/gregtech/api/capability/impl/LockableFluidTank.java

@@ -0,0 +1,80 @@
+package gregtech.api.capability.impl;
+
+import gregtech.api.capability.ILockableHandler;
+import gregtech.api.metatileentity.MetaTileEntity;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidTank;
+
+public class LockableFluidTank extends NotifiableFluidTank implements ILockableHandler<Fluid> {
+
+    private boolean locked;
+    private Fluid lockedFluid;
+
+    public LockableFluidTank(int capacity, MetaTileEntity entityToNotify, boolean isExport) {
+        super(capacity, entityToNotify, isExport);
+    }
+
+    @Override
+    public Fluid getLockedObject() {
+        return lockedFluid;
+    }
+
+    @Override
+    public void setLock(boolean isLocked) {
+        locked = isLocked;
+    }
+
+    @Override
+    public int fill(FluidStack resource, boolean doFill) {
+        int filled = super.fill(resource, doFill);
+        if (doFill && this.fluid != null && this.fluid.amount != 0) {
+            this.lockedFluid = this.fluid.getFluid();
+        }
+        return filled;
+    }
+
+    @Override
+    public void setFluid(FluidStack fluid) {
+        super.setFluid(fluid);
+        if (this.fluid != null && this.fluid.amount != 0) {
+            this.lockedFluid = this.fluid.getFluid();
+        }
+    }
+
+    @Override
+    public boolean isLocked() {
+        return locked;
+    }
+
+    @Override
+    public boolean canFillFluidType(FluidStack fluid) {
+        if (locked && fluid.getFluid() != lockedFluid) {
+            return false;
+        }
+        return super.canFillFluidType(fluid);
+    }
+
+    @Override
+    public FluidTank readFromNBT(NBTTagCompound nbt) {
+        super.readFromNBT(nbt);
+        if (nbt.hasKey("LockedFluid")) {
+            this.lockedFluid = FluidRegistry.getFluid(nbt.getString("LockedFluid"));
+        } else if (this.fluid != null && this.fluid.amount != 0) {
+            this.lockedFluid = this.fluid.getFluid();
+        }
+        return this;
+    }
+
+    @Override
+    public NBTTagCompound writeToNBT(NBTTagCompound nbt) {
+        super.writeToNBT(nbt);
+        if (lockedFluid != null) {
+            nbt.setString("LockedFluid", lockedFluid.getName());
+        }
+        return nbt;
+    }
+}

src/main/java/gregtech/api/capability/impl/NoEnergyMultiblockRecipeLogic.java

@@ -0,0 +1,55 @@
+package gregtech.api.capability.impl;
+
+import gregtech.api.GTValues;
+import gregtech.api.metatileentity.multiblock.RecipeMapMultiblockController;
+import gregtech.api.recipes.logic.OverclockingLogic;
+import gregtech.api.recipes.recipeproperties.IRecipePropertyStorage;
+
+import org.jetbrains.annotations.NotNull;
+
+public class NoEnergyMultiblockRecipeLogic extends MultiblockRecipeLogic {
+
+    public NoEnergyMultiblockRecipeLogic(RecipeMapMultiblockController tileEntity) {
+        super(tileEntity);
+    }
+
+    protected long getEnergyInputPerSecond() {
+        return 2147483647L;
+    }
+
+    protected long getEnergyStored() {
+        return 0L;
+    }
+
+    protected long getEnergyCapacity() {
+        return 2147483647L;
+    }
+
+    protected boolean drawEnergy(int recipeEUt, boolean simulate) {
+        return true;
+    }
+
+    public long getMaxVoltage() {
+        return 1L;
+    }
+
+    protected int[] runOverclockingLogic(@NotNull IRecipePropertyStorage propertyStorage, int recipeEUt,
+                                         long maxVoltage, int recipeDuration, int amountOC) {
+        return OverclockingLogic.standardOverclockingLogic(1, this.getMaxVoltage(), recipeDuration, amountOC,
+                this.getOverclockingDurationDivisor(), this.getOverclockingVoltageMultiplier());
+    }
+
+    public long getMaximumOverclockVoltage() {
+        return GTValues.V[1];
+    }
+
+    public void invalidate() {
+        this.previousRecipe = null;
+        this.progressTime = 0;
+        this.maxProgressTime = 0;
+        this.recipeEUt = 0;
+        this.fluidOutputs = null;
+        this.itemOutputs = null;
+        this.setActive(false);
+    }
+}

src/main/java/gregtech/api/gui/GuiTextures.java

@@ -125,6 +125,8 @@ public class GuiTextures {
             .fullImage("textures/gui/widget/button_throttle_minus.png");
     public static final TextureArea BUTTON_THROTTLE_PLUS = TextureArea
             .fullImage("textures/gui/widget/button_throttle_plus.png");
+    public static final TextureArea BUTTON_CONTROL_ROD_HELPER = TextureArea
+            .fullImage("textures/gui/widget/button_control_rod_helper.png");
 
     // INDICATORS & ICONS
     public static final TextureArea INDICATOR_NO_ENERGY = TextureArea
@@ -139,6 +141,11 @@ public class GuiTextures {
     public static final TextureArea SLIDER_BACKGROUND_VERTICAL = TextureArea
             .fullImage("textures/gui/widget/slider_background_vertical.png");
     public static final TextureArea SLIDER_ICON = TextureArea.fullImage("textures/gui/widget/slider.png");
+    public static final TextureArea DARK_SLIDER_BACKGROUND = TextureArea
+            .fullImage("textures/gui/widget/dark_slider_background.png");
+    public static final TextureArea DARK_SLIDER_BACKGROUND_VERTICAL = TextureArea
+            .fullImage("textures/gui/widget/dark_slider_background_vertical.png");
+    public static final TextureArea DARK_SLIDER_ICON = TextureArea.fullImage("textures/gui/widget/dark_slider.png");
     public static final TextureArea MAINTENANCE_ICON = TextureArea
             .fullImage("textures/gui/widget/button_maintenance.png");
 
@@ -411,6 +418,12 @@ public class GuiTextures {
             .fullImage("textures/gui/progress_bar/progress_bar_turbine_rotor_durability.png");
     public static final TextureArea PROGRESS_BAR_FLUID_RIG_DEPLETION = TextureArea
             .fullImage("textures/gui/progress_bar/progress_bar_fluid_rig_depletion.png");
+    public static final TextureArea PROGRESS_BAR_FISSION_HEAT = TextureArea
+            .fullImage("textures/gui/progress_bar/progress_bar_fission_heat.png");
+    public static final TextureArea PROGRESS_BAR_FISSION_PRESSURE = TextureArea
+            .fullImage("textures/gui/progress_bar/progress_bar_fission_pressure.png");
+    public static final TextureArea PROGRESS_BAR_FISSION_ENERGY = TextureArea
+            .fullImage("textures/gui/progress_bar/progress_bar_fission_energy.png");
 
     // Fusion reactor diagram progress bar parts
     public static final TextureArea PROGRESS_BAR_FUSION_REACTOR_DIAGRAM_BL = TextureArea

src/main/java/gregtech/api/gui/widgets/AdvancedTextWidget.java

@@ -43,7 +43,7 @@ public class AdvancedTextWidget extends Widget {
 
     protected final Consumer<List<ITextComponent>> textSupplier;
     protected BiConsumer<String, ClickData> clickHandler;
-    private List<ITextComponent> displayText = new ArrayList<>();
+    protected List<ITextComponent> displayText = new ArrayList<>();
     private final int color;
 
     public AdvancedTextWidget(int xPosition, int yPosition, Consumer<List<ITextComponent>> text, int color) {

src/main/java/gregtech/api/gui/widgets/RecolorableTextWidget.java

@@ -0,0 +1,61 @@
+package gregtech.api.gui.widgets;
+
+import gregtech.api.gui.IRenderContext;
+import gregtech.api.util.Position;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.IntSupplier;
+
+/**
+ * Represents a text-component based widget, which obtains
+ * text from server and automatically synchronizes it with clients
+ */
+public class RecolorableTextWidget extends AdvancedTextWidget {
+
+    private final IntSupplier colorSupplier;
+    private int color;
+
+    public RecolorableTextWidget(int xPosition, int yPosition, Consumer<List<ITextComponent>> text,
+                                 IntSupplier colorSupplier) {
+        super(xPosition, yPosition, text, 0);
+        this.colorSupplier = colorSupplier;
+    }
+
+    @Override
+    public void detectAndSendChanges() {
+        super.detectAndSendChanges();
+        int color = colorSupplier.getAsInt();
+        if (this.color != color) {
+            this.color = color;
+            writeUpdateInfo(2, buf -> buf.writeVarInt(color));
+        }
+    }
+
+    @Override
+    public void readUpdateInfo(int id, PacketBuffer buffer) {
+        super.readUpdateInfo(id, buffer);
+        if (id == 2) {
+            color = buffer.readVarInt();
+        }
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void drawInBackground(int mouseX, int mouseY, float partialTicks, IRenderContext context) {
+        super.drawInBackground(mouseX, mouseY, partialTicks, context);
+        FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
+        Position position = getPosition();
+        for (int i = 0; i < displayText.size(); i++) {
+            fontRenderer.drawString(displayText.get(i).getFormattedText(), position.x,
+                    position.y + i * (fontRenderer.FONT_HEIGHT + 2), color);
+        }
+    }
+}

src/main/java/gregtech/api/gui/widgets/SliderWidget.java

@@ -25,21 +25,21 @@ public class SliderWidget extends Widget {
     public static final BiFunction<String, Float, String> DEFAULT_TEXT_SUPPLIER = (name, value) -> I18n.format(name,
             value.intValue());
 
-    private int sliderWidth = 8;
-    private TextureArea backgroundArea = GuiTextures.SLIDER_BACKGROUND;
-    private TextureArea sliderIcon = GuiTextures.SLIDER_ICON;
+    protected int sliderWidth = 8;
+    protected TextureArea backgroundArea = GuiTextures.SLIDER_BACKGROUND;
+    protected TextureArea sliderIcon = GuiTextures.SLIDER_ICON;
     private final BiFunction<String, Float, String> textSupplier = DEFAULT_TEXT_SUPPLIER;
-    private int textColor = 0xFFFFFF;
+    protected int textColor = 0xFFFFFF;
 
-    private final float min;
-    private final float max;
+    protected final float min;
+    protected final float max;
     private final String name;
 
     private final FloatConsumer responder;
     private boolean isPositionSent;
 
-    private String displayString;
-    private float sliderPosition;
+    protected String displayString;
+    protected float sliderPosition;
     public boolean isMouseDown;
 
     public SliderWidget(String name, int xPosition, int yPosition, int width, int height, float min, float max,