Skip to content

Commit 306f8bc

Browse files
committed
Now it is recommended to turn energy loss off.
I nerfed conductors a little, so if energy loss is on, you will loose some energy (relatively small amount) regardless you're transfering energy or not.
1 parent ececd2e commit 306f8bc

File tree

2 files changed

+27
-20
lines changed

2 files changed

+27
-20
lines changed

makmods/levelstorage/logic/BlockLocation.java

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package makmods.levelstorage.logic;
22

3+
import makmods.levelstorage.LevelStorage;
34
import net.minecraft.tileentity.TileEntity;
5+
import net.minecraftforge.common.Configuration;
46
import net.minecraftforge.common.DimensionManager;
57

68
public class BlockLocation {
@@ -55,33 +57,40 @@ public int getDistance(BlockLocation other) {
5557

5658
return xDistance + yDistance + zDistance;
5759
}
58-
60+
5961
/**
6062
* Gets energy discount for given energy and distance
61-
* @param energy Energy
62-
* @param distance Distance
63+
*
64+
* @param energy
65+
* Energy
66+
* @param distance
67+
* Distance
6368
* @return energy discount
6469
*/
6570
public static int getEnergyDiscount(int energy, int distance) {
66-
// Cross-Dimensional
67-
if (distance == Integer.MAX_VALUE)
68-
return (int)(energy * 0.25f);
69-
// Distance < 1000
70-
if (distance < 1000)
71-
return (int)(energy * 0.05f);
72-
// Distance > 1000 <2000
73-
if (distance > 1000 && distance < 2000)
74-
return (int)(energy * 0.1f);
75-
// Distance > 2000
76-
if (distance > 2000)
77-
return (int)(energy * 0.15f);
78-
// IDK what happened here
71+
if (LevelStorage.configuration.get(Configuration.CATEGORY_GENERAL,
72+
"enableEnergyLoss", false).getBoolean(false)) {
73+
// Cross-Dimensional
74+
if (distance == Integer.MAX_VALUE)
75+
return (int) (energy * 0.25f);
76+
// Distance < 1000
77+
if (distance < 1000)
78+
return (int) (energy * 0.05f);
79+
// Distance > 1000 <2000
80+
if (distance > 1000 && distance < 2000)
81+
return (int) (energy * 0.1f);
82+
// Distance > 2000
83+
if (distance > 2000)
84+
return (int) (energy * 0.15f);
85+
}
7986
return 0;
8087
}
81-
88+
8289
/**
8390
* Returns whether or not DimensionId is valid
84-
* @param dimId Dimension id
91+
*
92+
* @param dimId
93+
* Dimension id
8594
*/
8695
public static boolean isDimIdValid(int dimId) {
8796
Integer[] ids = DimensionManager.getIDs();

makmods/levelstorage/tileentity/TileEntityWirelessPowerSynchronizer.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,13 +291,11 @@ public int sendEnergyEqually(int amount) {
291291
par5.add(par6);
292292
}
293293
int par7 = sendEnergyToDevices(par5, leftover);
294-
System.out.println("par7: " + par7);
295294
energyNotUsed += par7;
296295
} else {
297296
energyNotUsed += leftover;
298297
}
299298
}
300-
System.out.println("energyNotUsed: " + energyNotUsed);
301299
return energyNotUsed;
302300
}
303301
return amount;

0 commit comments

Comments
 (0)