MinecraftMods/EngineersDecor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Solar Panel charge balancing added. Tooltip delay for buttons in the device GUIs reduced.

Browse source
This commit is contained in:
stfwi 2020-11-14 16:48:58 +01:00
parent e4819b4666
commit d3301f3bef
3 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
readme.md
View file

@ -11,9 +11,11 @@ Mod sources for Minecraft version 1.16.x.
## Version history
~ v1.1.4-b2 [A] Steel Catwalks (top and bottom aligned).
~ v1.1.4-b2 [A] Steel Catwalks added (top and bottom aligned).
[A] Steel Railings added.
[F] Fixed Empty Fluid Barrel crafting crash (ty inflamedsebi).
[A] Added Solar Panel power balancing.
[M] GUI Button tooltip delay reduced to 800ms.
- v1.1.4-b1 [U] Ported to 1.16.4.

21
src/main/java/wile/engineersdecor/blocks/EdSolarPanel.java
View file

@ -89,6 +89,7 @@ public class EdSolarPanel
private static int peak_power_per_tick_ = DEFAULT_PEAK_POWER;
private static int max_power_storage_ = 64000;
private static int max_feed_power = 8192;
private static int feeding_threshold = max_power_storage_/5;
private int tick_timer_ = 0;
private int recalc_timer_ = 0;
private int accumulated_power_ = 0;
@ -99,6 +100,8 @@ public class EdSolarPanel
public static void on_config(int peak_power_per_tick)
{
peak_power_per_tick_ = MathHelper.clamp(peak_power_per_tick, 2, 8192);
max_feed_power = MathHelper.clamp(peak_power_per_tick_ * 16, 10, 256);
feeding_threshold = Math.max(max_power_storage_/5, 1000);
ModEngineersDecor.logger().info("Config small solar panel: Peak production:" + peak_power_per_tick_ + "/tick");
}
@ -194,8 +197,20 @@ public class EdSolarPanel
TileEntity te = world.getTileEntity(pos.offset(f));
if(te==null) continue;
IEnergyStorage es = te.getCapability(CapabilityEnergy.ENERGY, f.getOpposite()).orElse(null);
if((es==null) || (!es.canReceive())) continue;
int fed = es.receiveEnergy(Math.min(accumulated_power_, max_feed_power * TICK_INTERVAL), false);
if(es==null) continue;
if(!es.canReceive()) {
// Ok, implemented power forwarding between panels because some people just don't get it.
if(accumulated_power_ < (feeding_threshold * 2)) continue;
if(!(te instanceof SolarPanelTileEntity)) continue;
SolarPanelTileEntity panel = (SolarPanelTileEntity)te;
if(panel.accumulated_power_ >= (accumulated_power_-feeding_threshold)) continue;
panel.accumulated_power_ += feeding_threshold;
accumulated_power_ -= feeding_threshold;
current_feedin_ += feeding_threshold/TICK_INTERVAL;
continue;
}
final int feed_power = (accumulated_power_ < (max_power_storage_/10)) ? Math.max((current_production_ * 2), (peak_power_per_tick_/5)) : max_feed_power;
int fed = es.receiveEnergy(Math.min(accumulated_power_, feed_power * TICK_INTERVAL), false);
accumulated_power_ = MathHelper.clamp(accumulated_power_-fed,0, accumulated_power_);
current_feedin_ += fed;
}
@ -225,7 +240,7 @@ public class EdSolarPanel
final double rf = Math.sin((Math.PI/2) * Math.sqrt(((double)(((theta<0)||(theta>180))?(0):((theta>90)?(180-theta):(theta))))/90));
current_production_ = (int)(Math.min(rf*rf*eff*ll, 1) * peak_power_per_tick_);
accumulated_power_ = Math.min(accumulated_power_ + (current_production_*(TICK_INTERVAL*ACCUMULATION_INTERVAL)), max_power_storage_);
if(accumulated_power_ >= (max_power_storage_/5)) output_enabled_ = true;
if(accumulated_power_ >= (feeding_threshold)) output_enabled_ = true;
}
}
}

2
src/main/java/wile/engineersdecor/libmc/detail/TooltipDisplay.java
View file

@ -25,7 +25,7 @@ import java.util.List;
@OnlyIn(Dist.CLIENT)
public class TooltipDisplay
{
private static long default_delay = 1500;
private static long default_delay = 800;
private static int default_max_deviation = 1;
public static void config(long delay, int max_deviation)