Merge pull request #65 from EightXOR8/main

Get Latex Collector to Fill Completely

src/main/java/supersymmetry/api/gui/SusyGuiTextures.java

@@ -18,4 +18,5 @@ public class SusyGuiTextures {
     public static final TextureArea SIFTER_FLUID_OVERLAY = TextureArea.fullImage("textures/gui/overlay/sifter_fluid_overlay.png");
     public static final TextureArea SIFTER_ITEM_INPUT_OVERLAY = TextureArea.fullImage("textures/gui/overlay/sifter_item_input_overlay.png");
     public static final TextureArea SIFTER_ITEM_OUTPUT_OVERLAY = TextureArea.fullImage("textures/gui/overlay/sifter_item_output_overlay.png");
+    public static final TextureArea CUBIC_LATTICE_OVERLAY = TextureArea.fullImage("textures/gui/overlay/cubic_lattice_overlay.png");
 }

src/main/java/supersymmetry/api/recipes/SuSyRecipeMaps.java

@@ -8,6 +8,7 @@
 import gregtech.api.recipes.builders.PrimitiveRecipeBuilder;
 import gregtech.api.recipes.builders.SimpleRecipeBuilder;
 import gregtechfoodoption.recipe.GTFORecipeMaps;
+import net.minecraft.client.gui.Gui;
 import supersymmetry.api.gui.SusyGuiTextures;
 import supersymmetry.api.recipes.builders.CoilingCoilRecipeBuilder;
 import supersymmetry.api.recipes.builders.NoEnergyRecipeBuilder;
