mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Update config to include comments (#108)
* Add comments to configs * Removed unused options * Added a few of the newer options mainline Mekanism supports * Also list the default values in the MekanismConfig class for easier comparision * Change spacing slightly for tools config in code * Add some of the missing generator config comments * Config comments for tiers, and add missing comment for MinerSilkMultiplier * Config comments for rest of generators module * Fix which stick to sawdust recipe * Config comments for tools * Config comments for armor * Add warning to DM radius comment, and fix a couple things addressed in PR comments
This commit is contained in:
1 parent
1b6cfd37e9
commit
5a67067f07
18 files changed
+751
-480
No files matched your search
@@ -25,6 +25,7 @@ import mekanism.common.base.IUpgradeTile;
|
||||
import mekanism.common.block.states.BlockStateMachine;
|
||||
import mekanism.common.capabilities.Capabilities;
|
||||
import mekanism.common.chunkloading.IChunkLoader;
|
||||
import mekanism.common.config.MekanismConfig.general;
|
||||
import mekanism.common.config.MekanismConfig.usage;
|
||||
import mekanism.common.content.miner.MItemStackFilter;
|
||||
import mekanism.common.content.miner.MOreDictFilter;
|
||||
@@ -319,7 +320,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
|
||||
double ret = energyUsage;
|
||||
|
||||
if (silkTouch) {
|
||||
ret *= 6F;
|
||||
ret *= general.minerSilkMultiplier;
|
||||
}
|
||||
|
||||
int baseRad = Math.max(radius - 10, 0);
|
||||
@@ -603,7 +604,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
|
||||
}
|
||||
|
||||
private void readBasicData(ByteBuf dataStream) {
|
||||
radius = dataStream.readInt();
|
||||
radius = dataStream.readInt();//client allowed to use whatever server sends
|
||||
minY = dataStream.readInt();
|
||||
maxY = dataStream.readInt();
|
||||
doEject = dataStream.readBoolean();
|
||||
@@ -646,7 +647,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
|
||||
reset();
|
||||
break;
|
||||
case 6:
|
||||
radius = dataStream.readInt();
|
||||
radius = Math.min(dataStream.readInt(), general.digitalMinerMaxRadius);
|
||||
break;
|
||||
case 7:
|
||||
minY = dataStream.readInt();
|
||||
@@ -1037,7 +1038,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
|
||||
return new Object[]{"Invalid parameters."};
|
||||
}
|
||||
|
||||
radius = ((Double) arguments[0]).intValue();
|
||||
radius = Math.min(((Double) arguments[0]).intValue(), general.digitalMinerMaxRadius);
|
||||
} else if (method == 1) {
|
||||
if (arguments.length != 1 || !(arguments[0] instanceof Double)) {
|
||||
return new Object[]{"Invalid parameters."};
|
||||
@@ -1166,7 +1167,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
|
||||
|
||||
@Override
|
||||
public void setConfigurationData(NBTTagCompound nbtTags) {
|
||||
radius = nbtTags.getInteger("radius");
|
||||
radius = Math.min(nbtTags.getInteger("radius"), general.digitalMinerMaxRadius);
|
||||
minY = nbtTags.getInteger("minY");
|
||||
maxY = nbtTags.getInteger("maxY");
|
||||
doEject = nbtTags.getBoolean("doEject");
|
||||
@@ -1213,7 +1214,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
|
||||
@Override
|
||||
public void readSustainedData(ItemStack itemStack) {
|
||||
if (ItemDataUtils.hasData(itemStack, "hasMinerConfig")) {
|
||||
radius = ItemDataUtils.getInt(itemStack, "radius");
|
||||
radius = Math.min(ItemDataUtils.getInt(itemStack, "radius"), general.digitalMinerMaxRadius);
|
||||
minY = ItemDataUtils.getInt(itemStack, "minY");
|
||||
maxY = ItemDataUtils.getInt(itemStack, "maxY");
|
||||
doEject = ItemDataUtils.getBoolean(itemStack, "doEject");
|
||||
|
||||
Reference in new issue
Block a user