diff options
| author | bass <tudurap.com@gmail.com> | 2019-02-06 18:44:37 +0000 |
|---|---|---|
| committer | bass <tudurap.com@gmail.com> | 2019-02-06 18:44:37 +0000 |
| commit | dfdcceeadccbdb7ef06d3952ea14eeeb38d72725 (patch) | |
| tree | 3b44d425759f339080c71a44b2b38258aacc2771 /src/main | |
| parent | cff4de19a87cdf8c8e346243719737a5add04497 (diff) | |
| download | GT5-Unofficial-dfdcceeadccbdb7ef06d3952ea14eeeb38d72725.tar.gz GT5-Unofficial-dfdcceeadccbdb7ef06d3952ea14eeeb38d72725.tar.bz2 GT5-Unofficial-dfdcceeadccbdb7ef06d3952ea14eeeb38d72725.zip | |
Fixed Merge issue
Diffstat (limited to 'src/main')
2 files changed, 1 insertions, 46 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java index e4b34add2e..d60fc0bfbe 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java @@ -303,14 +303,9 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock float energyFrac = (float)energyStored/energyMax; -<<<<<<< HEAD - if (parametrized && histScaleParam > 0 && histLowParam > 0 && histScaleParam <= histHighParam && histLowParam < histHighParam) { -======= - System.out.println(energyFrac); if (parametrized && histScaleParam > 0 && histLowParam > 0 && histScaleParam <= histHighParam && histLowParam < histHighParam) { //TODO Ugly Math because someone I am bad at datatypes :( ->>>>>>> bassAdditions histLow = (float)histLowParam/histScaleParam; histHigh = (float)histHighParam/histScaleParam; } @@ -385,47 +380,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock } } } -<<<<<<< HEAD } - - } - - //Stuff to do if ePowerPass - if (ePowerPass) { - outputVoltage = 512;//TODO Generate depending on kind of capacitors - outputCurrent = 1;//TODO Generate depending on count of capacitors - - if (parametrized && outputVoltageParam > 0 && outputVoltage > outputVoltageParam){ - outputVoltage = outputVoltageParam;} - - if (parametrized && outputCurrentParam > 0 && outputCurrent > outputCurrentParam){ - outputCurrent = outputCurrentParam;} - - outputEuT = outputVoltage * outputCurrent; - - long requestedSumEU = 0; - - //Clean the Smol Tesla list - for (GT_MetaTileEntity_TeslaCoil Rx : eTeslaList.toArray(new GT_MetaTileEntity_TeslaCoil[eTeslaList.size()])) { - try { - requestedSumEU += Rx.maxEUStore() - Rx.getEUVar(); - } catch (Exception e) { - eTeslaList.remove(Rx); - } - } - - //Clean the large tesla list - for (GT_MetaTileEntity_TM_teslaCoil Rx : eTeslaTowerList.toArray(new GT_MetaTileEntity_TM_teslaCoil[eTeslaTowerList.size()])) { - try { - requestedSumEU += Rx.maxEUStore() - Rx.getEUVar(); - } catch (Exception e) { - eTeslaTowerList.remove(Rx); - } - } - -======= - } - } //Stuff to do if ePowerPass @@ -461,7 +416,6 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock } } ->>>>>>> bassAdditions //Try to send EU to the smol teslas for (GT_MetaTileEntity_TeslaCoil Rx : eTeslaList) { if (!Rx.ePowerPass) { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java index 2ed96c709a..a0868ea5da 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java @@ -16,6 +16,7 @@ import static com.github.technus.tectech.CommonValues.V; public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryBuffer {
public boolean ePowerPass = false;
+ public boolean teslaCompatible = true;
private int scanTime = 0;
private int scanRadius = 64;//TODO Generate depending on power stored
|