From 2f47f13ef7c8cf95586a45dbd610a6fdc58db39c Mon Sep 17 00:00:00 2001
From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com>
Date: Sun, 29 Aug 2021 19:55:52 -0700
Subject: [PATCH 1/2] Adjustable `generateEffect` randomness (#5901)

---
 .../mindustry/world/blocks/power/ItemLiquidGenerator.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java b/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java
index 1ef6010f2b..a8462502ea 100644
--- a/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java
+++ b/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java
@@ -29,6 +29,7 @@ public class ItemLiquidGenerator extends PowerGenerator{
     public float maxLiquidGenerate = 0.4f;
 
     public Effect generateEffect = Fx.generatespark;
+    public float generateEffectRnd = 3f;
     public Effect explodeEffect = Fx.generatespark;
     public Color heatColor = Color.valueOf("ff9b59");
     public @Load("@-top") TextureRegion topRegion;
@@ -128,12 +129,12 @@ public class ItemLiquidGenerator extends PowerGenerator{
                 productionEfficiency = baseLiquidEfficiency * used / maximumPossible;
 
                 if(used > 0.001f && Mathf.chance(0.05 * delta())){
-                    generateEffect.at(x + Mathf.range(3f), y + Mathf.range(3f));
+                    generateEffect.at(x + Mathf.range(generateEffectRnd), y + Mathf.range(generateEffectRnd));
                 }
             }else if(hasItems){
                 // No liquids accepted or none supplied, try using items if accepted
                 if(generateTime <= 0f && items.total() > 0){
-                    generateEffect.at(x + Mathf.range(3f), y + Mathf.range(3f));
+                    generateEffect.at(x + Mathf.range(generateEffectRnd), y + Mathf.range(generateEffectRnd));
                     Item item = items.take();
                     productionEfficiency = getItemEfficiency(item);
                     explosiveness = item.explosiveness;

From 9b28eaa3b3e24a78ecea05ec8995ea0a20342844 Mon Sep 17 00:00:00 2001
From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com>
Date: Mon, 30 Aug 2021 05:23:58 -0700
Subject: [PATCH 2/2] Allow for `SingleTypeGenerators` to use only liquid.
 (#5900)

---
 .../mindustry/world/blocks/power/SingleTypeGenerator.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java b/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java
index ff5da52aaa..95919f105b 100644
--- a/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java
+++ b/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java
@@ -3,6 +3,7 @@ package mindustry.world.blocks.power;
 import mindustry.type.*;
 
 public class SingleTypeGenerator extends ItemLiquidGenerator{
+    public boolean useItems = true;
 
     public SingleTypeGenerator(String name){
         super(name);
@@ -11,11 +12,11 @@ public class SingleTypeGenerator extends ItemLiquidGenerator{
 
     @Override
     protected float getItemEfficiency(Item item){
-        return 1f;
+        return useItems ? 1f : 0f;
     }
 
     @Override
     protected float getLiquidEfficiency(Liquid liquid){
-        return 0f;
+        return useItems ? 0f : 1f;
     }
 }