updated antimatter, fixed issue with thorium reactor draining all flu…

…id at once
GregTech-Intergalactical · Jul 31, 2024 · 469c9fb · 469c9fb
1 parent f18a71e
commit 469c9fb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/AntimatterAPI b/AntimatterAPI
diff --git a/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityNuclearReactorCore.java b/common/src/main/java/muramasa/gregtech/blockentity/single/BlockEntityNuclearReactorCore.java
@@ -381,25 +381,28 @@ public void onServerTickPost(Level level, BlockPos pos, boolean aFirst) {
                     isExploding = true;
                 } else {
                     tEnergy = handler.getHeat() / heatPerCoolant;
+                    int multiplier = hotCoolant == Steam ? 160 : 1;
                     int toFill = hotCoolant == Steam ? tEnergy * 160 : tEnergy;
-                    FluidHolder fluidHolder = hotCoolant.has(AntimatterMaterialTypes.GAS) ? hotCoolant.getGas(toFill) : hotCoolant.getLiquid(toFill);
-                    if (coldCoolant.getFluidAmount() >= tEnergy * TesseractGraphWrappers.dropletMultiplier && fluidHandler1.fillOutput(fluidHolder.copyHolder(), true) == toFill * TesseractGraphWrappers.dropletMultiplier){
-                        fluidHandler1.fillOutput(fluidHolder, false);
-                        handler.extractInternal(tEnergy * heatPerCoolant, false);
-                        fluidHandler1.drainInput(tEnergy * TesseractGraphWrappers.dropletMultiplier, false);
-                    } else if (tEnergy > 0) isExploding = true;
+                    if (tEnergy > 0){
+                        FluidHolder fluidHolder = hotCoolant.has(AntimatterMaterialTypes.GAS) ? hotCoolant.getGas(tEnergy * multiplier) : hotCoolant.getLiquid(tEnergy);
+                        if (coldCoolant.getFluidAmount() >= tEnergy * TesseractGraphWrappers.dropletMultiplier && fluidHandler1.fillOutput(fluidHolder.copyHolder(), true) == tEnergy * multiplier * TesseractGraphWrappers.dropletMultiplier){
+                            fluidHandler1.fillOutput(fluidHolder, false);
+                            handler.extractInternal(tEnergy * heatPerCoolant, false);
+                            fluidHandler1.drainInput(tEnergy * TesseractGraphWrappers.dropletMultiplier, false);
+                        }
+                    }
                 }
                 if (isExploding && !itemHandler.get().getHandler(SlotType.STORAGE).isEmpty()){
                     level.playSound(null, pos, SoundEvents.GENERIC_EXPLODE, SoundSource.BLOCKS, 1.0f, 1.0f);
-                    tCalc *= 2;
+                    /*tCalc *= 2;
                     setRod(0, ItemStack.EMPTY);
                     setRod(1, ItemStack.EMPTY);
                     setRod(2, ItemStack.EMPTY);
                     setRod(3, ItemStack.EMPTY);
                     for (LivingEntity tEntity : level.getEntitiesOfClass(LivingEntity.class, new AABB(pos.offset(-500, 0, -500).atY(level.getMinBuildHeight()), pos.offset(500, 0, 500).atY(level.getMaxBuildHeight())))){
                         int tStrength = CodeUtils.bindInt((long)(tCalc - tEntity.distanceToSqr(pos.getX(), pos.getY(), pos.getZ())));
                         if (tStrength > 0) Utils.applyRadioactivity(tEntity, (int)CodeUtils.divup(tStrength, 10), tStrength);
-                    }
+                    }*/
                 }
 
             }

diff --git a/common/src/main/java/muramasa/gregtech/data/Guis.java b/common/src/main/java/muramasa/gregtech/data/Guis.java
@@ -211,7 +211,7 @@ public static void slots(){
         COMBUSTION_GENERATOR.add(BASIC_TANK.getSlots());
         SEMIFLUID_GENERATOR.add(BASIC_TANK.getSlots());
         NAQUADAH_GENERATOR.add(BASIC_TANK.getSlots());
-        NUCLEAR_REACTOR_CORE.add(STORAGE, 70, 25).add(STORAGE, 70, 43).add(STORAGE, 88, 25).add(STORAGE, 88, 43);
+        NUCLEAR_REACTOR_CORE.add(STORAGE, 70, 25).add(STORAGE, 70, 43).add(STORAGE, 88, 25).add(STORAGE, 88, 43).add(FL_IN, 70, 61).add(FL_OUT, 88, 61);
         SMALL_HEAT_EXCHANGER.add(IT_IN, 53, 25).add(IT_OUT, 107, 25).add(FL_IN, 44, 63).add(FL_IN, 62, 63)
                 .add(FL_OUT,107,63).add(FL_OUT,125,63);