@@ -54,18 +55,52 @@ public class SuSyRecipeMaps {
             .setSlotOverlay(true, true, GuiTextures.MOLECULAR_OVERLAY_3)
             .setSound(GTSoundEvents.CHEMICAL_REACTOR);
 
-    public static final RecipeMap<SimpleRecipeBuilder> CRYSTALLIZER_RECIPES = new RecipeMap<>("crystallizer",1, 1, 3, 1, new SimpleRecipeBuilder(), false)
-            .setSound(GTSoundEvents.CHEMICAL_REACTOR);
-
     public static final RecipeMap<SimpleRecipeBuilder> BUBBLE_COLUMN_REACTOR_RECIPES = new RecipeMap<>("bubble_column_reactor", 1, 0, 3, 2, new SimpleRecipeBuilder(), false)
             .setSlotOverlay(false, false, SusyGuiTextures.LARGE_REACTOR_ITEM_OVERLAY)
             .setSlotOverlay(false, true, GuiTextures.MOLECULAR_OVERLAY_3)
             .setSlotOverlay(true, true, GuiTextures.MOLECULAR_OVERLAY_3)
             .setSound(GTSoundEvents.CHEMICAL_REACTOR);
 
+    public static final RecipeMap<SimpleRecipeBuilder> BATCH_REACTOR_RECIPES = new RecipeMap<>("batch_reactor", 3, 3, 3, 3, new SimpleRecipeBuilder(), false)
+            .setProgressBar(GuiTextures.PROGRESS_BAR_MIXER, ProgressWidget.MoveType.CIRCULAR)
+            .setSlotOverlay(false, false, false, GuiTextures.DUST_OVERLAY)
+            .setSlotOverlay(false, false, true, GuiTextures.DUST_OVERLAY)
+            .setSlotOverlay(false, true, false, GuiTextures.BEAKER_OVERLAY_3)
+            .setSlotOverlay(false, true, true, GuiTextures.BEAKER_OVERLAY_3)
+            .setSlotOverlay(true, false, false, GuiTextures.DUST_OVERLAY)
+            .setSlotOverlay(true, false, true, GuiTextures.DUST_OVERLAY)
+            .setSlotOverlay(true, true, false, GuiTextures.BEAKER_OVERLAY_3)
+            .setSlotOverlay(true, true, true, GuiTextures.BEAKER_OVERLAY_3)
+            .setSound(GTSoundEvents.CHEMICAL_REACTOR);
+
+    public static final RecipeMap<SimpleRecipeBuilder> CRYSTALLIZER_RECIPES = new RecipeMap<>("crystallizer",1, 1, 3, 1, new SimpleRecipeBuilder(), false)
+            .setSound(GTSoundEvents.CHEMICAL_REACTOR);
+
     public static final RecipeMap<SimpleRecipeBuilder> DRYER = new RecipeMap<>("dryer", 1, 1, 1, 1, new SimpleRecipeBuilder(), false)
             .setSound(GTSoundEvents.COOLING);
 
+    public static final RecipeMap<SimpleRecipeBuilder> ION_EXCHANGE_COLUMN_RECIPES = new RecipeMap<>("ion_exchange_column", 1, 1, 2, 2, new SimpleRecipeBuilder(), false)
+            .setProgressBar(GuiTextures.PROGRESS_BAR_SIFT, ProgressWidget.MoveType.VERTICAL)
+            .setSlotOverlay(false, false, true, SusyGuiTextures.CUBIC_LATTICE_OVERLAY)
+            .setSlotOverlay(false, true, true, GuiTextures.MOLECULAR_OVERLAY_4)
+            .setSlotOverlay(true, false, true, SusyGuiTextures.CUBIC_LATTICE_OVERLAY)
+            .setSlotOverlay(true, true, true, GuiTextures.MOLECULAR_OVERLAY_4)
+            .setSound(GTSoundEvents.CHEMICAL_REACTOR);
+
+    public static final RecipeMap<SimpleRecipeBuilder> ZONE_REFINER_RECIPES = new RecipeMap<>("zone_refiner", 1, 1, 0, 0, new SimpleRecipeBuilder(), false)
+            .setProgressBar(GuiTextures.PROGRESS_BAR_CRYSTALLIZATION, ProgressWidget.MoveType.HORIZONTAL)
+            .setSlotOverlay(false, false, true, GuiTextures.FURNACE_OVERLAY_1)
+            .setSlotOverlay(true, false, true, GuiTextures.CRYSTAL_OVERLAY)
+            .setSound(GTSoundEvents.FURNACE);
+
+    public static final RecipeMap<SimpleRecipeBuilder> TUBE_FURNACE_RECIPES = new RecipeMap<>("tube_furnace", 3, 1, 1, 0, new SimpleRecipeBuilder(), false)
+            .setProgressBar(GuiTextures.PROGRESS_BAR_ARC_FURNACE, ProgressWidget.MoveType.HORIZONTAL)
+            .setSlotOverlay(false, false, false, GuiTextures.FURNACE_OVERLAY_1)
+            .setSlotOverlay(false, false, true, GuiTextures.FURNACE_OVERLAY_1)
+            .setSlotOverlay(false, true, true, GuiTextures.TURBINE_OVERLAY)
+            .setSlotOverlay(true, false, true, SusyGuiTextures.CUBIC_LATTICE_OVERLAY)
+            .setSound(GTSoundEvents.CHEMICAL_REACTOR);
+
     public static final RecipeMap<SimpleRecipeBuilder> FLUIDIZED_BED_REACTOR_RECIPES = new RecipeMap<>("fluidized_bed_reactor", 2, 1, 3, 2, new SimpleRecipeBuilder(), false)
             .setSlotOverlay(false, true, SusyGuiTextures.LARGE_REACTOR_FLUID_OVERLAY)
             .setSlotOverlay(true, true, SusyGuiTextures.LARGE_REACTOR_FLUID_OVERLAY)

src/main/java/supersymmetry/client/renderer/textures/SusyTextures.java

@@ -6,6 +6,7 @@
 import gregtech.client.renderer.texture.cube.SimpleSidedCubeRenderer;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.relauncher.Side;
+import scala.tools.nsc.transform.patmat.Logic;
 import supersymmetry.Supersymmetry;
 
 import static gregtech.client.renderer.texture.cube.OrientedOverlayRenderer.OverlayFace.FRONT;
@@ -20,9 +21,15 @@ public class SusyTextures {
     public static OrientedOverlayRenderer CONTINUOUS_STIRRED_TANK_REACTOR_OVERLAY;
     public static OrientedOverlayRenderer FIXED_BED_REACTOR_OVERLAY;
     public static OrientedOverlayRenderer TRICKLE_BED_REACTOR_OVERLAY;
-    public static OrientedOverlayRenderer CRYSTALLIZER_OVERLAY;
     public static OrientedOverlayRenderer BUBBLE_COLUMN_REACTOR_OVERLAY;
+    public static OrientedOverlayRenderer BATCH_REACTOR_OVERLAY;
+
+    public static OrientedOverlayRenderer CRYSTALLIZER_OVERLAY;
     public static OrientedOverlayRenderer DRYER_OVERLAY;
+    public static OrientedOverlayRenderer ION_EXCHANGE_COLUMN_OVERLAY;
+    public static OrientedOverlayRenderer ZONE_REFINER_OVERLAY;
+    public static OrientedOverlayRenderer TUBE_FURNACE_OVERLAY;
+
     public static OrientedOverlayRenderer UV_LIGHT_BOX_OVERLAY;
     public static OrientedOverlayRenderer ION_IMPLANTER_OVERLAY;
     public static OrientedOverlayRenderer CVD_OVERLAY;
@@ -42,9 +49,15 @@ public static void preInit(){
         CONTINUOUS_STIRRED_TANK_REACTOR_OVERLAY = new OrientedOverlayRenderer("machines/continuous_stirred_tank_reactor");
         FIXED_BED_REACTOR_OVERLAY = new OrientedOverlayRenderer("machines/fixed_bed_reactor");
         TRICKLE_BED_REACTOR_OVERLAY = new OrientedOverlayRenderer("machines/trickle_bed_reactor");
-        CRYSTALLIZER_OVERLAY = new OrientedOverlayRenderer("machines/crystallizer");
         BUBBLE_COLUMN_REACTOR_OVERLAY = new OrientedOverlayRenderer("machines/bubble_column_reactor");
+        BATCH_REACTOR_OVERLAY = new OrientedOverlayRenderer("machines/batch_reactor");
+
+        CRYSTALLIZER_OVERLAY = new OrientedOverlayRenderer("machines/crystallizer");
         DRYER_OVERLAY = new OrientedOverlayRenderer("machines/dryer");
+        ION_EXCHANGE_COLUMN_OVERLAY = new OrientedOverlayRenderer("machines/ion_exchange_column");
+        ZONE_REFINER_OVERLAY = new OrientedOverlayRenderer("machines/zone_refiner");
+        TUBE_FURNACE_OVERLAY = new OrientedOverlayRenderer("machines/tube_furnace");
+
         UV_LIGHT_BOX_OVERLAY = new OrientedOverlayRenderer("machines/uv_light_box");
         CVD_OVERLAY = new OrientedOverlayRenderer("machines/cvd");
         ION_IMPLANTER_OVERLAY = new OrientedOverlayRenderer("machines/ion_implanter");

src/main/java/supersymmetry/common/metatileentities/SuSyMetaTileEntities.java

@@ -54,13 +54,17 @@ public class SuSyMetaTileEntities {
     public static ContinuousMachineMetaTileEntity[] CONTINUOUS_STIRRED_TANK_REACTOR;
     public static ContinuousMachineMetaTileEntity[] FIXED_BED_REACTOR;
     public static ContinuousMachineMetaTileEntity[] TRICKLE_BED_REACTOR;
-    public static SimpleMachineMetaTileEntity[] CRYSTALLIZER;
     public static ContinuousMachineMetaTileEntity[] BUBBLE_COLUMN_REACTOR;
+    public static SimpleMachineMetaTileEntity[] BATCH_REACTOR;
+    public static SimpleMachineMetaTileEntity[] CRYSTALLIZER;
     public static SimpleMachineMetaTileEntity[] DRYER;
+    public static SimpleMachineMetaTileEntity[] ION_EXCHANGE_COLUMN;
+    public static SimpleMachineMetaTileEntity[] ZONE_REFINER;
+    public static SimpleMachineMetaTileEntity[] TUBE_FURNACE;
     public static MetaTileEntityFluidizedBedReactor FLUIDIZED_BED_REACTOR;
     public static MetaTileEntityPolmyerizationTank POLYMERIZATION_TANK;
-
     public static MetaTileEntityElectrolyticCell ELECTROLYTIC_CELL;
+
     // Machines for Oil Overhaul
     public static MetaTileEntityCokingTower COKING_TOWER;
     public static MetaTileEntityVacuumDistillationTower VACUUM_DISTILLATION_TOWER;
@@ -84,46 +88,50 @@ public static void init() {
         LATEX_COLLECTOR[3] = registerMetaTileEntity(14505, new MetaTileEntityLatexCollector(susyId("latex_collector.ev"),4));
 
         LATEX_COLLECTOR_BRONZE = registerMetaTileEntity(14510, new MetaTileEntitySteamLatexCollector(susyId("latex_collector.bronze")));
+        SINTERING_OVEN = registerMetaTileEntity(14521, new MetaTileEntitySinteringOven(susyId("sintering_oven")));
 
         registerSimpleSteamMTE(STEAM_VULCANIZING_PRESS, 14515, "vulcanizing_press", SuSyRecipeMaps.VULCANIZATION_RECIPES, SuSySteamProgressIndicators.COMPRESS, SusyTextures.VULCANIZING_PRESS_OVERLAY, true);
         registerSimpleMTE(VULCANIZING_PRESS, 3, 14517, "vulcanizing_press", SuSyRecipeMaps.VULCANIZATION_RECIPES, SusyTextures.VULCANIZING_PRESS_OVERLAY, true);
 
-        SINTERING_OVEN = registerMetaTileEntity(14521, new MetaTileEntitySinteringOven(susyId("sintering_oven")));
-
-        registerSimpleSteamMTE(STEAM_ROASTER, 14722, "roaster", SuSyRecipeMaps.ROASTER_RECIPES, SuSySteamProgressIndicators.ARROW, SusyTextures.ROASTER_OVERLAY, true);
+        registerSimpleSteamMTE(STEAM_ROASTER, 14679, "roaster", SuSyRecipeMaps.ROASTER_RECIPES, SuSySteamProgressIndicators.ARROW, SusyTextures.ROASTER_OVERLAY, true);
         registerSimpleMTE(ROASTER, 12, 14523, "roaster", SuSyRecipeMaps.ROASTER_RECIPES, SusyTextures.ROASTER_OVERLAY, true);
 
         registerSimpleSteamMTE(STEAM_MIXER, 14536, "mixer", RecipeMaps.MIXER_RECIPES, SuSySteamProgressIndicators.MIXER, SusyTextures.MIXER_OVERLAY_STEAM, false);
 
         registerSimpleSteamMTE(STEAM_VACUUM_CHAMBER, 14538, "vacuum_chamber", SuSyRecipeMaps.VACUUM_CHAMBER, SuSySteamProgressIndicators.COMPRESS, Textures.GAS_COLLECTOR_OVERLAY, false);
         registerSimpleMTE(VACUUM_CHAMBER, 12, 14540, "vacuum_chamber", SuSyRecipeMaps.VACUUM_CHAMBER, Textures.GAS_COLLECTOR_OVERLAY, true);
 
-        LEAD_DRUM = registerMetaTileEntity(14553, new MetaTileEntityDrum(susyId("drum.lead"), Materials.Lead, 32000));
-
+        //chem overhaul
         registerContinuousMachineMTE(CONTINUOUS_STIRRED_TANK_REACTOR, 12, 14554, "continuous_stirred_tank_reactor", SuSyRecipeMaps.CSTR_RECIPES, SusyTextures.CONTINUOUS_STIRRED_TANK_REACTOR_OVERLAY, true, GTUtility.defaultTankSizeFunction);
         registerContinuousMachineMTE(FIXED_BED_REACTOR, 12, 14567, "fixed_bed_reactor", SuSyRecipeMaps.FIXED_BED_REACTOR_RECIPES, SusyTextures.FIXED_BED_REACTOR_OVERLAY, true, GTUtility.defaultTankSizeFunction);
         registerContinuousMachineMTE(TRICKLE_BED_REACTOR, 12, 14580, "trickle_bed_reactor", SuSyRecipeMaps.TRICKLE_BED_REACTOR_RECIPES, SusyTextures.TRICKLE_BED_REACTOR_OVERLAY, true, GTUtility.defaultTankSizeFunction);
-        registerSimpleMTE(CRYSTALLIZER, 12, 14593, "crystallizer", SuSyRecipeMaps.CRYSTALLIZER_RECIPES, SusyTextures.CRYSTALLIZER_OVERLAY, true, GTUtility.defaultTankSizeFunction);
         registerContinuousMachineMTE(BUBBLE_COLUMN_REACTOR, 12, 14606, "bubble_column_reactor", SuSyRecipeMaps.BUBBLE_COLUMN_REACTOR_RECIPES, SusyTextures.BUBBLE_COLUMN_REACTOR_OVERLAY, true, GTUtility.defaultTankSizeFunction);
 
-        FLUIDIZED_BED_REACTOR = registerMetaTileEntity(14619, new MetaTileEntityFluidizedBedReactor(susyId("fluidized_bed_reactor")));
-        POLYMERIZATION_TANK = registerMetaTileEntity(14620, new MetaTileEntityPolmyerizationTank(susyId("polymerization_tank")));
+        registerSimpleMTE(BATCH_REACTOR, 12, 14681, "batch_reactor", SuSyRecipeMaps.BATCH_REACTOR_RECIPES, SusyTextures.BATCH_REACTOR_OVERLAY, true, GTUtility.defaultTankSizeFunction);
 
+        //max tier = 12 -> OpV [excludes ULv] -> 13 ids taken (add maxTier +1 to start ID to get next valid id)
+        registerSimpleMTE(CRYSTALLIZER, 12, 14593, "crystallizer", SuSyRecipeMaps.CRYSTALLIZER_RECIPES, SusyTextures.CRYSTALLIZER_OVERLAY, true, GTUtility.defaultTankSizeFunction);
         registerSimpleMTE(DRYER, 12, 14621, "dryer", SuSyRecipeMaps.DRYER, SusyTextures.DRYER_OVERLAY, true, GTUtility.defaultTankSizeFunction);
+        registerSimpleMTE(ION_EXCHANGE_COLUMN, 12, 14694, "ion_exchange_column", SuSyRecipeMaps.ION_EXCHANGE_COLUMN_RECIPES, SusyTextures.ION_EXCHANGE_COLUMN_OVERLAY, true, GTUtility.defaultTankSizeFunction);
+        registerSimpleMTE(ZONE_REFINER, 12, 14707, "zone_refiner", SuSyRecipeMaps.ZONE_REFINER_RECIPES, SusyTextures.ZONE_REFINER_OVERLAY, true, GTUtility.defaultTankSizeFunction);
+        registerSimpleMTE(TUBE_FURNACE, 12, 14720, "tube_furnace", SuSyRecipeMaps.TUBE_FURNACE_RECIPES, SusyTextures.TUBE_FURNACE_OVERLAY, true, GTUtility.defaultTankSizeFunction);
 
+        FLUIDIZED_BED_REACTOR = registerMetaTileEntity(14619, new MetaTileEntityFluidizedBedReactor(susyId("fluidized_bed_reactor")));
+        POLYMERIZATION_TANK = registerMetaTileEntity(14620, new MetaTileEntityPolmyerizationTank(susyId("polymerization_tank")));
         ELECTROLYTIC_CELL = registerMetaTileEntity(14634, new MetaTileEntityElectrolyticCell(susyId("electrolytic_cell")));
 
+        //oil stuff
         COKING_TOWER = registerMetaTileEntity(14635, new MetaTileEntityCokingTower(susyId("coking_tower")));
         VACUUM_DISTILLATION_TOWER = registerMetaTileEntity(14636, new MetaTileEntityVacuumDistillationTower(susyId("vacuum_distillation_tower")));
         SMOKE_STACK = registerMetaTileEntity(14637, new MetaTileEntitySmokeStack(susyId("smoke_stack")));
         CATALYTIC_REFORMER = registerMetaTileEntity(14638, new MetaTileEntityCatalyticReformer(susyId("catalytic_reformer")));
-
         FERMENTATION_VAT = registerMetaTileEntity(14639, new MetaTileEntityFermentationVat(susyId("fermentation_vat")));
 
         registerSimpleMTE(UV_LIGHT_BOX, 12, 14640, "uv_light_box", SuSyRecipeMaps.UV_RECIPES, SusyTextures.UV_LIGHT_BOX_OVERLAY, true, GTUtility.defaultTankSizeFunction);
-
         registerSimpleMTE(CVD, 12, 14653, "cvd", SuSyRecipeMaps.CVD_RECIPES, SusyTextures.CVD_OVERLAY, true, GTUtility.defaultTankSizeFunction);
         registerSimpleMTE(ION_IMPLANTER, 12, 14666, "ion_implanter", SuSyRecipeMaps.ION_IMPLANTATION_RECIPES, SusyTextures.ION_IMPLANTER_OVERLAY, true, GTUtility.defaultTankSizeFunction);
+
+        LEAD_DRUM = registerMetaTileEntity(14553, new MetaTileEntityDrum(susyId("drum.lead"), Materials.Lead, 32000));
     }
 
     private static void registerSimpleSteamMTE(SuSySimpleSteamMetaTileEntity[] machines, int startId, String name, RecipeMap<?> recipeMap, SuSySteamProgressIndicator progressIndicator, ICubeRenderer texture, boolean isBricked) {
@@ -153,22 +161,30 @@ private static void registerContinuousMachineMTE(ContinuousMachineMetaTileEntity
         return new ResourceLocation(GTValues.MODID, name);
     }
 
-
     static{
         LATEX_COLLECTOR = new MetaTileEntityLatexCollector[GTValues.EV];
         STEAM_VULCANIZING_PRESS = new SuSySimpleSteamMetaTileEntity[2];
-        VULCANIZING_PRESS = new SimpleMachineMetaTileEntity[GTValues.EV];
         STEAM_ROASTER = new SuSySimpleSteamMetaTileEntity[2];
-        ROASTER = new SimpleMachineMetaTileEntity[GTValues.OpV];
         STEAM_MIXER = new SuSySimpleSteamMetaTileEntity[2];
-        VACUUM_CHAMBER = new SimpleMachineMetaTileEntity[GTValues.OpV];
         STEAM_VACUUM_CHAMBER = new SuSySimpleSteamMetaTileEntity[2];
+
+        VULCANIZING_PRESS = new SimpleMachineMetaTileEntity[GTValues.EV];
+        ROASTER = new SimpleMachineMetaTileEntity[GTValues.OpV];
+        VACUUM_CHAMBER = new SimpleMachineMetaTileEntity[GTValues.OpV];
+
         CONTINUOUS_STIRRED_TANK_REACTOR = new ContinuousMachineMetaTileEntity[GTValues.OpV];
         FIXED_BED_REACTOR = new ContinuousMachineMetaTileEntity[GTValues.OpV];
         TRICKLE_BED_REACTOR = new ContinuousMachineMetaTileEntity[GTValues.OpV];
-        CRYSTALLIZER = new SimpleMachineMetaTileEntity[GTValues.OpV];
         BUBBLE_COLUMN_REACTOR = new ContinuousMachineMetaTileEntity[GTValues.OpV];
+
+        BATCH_REACTOR = new SimpleMachineMetaTileEntity[GTValues.OpV];
+
+        CRYSTALLIZER = new SimpleMachineMetaTileEntity[GTValues.OpV];
         DRYER = new SimpleMachineMetaTileEntity[GTValues.OpV];
+        ION_EXCHANGE_COLUMN = new SimpleMachineMetaTileEntity[GTValues.OpV];
+        ZONE_REFINER = new SimpleMachineMetaTileEntity[GTValues.OpV];
+        TUBE_FURNACE = new SimpleMachineMetaTileEntity[GTValues.OpV];
+
         UV_LIGHT_BOX = new SimpleMachineMetaTileEntity[GTValues.OpV];
         CVD = new SimpleMachineMetaTileEntity[GTValues.OpV];
         ION_IMPLANTER = new SimpleMachineMetaTileEntity[GTValues.OpV];

src/main/java/supersymmetry/common/metatileentities/single/steam/MetaTileEntitySteamLatexCollector.java

@@ -135,26 +135,44 @@ public boolean drainEnergy(boolean simulate) {
     public void update() {
         super.update();
 
-        if (!this.getWorld().isRemote && this.hasRubberLog) {
-            if(this.drainEnergy(true)){
-                FluidStack latexStack = SusyMaterials.Latex.getFluid((int) this.latexCollectionAmount);
-                NonNullList<FluidStack> fluidStacks = NonNullList.create();
-                fluidStacks.add(latexStack);
-                if (GTTransferUtils.addFluidsToFluidHandler(this.exportFluids, true, fluidStacks)) {
-                    GTTransferUtils.addFluidsToFluidHandler(this.exportFluids, false, fluidStacks);
-                    this.drainEnergy(false);
+        //if ~client world skip update
+        if (this.getWorld().isRemote) return;
+
+        //if rubber log and energy (steam)
+        if (this.hasRubberLog && this.drainEnergy(true)) {
+            //inspect tank, amount, and capacity
+            IFluidTank tank = this.exportFluids.getTankAt(0);
+            assert tank != null;
+
+            int stored = tank.getFluidAmount();
+            int capacity = tank.getCapacity();
+
+            //collection
+            if (stored < capacity) {
+                //is pseudo full if full collection amount can't be inserted
+                boolean isOutputFull = stored + this.latexCollectionAmount >= capacity;
+
+                //handle cases
+                if (isOutputFull) {
+                    tank.fill(SusyMaterials.Latex.getFluid(capacity - stored), true);
+                } else {
+                    tank.fill(SusyMaterials.Latex.getFluid((int) this.latexCollectionAmount), true);
                 }
+
+                //take energy (steam)
+                this.drainEnergy(false);
             }
         }
 
-        if (!this.getWorld().isRemote && this.getOffsetTimer() % 5L == 0L) {
+        //attempt pumping every 5 ticks
+        if (this.getOffsetTimer() % 5L == 0L) {
             if(this.getOutputFacingFluids() != null){
                 this.pushFluidsIntoNearbyHandlers(new EnumFacing[]{this.getOutputFacingFluids()});
             }
             this.fillContainerFromInternalTank();
         }
-
     }
+
     @Override
     public void onLoad() {
         super.onLoad();

src/main/resources/assets/gregtech/textures/blocks/machines/batch_reactor/overlay_back_active_png.mcmeta

@@ -0,0 +1,5 @@
+{
+   "animation":{
+      "frametime":2
+   }
+}

src/main/resources/assets/gregtech/textures/blocks/machines/ion_exchange_column/overlay_front_active_emissive_png.mcmeta

@@ -0,0 +1,5 @@
+{
+   "animation":{
+      "frametime":2
+   }
+}

src/main/resources/assets/gregtech/textures/blocks/machines/ion_exchange_column/overlay_front_active_png.mcmeta

@@ -0,0 +1,5 @@
+{
+   "animation":{
+      "frametime":2
+   }
+}

src/main/resources/assets/gregtech/textures/blocks/machines/ion_exchange_column/overlay_side_active_png.mcmeta

@@ -0,0 +1,5 @@
+{
+   "animation":{
+      "frametime":2
+   }
+}